Merge pull request #2654 from bcgov/2525-red-button-bug

trslater · web-flow · commit 8c05b8b43b54 · 2025-12-01T13:14:48.000-08:00
2525/2618/2640 Document Fixes &amp; Red Button Bug Fix
diff --git a/alcs-frontend/src/app/features/compliance-and-enforcement/draft/draft.component.scss b/alcs-frontend/src/app/features/compliance-and-enforcement/draft/draft.component.scss
@@ -22,12 +22,4 @@ section.form-section {
   align-items: center;
 }
 .left-actions { display: flex; }
-.right-actions { display: flex; gap: 12px; }
-
-
-::ng-deep .cdk-overlay-container .mat-mdc-dialog-container {
-  .button-container button[mat-flat-button]:last-child {
-    background-color: $error-color !important;
-    color: white !important;
-  }
-}
+.right-actions { display: flex; gap: 12px; }
diff --git a/alcs-frontend/src/app/features/compliance-and-enforcement/draft/draft.component.ts b/alcs-frontend/src/app/features/compliance-and-enforcement/draft/draft.component.ts
@@ -33,6 +33,7 @@ import { Section } from '../../../services/compliance-and-enforcement/documents/
 import { ResponsiblePartiesComponent } from '../responsible-parties/responsible-parties.component';
 import { ResponsiblePartiesService } from '../../../services/compliance-and-enforcement/responsible-parties/responsible-parties.service';
 import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service';
