From 8f13343d9f890ec8fdf857f30297b5c00c1bcc08 Mon Sep 17 00:00:00 2001 From: Johnny McQuade Date: Fri, 25 Oct 2024 16:47:56 +0100 Subject: [PATCH] chore: move parent_point_box component to plh components folder --- packages/components/plh/index.ts | 9 ++++-- .../parent-point-box.component.html | 0 .../parent-point-box.component.scss | 0 .../parent-point-box.component.spec.ts | 10 +++---- .../parent-point-box.component.ts | 28 ++++++++----------- packages/data-models/flowTypes.ts | 1 - .../components/template/components/index.ts | 3 -- .../components/template/template.module.ts | 1 - 8 files changed, 22 insertions(+), 30 deletions(-) rename src/app/shared/components/template/components/points-item/points-item.component.html => packages/components/plh/parent-point-box/parent-point-box.component.html (100%) rename src/app/shared/components/template/components/points-item/points-item.component.scss => packages/components/plh/parent-point-box/parent-point-box.component.scss (100%) rename src/app/shared/components/template/components/points-item/points-item.component.spec.ts => packages/components/plh/parent-point-box/parent-point-box.component.spec.ts (60%) rename src/app/shared/components/template/components/points-item/points-item.component.ts => packages/components/plh/parent-point-box/parent-point-box.component.ts (82%) diff --git a/packages/components/plh/index.ts b/packages/components/plh/index.ts index bc07f58a5e..3817b987c1 100644 --- a/packages/components/plh/index.ts +++ b/packages/components/plh/index.ts @@ -4,16 +4,19 @@ import type { ITemplateRowProps } from "src/app/shared/components/template/model import { CommonModule } from "@angular/common"; import { IonicModule } from "@ionic/angular"; import { TemplatePipesModule } from "src/app/shared/components/template/pipes/template-pipes.module"; +import { LottieModule } from "ngx-lottie"; import { PlhParentPointCounterComponent } from "./parent-point-counter/parent-point-counter.component"; +import { PlhParentPointBoxComponent } from "./parent-point-box/parent-point-box.component"; @NgModule({ - imports: [CommonModule, IonicModule, TemplatePipesModule], - exports: [PlhParentPointCounterComponent], - declarations: [PlhParentPointCounterComponent], + imports: [CommonModule, IonicModule, TemplatePipesModule, LottieModule], + exports: [PlhParentPointCounterComponent, PlhParentPointBoxComponent], + declarations: [PlhParentPointCounterComponent, PlhParentPointBoxComponent], providers: [], }) export class PlhComponentsModule {} export const PLH_COMPONENT_MAPPING: Record> = { parent_point_counter: PlhParentPointCounterComponent, + parent_point_box: PlhParentPointBoxComponent, }; diff --git a/src/app/shared/components/template/components/points-item/points-item.component.html b/packages/components/plh/parent-point-box/parent-point-box.component.html similarity index 100% rename from src/app/shared/components/template/components/points-item/points-item.component.html rename to packages/components/plh/parent-point-box/parent-point-box.component.html diff --git a/src/app/shared/components/template/components/points-item/points-item.component.scss b/packages/components/plh/parent-point-box/parent-point-box.component.scss similarity index 100% rename from src/app/shared/components/template/components/points-item/points-item.component.scss rename to packages/components/plh/parent-point-box/parent-point-box.component.scss diff --git a/src/app/shared/components/template/components/points-item/points-item.component.spec.ts b/packages/components/plh/parent-point-box/parent-point-box.component.spec.ts similarity index 60% rename from src/app/shared/components/template/components/points-item/points-item.component.spec.ts rename to packages/components/plh/parent-point-box/parent-point-box.component.spec.ts index 2214de1832..338aceaa5e 100644 --- a/src/app/shared/components/template/components/points-item/points-item.component.spec.ts +++ b/packages/components/plh/parent-point-box/parent-point-box.component.spec.ts @@ -1,19 +1,19 @@ import { async, ComponentFixture, TestBed } from "@angular/core/testing"; import { IonicModule } from "@ionic/angular"; -import { TmplParentPointBoxComponent } from "./points-item.component"; +import { PlhParentPointBoxComponent } from "./parent-point-box.component"; describe("TmplParentPointBoxComponent", () => { - let component: TmplParentPointBoxComponent; - let fixture: ComponentFixture; + let component: PlhParentPointBoxComponent; + let fixture: ComponentFixture; beforeEach(async(() => { TestBed.configureTestingModule({ - declarations: [TmplParentPointBoxComponent], + declarations: [PlhParentPointBoxComponent], imports: [IonicModule.forRoot()], }).compileComponents(); - fixture = TestBed.createComponent(TmplParentPointBoxComponent); + fixture = TestBed.createComponent(PlhParentPointBoxComponent); component = fixture.componentInstance; fixture.detectChanges(); })); diff --git a/src/app/shared/components/template/components/points-item/points-item.component.ts b/packages/components/plh/parent-point-box/parent-point-box.component.ts similarity index 82% rename from src/app/shared/components/template/components/points-item/points-item.component.ts rename to packages/components/plh/parent-point-box/parent-point-box.component.ts index b5695a3fb6..dd55e5b911 100644 --- a/src/app/shared/components/template/components/points-item/points-item.component.ts +++ b/packages/components/plh/parent-point-box/parent-point-box.component.ts @@ -1,25 +1,19 @@ +import { Component, ElementRef, HostListener, Input, OnInit, ViewChild } from "@angular/core"; +import { TemplateBaseComponent } from "src/app/shared/components/template/components/base"; +import { FlowTypes, ITemplateRowProps } from "src/app/shared/components/template/models"; import { - Component, - ElementRef, - HostBinding, - HostListener, - Input, - OnInit, - ViewChild, -} from "@angular/core"; -import { TemplateBaseComponent } from "../base"; -import { FlowTypes, ITemplateRowProps } from "../../models"; -import { getBooleanParamFromTemplateRow, getStringParamFromTemplateRow } from "../../../../utils"; + getBooleanParamFromTemplateRow, + getStringParamFromTemplateRow, +} from "src/app/shared/utils"; import { AnimationOptions } from "ngx-lottie"; -import { TemplateAssetService } from "../../services/template-asset.service"; +import { TemplateAssetService } from "src/app/shared/components/template/services/template-asset.service"; @Component({ - selector: "plh-points-item", - templateUrl: "./points-item.component.html", - styleUrls: ["./points-item.component.scss"], + selector: "plh-parent-point-box", + templateUrl: "./parent-point-box.component.html", + styleUrls: ["./parent-point-box.component.scss"], }) -// TODO - why does the class name not match the file name?? -export class TmplParentPointBoxComponent +export class PlhParentPointBoxComponent extends TemplateBaseComponent implements ITemplateRowProps, OnInit { diff --git a/packages/data-models/flowTypes.ts b/packages/data-models/flowTypes.ts index 93073caec2..5ccd6474d3 100644 --- a/packages/data-models/flowTypes.ts +++ b/packages/data-models/flowTypes.ts @@ -286,7 +286,6 @@ export namespace FlowTypes { | "nested_properties" | "number_selector" | "odk_form" - | "parent_point_box" | "pdf" | "progress_path" | "qr_code" diff --git a/src/app/shared/components/template/components/index.ts b/src/app/shared/components/template/components/index.ts index 4e7ae4b671..6ddf92c4b8 100644 --- a/src/app/shared/components/template/components/index.ts +++ b/src/app/shared/components/template/components/index.ts @@ -41,7 +41,6 @@ import { TmplLottieAnimation } from "./lottie-animation"; import { TmplNavigationBarComponent } from "./navigation-bar/navigation-bar.component"; import { TmplNumberComponent } from "./number-selector/number-selector.component"; import { TmplOdkFormComponent } from "./odk-form/odk-form.component"; -import { TmplParentPointBoxComponent } from "./points-item/points-item.component"; import { TmplPdfComponent } from "./pdf/pdf.component"; import { TmplProgressPathComponent } from "./progress-path/progress-path.component"; import { TmplQRCodeComponent } from "./qr-code/qr-code.component"; @@ -103,7 +102,6 @@ export const TEMPLATE_COMPONENTS = [ TmplNavigationBarComponent, TmplNumberComponent, TmplOdkFormComponent, - TmplParentPointBoxComponent, TmplPdfComponent, TmplProgressPathComponent, TmplQRCodeComponent, @@ -162,7 +160,6 @@ const CORE_COMPONENT_MAPPING: Record