diff --git a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html index 6544e82a1b..8dd43402eb 100644 --- a/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html +++ b/alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html @@ -97,7 +97,7 @@

{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type

class="condition-date-types" > Single - Select date label -
+
=> { return of(control.value).pipe( debounceTime(300), - switchMap((isDateChecked) => { + switchMap(() => { if (!this.conditionService) { throw Error('Condition service not found'); } @@ -155,9 +155,7 @@ export class DecisionConditionTypesDialogComponent { map((conditions) => !control.value && conditions && this.hasAnyDates(conditions) ? { hasConditions: true } : null, ), - catchError((e) => { - return of({ hasConditions: true }); - }), + catchError((e) => of({ hasConditions: true })), ); }; } diff --git a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts index 15d9f19cd3..2e59bcbfdb 100644 --- a/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts +++ b/alcs-frontend/src/app/features/application/decision/decision-v2/decision-input/decision-conditions/decision-condition/decision-condition.component.ts @@ -213,9 +213,6 @@ export class DecisionConditionComponent implements OnInit, OnChanges { }) .beforeClosed() .subscribe(async (dates: DueDate[]) => { - if (!this.uuid) { - return; - } this.dates = dates.map((date) => ({ uuid: date.uuid, date: date.date?.toDate().getTime(), diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1733163698882-add_date_and_admin_fee.ts b/services/apps/alcs/src/providers/typeorm/migrations/1733163698882-add_date_and_admin_fee.ts deleted file mode 100644 index c295ead2fd..0000000000 --- a/services/apps/alcs/src/providers/typeorm/migrations/1733163698882-add_date_and_admin_fee.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { MigrationInterface, QueryRunner } from "typeorm"; - -export class AddDateAndAdminFee1733163698882 implements MigrationInterface { - - public async up(queryRunner: QueryRunner): Promise { - await queryRunner.query(`UPDATE "alcs"."application_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`); - await queryRunner.query(`UPDATE "alcs"."notice_of_intent_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`); - } - - public async down(queryRunner: QueryRunner): Promise { - // N/A - } - -} diff --git a/services/apps/alcs/src/providers/typeorm/migrations/1733774036308-add_date_and_admin_fee.ts b/services/apps/alcs/src/providers/typeorm/migrations/1733774036308-add_date_and_admin_fee.ts new file mode 100644 index 0000000000..6dc4796348 --- /dev/null +++ b/services/apps/alcs/src/providers/typeorm/migrations/1733774036308-add_date_and_admin_fee.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from 'typeorm'; + +export class AddDateAndAdminFee1733774036308 implements MigrationInterface { + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + `UPDATE "alcs"."application_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`, + ); + await queryRunner.query( + `UPDATE "alcs"."notice_of_intent_decision_condition_type" SET "is_administrative_fee_amount_checked" = true, "date_type" = 'Single', "single_date_label" = 'Due Date' WHERE "code" NOT IN ('SRPT', 'UEND')`, + ); + } + + public async down(queryRunner: QueryRunner): Promise { + // N/A + } +}