+import { ConfirmationDialogColor } from '../../../shared/confirmation-dialog/confirmation-dialog.component';
 
 export const submissionDocumentOptions: DocumentUploadDialogData = {
   // A necessary hack to make this work without rewriting lots of code
@@ -350,6 +351,7 @@ export class DraftComponent implements OnInit, AfterViewInit, OnDestroy {
       body: 'Are you sure you want to discard this draft? All data will be permanently deleted.',
       yesButtonText: 'Discard',
       cancelButtonText: 'Cancel',
+      confirmButtonColor: ConfirmationDialogColor.WARN,
     });
 
     dialogRef.subscribe(async (confirmed: boolean) => {
diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts b/alcs-frontend/src/app/features/notification/documents/documents.component.spec.ts
@@ -5,6 +5,7 @@ import { createMock, DeepMocked } from '@golevelup/ts-jest';
 import { BehaviorSubject } from 'rxjs';
 import { NotificationDetailService } from '../../../services/notification/notification-detail.service';
 import { NotificationDocumentService } from '../../../services/notification/notification-document/notification-document.service';
+import { NotificationParcelService } from '../../../services/notification/notification-parcel/notification-parcel.service';
 import { NotificationDto } from '../../../services/notification/notification.dto';
 import { ToastService } from '../../../services/toast/toast.service';
 
@@ -15,12 +16,14 @@ describe('NotificationDocumentsComponent', () => {
   let fixture: ComponentFixture<NotificationDocumentsComponent>;
   let mockNotificationDocumentService: DeepMocked<NotificationDocumentService>;
   let mockNotificationDetailService: DeepMocked<NotificationDetailService>;
+  let mockNotificationParcelService: DeepMocked<NotificationParcelService>;
   let mockDialog: DeepMocked<MatDialog>;
   let mockToastService: DeepMocked<ToastService>;
 
   beforeEach(async () => {
     mockNotificationDocumentService = createMock();
     mockNotificationDetailService = createMock();
+    mockNotificationParcelService = createMock();
     mockDialog = createMock();
     mockToastService = createMock();
     mockNotificationDetailService.$notification = new BehaviorSubject<NotificationDto | undefined>(undefined);
@@ -36,6 +39,10 @@ describe('NotificationDocumentsComponent', () => {
           provide: NotificationDetailService,
           useValue: mockNotificationDetailService,
         },
+        {
+          provide: NotificationParcelService,
+          useValue: mockNotificationParcelService,
+        },
         {
           provide: MatDialog,
           useValue: mockDialog,
diff --git a/alcs-frontend/src/app/features/notification/documents/documents.component.ts b/alcs-frontend/src/app/features/notification/documents/documents.component.ts
@@ -7,6 +7,7 @@ import { NoticeOfIntentDocumentDto } from '../../../services/notice-of-intent/no
 import { NotificationDetailService } from '../../../services/notification/notification-detail.service';
 import { NotificationDocumentDto } from '../../../services/notification/notification-document/notification-document.dto';
 import { NotificationDocumentService } from '../../../services/notification/notification-document/notification-document.service';
+import { NotificationParcelService } from '../../../services/notification/notification-parcel/notification-parcel.service';
 import { ToastService } from '../../../services/toast/toast.service';
 import { ConfirmationDialogService } from '../../../shared/confirmation-dialog/confirmation-dialog.service';
 import { DOCUMENT_SYSTEM } from '../../../shared/document/document.dto';
@@ -42,6 +43,7 @@ export class NotificationDocumentsComponent implements OnInit {
   constructor(
     private notificationDocumentService: NotificationDocumentService,
     private notificationDetailService: NotificationDetailService,
+    public notificationParcelService: NotificationParcelService,
     private confirmationDialogService: ConfirmationDialogService,
     private toastService: ToastService,
     public dialog: MatDialog
@@ -62,6 +64,7 @@ export class NotificationDocumentsComponent implements OnInit {
       ...{
         fileId: this.fileId,
         documentService: this.notificationDocumentService,
+        parcelService: this.notificationParcelService,
       },
     };
 
@@ -110,6 +113,7 @@ export class NotificationDocumentsComponent implements OnInit {
         fileId: this.fileId,
         existingDocument: element,
         documentService: this.notificationDocumentService,
+        parcelService: this.notificationParcelService,
       },
     };
 
diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.html
@@ -12,5 +12,5 @@
 </div>
 <div class="button-container" mat-dialog-actions align="end">
   <button mat-stroked-button color="primary" [mat-dialog-close]="false">{{ data.cancelButtonText ?? 'Cancel' }}</button>
-  <button mat-flat-button color="primary" [mat-dialog-close]="true">{{ data.yesButtonText ?? 'Yes' }}</button>
+  <button mat-flat-button [color]="data.confirmButtonColor ?? 'primary'" [mat-dialog-close]="true">{{ data.yesButtonText ?? 'Yes' }}</button>
 </div>
diff --git a/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts b/alcs-frontend/src/app/shared/confirmation-dialog/confirmation-dialog.component.ts
@@ -1,6 +1,12 @@
 import { Component, Inject } from '@angular/core';
 import { MAT_DIALOG_DATA, MatDialogRef } from '@angular/material/dialog';
 
+export enum ConfirmationDialogColor {
+  PRIMARY = 'primary',
+  ACCENT = 'accent',
+  WARN = 'warn',
+}
+
 export enum ConfirmationDialogStyle {
   WARN = 'warn',
 }
@@ -10,6 +16,7 @@ export interface DialogData {
   title?: string;
   yesButtonText?: string;
   cancelButtonText?: string;
+  confirmButtonColor?: ConfirmationDialogColor;
   style?: ConfirmationDialogStyle;
 }
 
@@ -20,6 +27,7 @@ export interface DialogData {
 })
 export class ConfirmationDialogComponent {
   ConfirmationDialogStyle = ConfirmationDialogStyle;
+  
 
   constructor(
     public dialogRef: MatDialogRef<ConfirmationDialogComponent>,
diff --git a/alcs-frontend/src/app/shared/document-upload-dialog/document-upload-dialog.component.html b/alcs-frontend/src/app/shared/document-upload-dialog/document-upload-dialog.component.html
@@ -88,7 +88,14 @@ <h4>{{ title }} Document</h4>
         </mat-select>
       </mat-form-field>
     </div>
-    <div *ngIf="type.value !== DOCUMENT_TYPE.CERTIFICATE_OF_TITLE && type.value !== DOCUMENT_TYPE.SURVEY_PLAN && !data.fixedParcel && selectableParcels">
+    <div
+      *ngIf="
+        type.value === DOCUMENT_TYPE.CERTIFICATE_OF_TITLE &&
+        !data.fixedParcel &&
+        selectableParcels &&
+        selectableParcels.length > 0
+      "
+    >
       <mat-form-field appearance="outline" class="full-width">
         <mat-label>Associated Parcel</mat-label>
         <mat-select [formControl]="parcelId">
diff --git a/alcs-frontend/src/app/shared/document-upload-dialog/document-upload-dialog.dto.ts b/alcs-frontend/src/app/shared/document-upload-dialog/document-upload-dialog.dto.ts
@@ -35,7 +35,7 @@ export interface DocumentDto {
 
 export interface SelectableParcelDto {
   uuid: string;
-  pid?: string;
+  pid?: string | null;
   certificateOfTitleUuid?: string;
 }
 
diff --git a/services/apps/alcs/src/alcs/compliance-and-enforcement/chronology/chronology.service.spec.ts b/services/apps/alcs/src/alcs/compliance-and-enforcement/chronology/chronology.service.spec.ts
@@ -1,28 +1,31 @@
+import { CONFIG_TOKEN } from '@app/common/config/config.module';
+import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
-import { AutomapperModule } from 'automapper-nestjs';
 import { classes } from 'automapper-classes';
-import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
-import { CONFIG_TOKEN } from '@app/common/config/config.module';
+import { AutomapperModule } from 'automapper-nestjs';
 import * as config from 'config';
-import { ComplianceAndEnforcementChronologyService } from './chronology.service';
+import { Repository } from 'typeorm';
+import { UserService } from '../../../user/user.service';
+import { ComplianceAndEnforcement } from '../compliance-and-enforcement.entity';
+import { ComplianceAndEnforcementService } from '../compliance-and-enforcement.service';
 import { ComplianceAndEnforcementChronologyProfile } from './chronology.automapper.profile';
 import { ComplianceAndEnforcementChronologyEntry } from './chronology.entity';
-import { ComplianceAndEnforcementService } from '../compliance-and-enforcement.service';
-import { ComplianceAndEnforcement } from '../compliance-and-enforcement.entity';
+import { ComplianceAndEnforcementChronologyService } from './chronology.service';
 
 describe('ComplianceAndEnforcementChronologyService', () => {
   let service: ComplianceAndEnforcementChronologyService;
   let mockComplianceAndEnforcementChronologyRepository: DeepMocked<Repository<ComplianceAndEnforcementChronologyEntry>>;
   let mockComplianceAndEnforcementRepository: DeepMocked<Repository<ComplianceAndEnforcement>>;
   let mockComplianceAndEnforcementService: DeepMocked<ComplianceAndEnforcementService>;
+  let mockUserService: DeepMocked<UserService>;
 
   beforeEach(async () => {
     mockComplianceAndEnforcementChronologyRepository =
       createMock<Repository<ComplianceAndEnforcementChronologyEntry>>();
     mockComplianceAndEnforcementRepository = createMock<Repository<ComplianceAndEnforcement>>();
     mockComplianceAndEnforcementService = createMock<ComplianceAndEnforcementService>();
+    mockUserService = createMock<UserService>();
 
     const module: TestingModule = await Test.createTestingModule({
       imports: [
@@ -45,6 +48,10 @@ describe('ComplianceAndEnforcementChronologyService', () => {
           provide: ComplianceAndEnforcementService,
           useValue: mockComplianceAndEnforcementService,
         },
+        {
+          provide: UserService,
+          useValue: mockUserService,
+        },
         {
           provide: CONFIG_TOKEN,
           useValue: config,
diff --git a/services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.controller.spec.ts b/services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.controller.spec.ts
@@ -1,12 +1,12 @@
-import { Test, TestingModule } from '@nestjs/testing';
-import { ComplianceAndEnforcementController } from './compliance-and-enforcement.controller';
-import { ComplianceAndEnforcementService } from './compliance-and-enforcement.service';
 import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
-import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes';
+import { Test, TestingModule } from '@nestjs/testing';
+import { classes } from 'automapper-classes';
+import { AutomapperModule } from 'automapper-nestjs';
 import { ClsService } from 'nestjs-cls';
+import { mockKeyCloakProviders } from '../../../test/mocks/mockTypes';
+import { ComplianceAndEnforcementController } from './compliance-and-enforcement.controller';
 import { ComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
-import { AutomapperModule } from 'automapper-nestjs';
-import { classes } from 'automapper-classes';
+import { ComplianceAndEnforcementService } from './compliance-and-enforcement.service';
 
 describe('ComplianceAndEnforcementController', () => {
   let controller: ComplianceAndEnforcementController;
@@ -55,6 +55,7 @@ describe('ComplianceAndEnforcementController', () => {
           allegedContraventionNarrative: '',
           allegedActivity: [],
           intakeNotes: '',
+          chronologyClosedAt: 0,
         },
         {
           uuid: '2',
@@ -66,6 +67,7 @@ describe('ComplianceAndEnforcementController', () => {
           allegedContraventionNarrative: '',
           allegedActivity: [],
           intakeNotes: '',
+          chronologyClosedAt: 0,
         },
       ];
       mockComplianceAndEnforcementService.fetchAll.mockResolvedValue(result);
@@ -86,10 +88,11 @@ describe('ComplianceAndEnforcementController', () => {
         allegedContraventionNarrative: '',
         allegedActivity: [],
         intakeNotes: '',
+        chronologyClosedAt: 0,
       };
-      mockComplianceAndEnforcementService.fetchByFileNumber.mockResolvedValue(result);
+      mockComplianceAndEnforcementService.fetchById.mockResolvedValue(result);
       expect(await controller.fetchByFileNumber('1', true)).toEqual(result);
-      expect(mockComplianceAndEnforcementService.fetchByFileNumber).toHaveBeenCalledWith('1', true, false, false);
+      expect(mockComplianceAndEnforcementService.fetchById).toHaveBeenCalledWith('1', 'fileNumber', true, false, false);
     });
   });
 
@@ -106,6 +109,7 @@ describe('ComplianceAndEnforcementController', () => {
         allegedContraventionNarrative: '',
         allegedActivity: [],
         intakeNotes: '',
+        chronologyClosedAt: 0,
       };
       mockComplianceAndEnforcementService.create.mockResolvedValue(resultDto);
       expect(await controller.create(createDto, true)).toEqual(resultDto);
@@ -136,6 +140,7 @@ describe('ComplianceAndEnforcementController', () => {
         allegedContraventionNarrative: '',
         allegedActivity: [],
         intakeNotes: '',
+        chronologyClosedAt: 0,
       };
       mockComplianceAndEnforcementService.update.mockResolvedValue(resultDto);
       expect(await controller.update('1', updateDto)).toEqual(resultDto);
diff --git a/services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.service.spec.ts b/services/apps/alcs/src/alcs/compliance-and-enforcement/compliance-and-enforcement.service.spec.ts
@@ -1,21 +1,21 @@
+import { CONFIG_TOKEN } from '@app/common/config/config.module';
+import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
 import { Test, TestingModule } from '@nestjs/testing';
-import { ComplianceAndEnforcementService } from './compliance-and-enforcement.service';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
-import { AllegedActivity, ComplianceAndEnforcement, InitialSubmissionType } from './compliance-and-enforcement.entity';
-import { AutomapperModule } from 'automapper-nestjs';
 import { classes } from 'automapper-classes';
-import { createMock, DeepMocked } from '@golevelup/nestjs-testing';
-import { CONFIG_TOKEN } from '@app/common/config/config.module';
+import { AutomapperModule } from 'automapper-nestjs';
 import * as config from 'config';
-import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
-import { ComplianceAndEnforcementProfile } from './compliance-and-enforcement.automapper.profile';
+import { Repository } from 'typeorm';
 import { ServiceNotFoundException } from '../../../../../libs/common/src/exceptions/base.exception';
-import { ComplianceAndEnforcementSubmitterService } from './submitter/submitter.service';
-import { ComplianceAndEnforcementSubmitterProfile } from './submitter/submitter.automapper.profile';
-import { ComplianceAndEnforcementPropertyService } from './property/property.service';
-import { ComplianceAndEnforcementValidatorService } from './compliance-and-enforcement-validator.service';
 import { UserService } from '../../user/user.service';
+import { ComplianceAndEnforcementValidatorService } from './compliance-and-enforcement-validator.service';
+import { ComplianceAndEnforcementProfile } from './compliance-and-enforcement.automapper.profile';
+import { ComplianceAndEnforcementDto, UpdateComplianceAndEnforcementDto } from './compliance-and-enforcement.dto';
+import { AllegedActivity, ComplianceAndEnforcement, InitialSubmissionType } from './compliance-and-enforcement.entity';
+import { ComplianceAndEnforcementService } from './compliance-and-enforcement.service';
+import { ComplianceAndEnforcementPropertyService } from './property/property.service';
+import { ComplianceAndEnforcementSubmitterProfile } from './submitter/submitter.automapper.profile';
+import { ComplianceAndEnforcementSubmitterService } from './submitter/submitter.service';
 
 const mockComplianceAndEnforcement = new ComplianceAndEnforcement({
   uuid: '1',
@@ -98,6 +98,9 @@ describe('ComplianceAndEnforcementService', () => {
       dateClosed: 0,
       submitters: [],
       assignee: undefined,
+      chronologyClosedAt: undefined as any,
+      chronologyClosedBy: undefined,
+      property: undefined,
     };
     it('should return all records', async () => {
       mockComplianceAndEnforcementRepository.find.mockResolvedValue([mockComplianceAndEnforcement]);
@@ -114,9 +117,12 @@ describe('ComplianceAndEnforcementService', () => {
         dateClosed: 0,
         submitters: [],
         assignee: undefined,
+        chronologyClosedAt: undefined as any,
+        chronologyClosedBy: undefined,
+        property: undefined,
       };
       mockComplianceAndEnforcementRepository.findOne.mockResolvedValue(mockComplianceAndEnforcement);
-      expect(await service.fetchByFileNumber('1')).toEqual(resultDto);
+      expect(await service.fetchById('1', 'fileNumber')).toEqual(resultDto);
     });
   });
 
@@ -131,6 +137,9 @@ describe('ComplianceAndEnforcementService', () => {
         dateClosed: 0,
         submitters: [],
         assignee: undefined,
+        chronologyClosedAt: undefined as any,
+        chronologyClosedBy: undefined,
+        property: undefined,
       };
       mockComplianceAndEnforcementRepository.save.mockResolvedValue(mockComplianceAndEnforcement);
       expect(await service.create(createDto)).toEqual(resultDto);
@@ -152,6 +161,9 @@ describe('ComplianceAndEnforcementService', () => {
         dateClosed: 0,
         submitters: [],
         assignee: undefined,
+        chronologyClosedAt: undefined as any,
+        chronologyClosedBy: undefined,
+        property: undefined,
       };
       mockComplianceAndEnforcementRepository.save.mockResolvedValue(mockComplianceAndEnforcement);
       mockComplianceAndEnforcementRepository.findOneBy.mockResolvedValue(mockComplianceAndEnforcement);
diff --git a/services/apps/alcs/src/alcs/compliance-and-enforcement/document/document.controller.ts b/services/apps/alcs/src/alcs/compliance-and-enforcement/document/document.controller.ts
@@ -57,8 +57,8 @@ export class ComplianceAndEnforcementDocumentController {
       fileKey: `compliance-and-enforcement/${fileNumber}/${v4()}`,
       source: req.body.source.value as DOCUMENT_SOURCE,
       system: DOCUMENT_SYSTEM.ALCS,
-      section: req.body.section.value as Section,
-      chronologyEntry: req.body.chronologyEntryUuid.value as string,
+      section: req.body.section?.value as Section,
+      chronologyEntry: req.body.chronologyEntryUuid?.value as string,
     };
 
     // Use C&E-specific terminology
diff --git a/services/apps/alcs/src/alcs/compliance-and-enforcement/document/document.service.ts b/services/apps/alcs/src/alcs/compliance-and-enforcement/document/document.service.ts
@@ -105,10 +105,13 @@ export class ComplianceAndEnforcementDocumentService {
       throw new ServiceNotFoundException('Compliance and Enforcement file not found.');
     }
 
-    const chronologyEntry = await this.chronologyEntryRepository.findOneBy({ uuid: createDto.chronologyEntry });
+    let chronologyEntry: ComplianceAndEnforcementChronologyEntry | null = null;
+    if (createDto.chronologyEntry) {
+      chronologyEntry = await this.chronologyEntryRepository.findOneBy({ uuid: createDto.chronologyEntry });
 
-    if (!chronologyEntry) {
-      throw new ServiceNotFoundException('Chronology entry not found.');
+      if (!chronologyEntry) {
+        throw new ServiceNotFoundException('Chronology entry not found.');
+      }
     }
 
     const type = await this.documentCodeRepository.findOneBy({ code: createDto.typeCode });
@@ -122,7 +125,7 @@ export class ComplianceAndEnforcementDocumentService {
       document,
       type,
       section: createDto.section,
-      chronologyEntry,
+      chronologyEntry, // Pass null if not found
     });
 
     const savedEntity = await this.repository.save(entity);

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ export interface DocumentDto {`
`35`	`35`
`36`	`36`	`export interface SelectableParcelDto {`
`37`	`37`	`uuid: string;`
`38`		`- pid?: string;`
	`38`	`+ pid?: string \| null;`
`39`	`39`	`certificateOfTitleUuid?: string;`
`40`	`40`	`}`
`41`	`41`