Deployment PR - 1450

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.html

@@ -25,6 +25,9 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Decision Condition Type</h4>
         <mat-label>Description</mat-label>
         <input required matInput id="description" formControlName="description" name="description" />
       </mat-form-field>
+      <div *ngIf="conditionTypeForm.get('description')?.hasError('descriptionExists')">
+        <app-error-message message="Description already in use or deteled, pick a different description."></app-error-message>
+      </div>
     </div>
 
     <div class="dialog-field full-width">

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types-dialog/decision-condition-types-dialog.component.ts

@@ -17,7 +17,7 @@ import {
 import { ApplicationDecisionConditionService } from '../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition.service';
 import { NoticeOfIntentDecisionConditionService } from '../../../../services/notice-of-intent/decision-v2/notice-of-intent-decision-condition/notice-of-intent-decision-condition.service';
 import { catchError, debounceTime, map, Observable, of, switchMap } from 'rxjs';
-import { codeExistsValidator } from '../../../../shared/validators/code-exists-validator';
+import { codeExistsValidator, descriptionExistsValidator } from '../../../../shared/validators/code-exists-validator';
 
 enum ValidationFields {
   Dates,
@@ -54,6 +54,7 @@ export class DecisionConditionTypesDialogComponent {
     this.conditionTypeForm = new FormGroup({
       description: new FormControl(this.data?.content?.description ? this.data.content.description : '', [
         Validators.required,
+        descriptionExistsValidator(this.data?.existingDescriptions ? this.data.existingDescriptions : []),
       ]),
       label: new FormControl(this.data?.content?.label ? this.data.content.label : '', [Validators.required]),
       code: new FormControl(this.data?.content?.code ? this.data.content.code : '', [
@@ -195,18 +196,18 @@ export class DecisionConditionTypesDialogComponent {
   hasAnyDates(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.some((condition) => condition.dates && condition.dates.length > 0);
+    return conditions.filter((c) => c.decision !== null).some((condition) => condition.dates && condition.dates.length > 0);
   }
 
   hasAdminFee(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.map((c) => c.administrativeFee).filter((f) => f !== null).length > 0;
+    return conditions.filter((c) => c.decision !== null).map((c) => c.administrativeFee).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
   }
 
   hasSecurityAmount(
     conditions: Partial<ApplicationDecisionConditionDto>[] | Partial<NoticeOfIntentDecisionConditionDto>[],
   ): boolean {
-    return conditions.map((c) => c.securityAmount).filter((f) => f !== null).length > 0;
+    return conditions.filter((c) => c.decision !== null).map((c) => c.securityAmount).filter((f) => f !== null && f !== undefined && f > 0).length > 0;
   }
 }

alcs-frontend/src/app/features/admin/decision-condition-types/decision-condition-types.component.ts

@@ -30,6 +30,7 @@ export class DecisionConditionTypesComponent implements OnInit {
 
   decisionConditionTypeDtos: ApplicationDecisionConditionTypeDto[] | NoticeOfIntentDecisionConditionTypeDto[] = [];
   decisionConditionTypeCodeDtos: string[] = [];
+  decisionConditionTypeDescriptionDtos: string[] = [];
   displayedColumns: string[] = ['label', 'description', 'code', 'isActive', 'actions'];
 
   constructor(
@@ -45,6 +46,7 @@ export class DecisionConditionTypesComponent implements OnInit {
     if (!this.service) return;
     this.decisionConditionTypeDtos = await this.service.fetch();
     this.decisionConditionTypeCodeDtos = await this.service.fetchCodesWithDeleted();
+    this.decisionConditionTypeDescriptionDtos = this.decisionConditionTypeDtos.map((d) => d.description);
   }
 
   async onCreate() {
@@ -57,6 +59,7 @@ export class DecisionConditionTypesComponent implements OnInit {
         service: this.service,
         conditionService: this.conditionService,
         existingCodes: this.decisionConditionTypeCodeDtos,
+        existingDescriptions: this.decisionConditionTypeDescriptionDtos,
       },
     });
     dialog.beforeClosed().subscribe(async (result) => {
@@ -77,6 +80,7 @@ export class DecisionConditionTypesComponent implements OnInit {
         conditionService: this.conditionService,
         content: dto,
         existingCodes: this.decisionConditionTypeCodeDtos,
+        existingDescriptions: this.decisionConditionTypeDescriptionDtos.filter((d) => d !== dto.description),
       },
     });
     dialog.beforeClosed().subscribe(async (result) => {

alcs-frontend/src/app/features/admin/decision-condition-types/decision-dialog-data.interface.ts

@@ -9,4 +9,5 @@ export interface DecisionDialogDataInterface {
   conditionService: ApplicationDecisionConditionService | NoticeOfIntentDecisionConditionService;
   content: ApplicationDecisionConditionTypeDto;
   existingCodes: string[];
+  existingDescriptions: string[];
 }

alcs-frontend/src/app/features/application/application.component.html

@@ -4,6 +4,7 @@
       [application]="application"
       [modifications]="modifications"
       [reconsiderations]="reconsiderations"
+      [conditionCards]="decisionConditionCards"
       [showStatus]="true"
       [submissionStatusService]="applicationStatusService"
       [applicationDetailService]="applicationDetailService"

alcs-frontend/src/app/features/application/application.component.spec.ts

@@ -15,6 +15,7 @@ import { ApplicationSubmissionService } from '../../services/application/applica
 import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service';
 
 import { ApplicationComponent } from './application.component';
+import { ApplicationDecisionConditionCardService } from '../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition-card/application-decision-condition-card.service';
 
 describe('ApplicationComponent', () => {
   let component: ApplicationComponent;
@@ -25,6 +26,7 @@ describe('ApplicationComponent', () => {
   let mockReviewService: DeepMocked<ApplicationReviewService>;
   let mockAppSubmissionService: DeepMocked<ApplicationSubmissionService>;
   let mockAppStatusService: DeepMocked<ApplicationSubmissionStatusService>;
+  let mockApplicationDecisionConditionCardService: DeepMocked<ApplicationDecisionConditionCardService>;
 
   beforeEach(async () => {
     mockAppDetailService = createMock();
@@ -40,6 +42,8 @@ describe('ApplicationComponent', () => {
     mockAppSubmissionService = createMock();
     mockAppStatusService = createMock();
 
+    mockApplicationDecisionConditionCardService = createMock();
+
     await TestBed.configureTestingModule({
       providers: [
         {
@@ -70,6 +74,10 @@ describe('ApplicationComponent', () => {
           provide: ApplicationSubmissionStatusService,
           useValue: mockAppStatusService,
         },
+        {
+          provide: ApplicationDecisionConditionCardService,
+          useValue: mockApplicationDecisionConditionCardService,
+        },
         {
           provide: ActivatedRoute,
           useValue: {

alcs-frontend/src/app/features/application/application.component.ts

@@ -30,6 +30,9 @@ import { ReviewComponent } from './review/review.component';
 import { ApplicationSubmissionStatusService } from '../../services/application/application-submission-status/application-submission-status.service';
 import { ApplicationTagService } from '../../services/application/application-tag/application-tag.service';
 import { FileTagService } from '../../services/common/file-tag.service';
+import { ApplicationDecisionV2Service } from '../../services/application/decision/application-decision-v2/application-decision-v2.service';
+import { ApplicationDecisionConditionCardDto } from '../../services/application/decision/application-decision-v2/application-decision-v2.dto';
+import { ApplicationDecisionConditionCardService } from '../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition-card/application-decision-condition-card.service';
 
 export const unsubmittedRoutes = [
   {
@@ -184,6 +187,7 @@ export class ApplicationComponent implements OnInit, OnDestroy {
   application: ApplicationDto | undefined;
   reconsiderations: ApplicationReconsiderationDto[] = [];
   modifications: ApplicationModificationDto[] = [];
+  decisionConditionCards: ApplicationDecisionConditionCardDto[] = [];
   submission?: ApplicationSubmissionDto;
 
   isApplicantSubmission = false;
@@ -195,6 +199,7 @@ export class ApplicationComponent implements OnInit, OnDestroy {
     public applicationSubmissionService: ApplicationSubmissionService,
     private reconsiderationService: ApplicationReconsiderationService,
     private modificationService: ApplicationModificationService,
+    private decisionConditionCardService: ApplicationDecisionConditionCardService,
     private route: ActivatedRoute,
     private titleService: Title,
     public applicationStatusService: ApplicationSubmissionStatusService,
@@ -214,6 +219,9 @@ export class ApplicationComponent implements OnInit, OnDestroy {
         this.reconsiderationService.fetchByApplication(application.fileNumber);
         this.modificationService.fetchByApplication(application.fileNumber);
 
+        this.decisionConditionCards =
+          (await this.decisionConditionCardService.fetchByApplicationFileNumber(application.fileNumber)) || [];
+
         this.isApplicantSubmission = application.source !== SYSTEM_SOURCE_TYPES.ALCS;
         let wasSubmittedToLfng = false;
 

alcs-frontend/src/app/features/application/application.module.ts

@@ -15,7 +15,6 @@ import { appChildRoutes, ApplicationComponent } from './application.component';
 import { BoundaryAmendmentComponent } from './boundary-amendment/boundary-amendment.component';
 import { EditBoundaryAmendmentDialogComponent } from './boundary-amendment/edit-boundary-amendment-dialog/edit-boundary-amendment-dialog.component';
 import { DecisionModule } from './decision/decision.module';
-import { DocumentUploadDialogComponent } from './documents/document-upload-dialog/document-upload-dialog.component';
 import { DocumentsComponent } from './documents/documents.component';
 import { InfoRequestsComponent } from './info-requests/info-requests.component';
 import { InfoRequestDialogComponent } from './info-requests/info-request-dialog/info-request-dialog.component';
@@ -73,7 +72,6 @@ const routes: Routes = [
     ApplicantInfoComponent,
     LfngInfoComponent,
     DocumentsComponent,
-    DocumentUploadDialogComponent,
     ProposalComponent,
     NfuProposalComponent,
     SubdProposalComponent,

alcs-frontend/src/app/features/application/decision/conditions/condition-card-dialog/condition-card-dialog.component.html

@@ -0,0 +1,70 @@
+<div class="container">
+  <div class="section">
+    <h3>Create New Condition Card</h3>
+  </div>
+  <div class="section">
+    <ng-select
+      class="card-type"
+      appearance="outline"
+      [items]="conditionBoard?.statuses!"
+      placeholder="Workflow Stage*"
+      bindLabel="label"
+      bindValue="statusCode"
+      [clearable]="false"
+      [(ngModel)]="selectedStatus"
+      (change)="onStatusSelected($event)"
+    >
+      <ng-template ng-option-tmp let-item="item">
+        <span [innerHTML]="item.label"> </span>
+      </ng-template>
+      <ng-template ng-label-tmp let-item="item">
+        <span [innerHTML]="item.label"> </span>
+      </ng-template>
+    </ng-select>
+  </div>
+  <div class="section">
+    <span>Add one or more conditions*</span>
+    <div class="table-container">
+      <table mat-table class="conditions-table mat-elevation-z3" [dataSource]="dataSource" style="width: 100%">
+        <ng-container matColumnDef="select">
+          <th mat-header-cell *matHeaderCellDef class="column-select"></th>
+          <td mat-cell *matCellDef="let element" class="column-select">
+            <mat-checkbox [(ngModel)]="element.selected" [disabled]="isConditionCardNotNull(element)"></mat-checkbox>
+          </td>
+        </ng-container>
+
+        <ng-container matColumnDef="index">
+          <th mat-header-cell *matHeaderCellDef class="column-index">#</th>
+          <td mat-cell *matCellDef="let element" class="column-index">{{ element.index }}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="type">
+          <th mat-header-cell *matHeaderCellDef class="column-type">Type</th>
+          <td mat-cell *matCellDef="let element" class="column-type">{{ element.condition.type.label }}</td>
+        </ng-container>
+
+        <ng-container matColumnDef="description">
+          <th mat-header-cell *matHeaderCellDef class="column-description">Description</th>
+          <td mat-cell *matCellDef="let element" class="column-description">{{ element.condition.description }}</td>
+        </ng-container>
+
+        <tr mat-header-row *matHeaderRowDef="displayColumns"></tr>
+        <tr
+          mat-row
+          *matRowDef="let row; columns: displayColumns"
+          [class.disabled-row]="isConditionCardNotNull(row)"
+          matTooltip="Condition is already used by another card"
+          [matTooltipDisabled]="!isConditionCardNotNull(row)"
+        ></tr>
+      </table>
+    </div>
+  </div>
+  <div class="section">
+    <div class="button-row">
+      <button type="button" mat-stroked-button color="primary" (click)="onCancel()">Cancel</button>
+      <button type="button" mat-flat-button color="primary" [disabled]="isSaveDisabled()" (click)="onSave()">
+        Save
+      </button>
+    </div>
+  </div>
+</div>

alcs-frontend/src/app/features/application/decision/conditions/condition-card-dialog/condition-card-dialog.component.scss

@@ -0,0 +1,53 @@
+@use '../../../../../../styles/colors.scss' as *;
+
+.container {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  padding: 12px 8px;
+  overflow-y: hidden;
+}
+
+.section {
+  width: 100%;
+  padding: 16px;
+}
+
+.button-row {
+  display: flex;
+  justify-content: flex-end;
+  gap: 8px;
+}
+
+.column-select {
+  width: 10%;
+}
+
+.column-index {
+  width: 10%;
+}
+
+.column-type {
+  width: 30%;
+}
+
+.column-description {
+  width: 50%;
+}
+
+.conditions-table {
+  margin-top: 16px;
+  width: 100%;
+}
+
+.table-container {
+  max-height: 300px;
+  overflow-y: auto;
+  padding: 2px;
+}
+
+.disabled-row {
+  background-color: #f0f0f0;
+  opacity: 0.6;
+  cursor: default;
+}

alcs-frontend/src/app/features/application/decision/conditions/condition-card-dialog/condition-card-dialog.component.spec.ts

@@ -0,0 +1,55 @@
+import { NO_ERRORS_SCHEMA } from '@angular/core';
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
+import { createMock, DeepMocked } from '@golevelup/ts-jest';
+import { MatDialogModule, MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
+import { MatTableModule } from '@angular/material/table';
+import { MatSortModule } from '@angular/material/sort';
+import { HttpClientTestingModule } from '@angular/common/http/testing';
+import { RouterTestingModule } from '@angular/router/testing';
+import { ApplicationDecisionConditionCardService } from '../../../../../services/application/decision/application-decision-v2/application-decision-condition/application-decision-condition-card/application-decision-condition-card.service';
+import { BoardService } from '../../../../../services/board/board.service';
+import { ToastService } from '../../../../../services/toast/toast.service';
+import { ConditionCardDialogComponent } from './condition-card-dialog.component';
+
+describe('ConditionCardDialogComponent', () => {
+  let component: ConditionCardDialogComponent;
+  let fixture: ComponentFixture<ConditionCardDialogComponent>;
+  let mockDecisionConditionCardService: DeepMocked<ApplicationDecisionConditionCardService>;
+  let mockBoardService: DeepMocked<BoardService>;
+  let mockToastService: DeepMocked<ToastService>;
+
+  beforeEach(async () => {
+    mockDecisionConditionCardService = createMock();
+    mockBoardService = createMock();
+    mockToastService = createMock();
+
+    await TestBed.configureTestingModule({
+      declarations: [ConditionCardDialogComponent],
+      imports: [
+        MatDialogModule,
+        BrowserAnimationsModule,
+        MatTableModule,
+        MatSortModule,
+        HttpClientTestingModule,
+        RouterTestingModule,
+      ],
+      providers: [
+        { provide: MAT_DIALOG_DATA, useValue: { conditions: [], decision: 'decision-uuid' } },
+        { provide: MatDialogRef, useValue: {} },
+        { provide: ApplicationDecisionConditionCardService, useValue: mockDecisionConditionCardService },
+        { provide: BoardService, useValue: mockBoardService },
+        { provide: ToastService, useValue: mockToastService },
+      ],
+      schemas: [NO_ERRORS_SCHEMA],
+    }).compileComponents();
+
+    fixture = TestBed.createComponent(ConditionCardDialogComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});