Merge pull request #855 from bcgov/feature/ALCS-964

Sort columns and implement column delete
bcgov · Aug 4, 2023 · 2c45a20 · 2c45a20
2 parents 5f36d69 + b80e09f
commit 2c45a20
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 2 deletions.
diff --git a/...d/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html b/...d/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.html
@@ -37,7 +37,7 @@ <h4>{{ isEdit ? 'Edit' : 'Create' }} Column</h4>
 
   <div class="split">
     <div [matTooltip]="canDeleteReason" [matTooltipDisabled]="canDelete">
-      <button [disabled]="!canDelete" mat-stroked-button color="warn" mat-dialog-close="false">Delete</button>
+      <button [disabled]="!canDelete" (click)='onDelete()' mat-stroked-button color="warn">Delete</button>
     </div>
     <div class="button-container">
       <button mat-stroked-button color="primary" mat-dialog-close="false">Close</button>

diff --git a/...end/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts b/...end/src/app/features/admin/card-status/card-status-dialog/card-status-dialog.component.ts
@@ -60,4 +60,9 @@ export class CardStatusDialogComponent implements OnInit {
       this.canDeleteReason = res.reason;
     }
   }
+
+  async onDelete() {
+    await this.cardStatusService.delete(this.code);
+    this.dialogRef.close(true);
+  }
 }
diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.spec.ts
@@ -122,4 +122,13 @@ describe('CardStatusController', () => {
     expect(res.canDelete).toBeTruthy();
     expect(mockBoardService.getBoardsWithStatus).toHaveBeenCalledTimes(1);
   });
+
+  it('should call the service for delete', async () => {
+    mockCardStatusService.delete.mockResolvedValue({} as any);
+
+    const res = await controller.delete('FAKE-CODE');
+
+    expect(res).toBeDefined();
+    expect(mockCardStatusService.delete).toHaveBeenCalledTimes(1);
+  });
 });
diff --git a/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts b/services/apps/alcs/src/alcs/admin/card-status/card-status.controller.ts
@@ -1,6 +1,7 @@
 import {
   Body,
   Controller,
+  Delete,
   Get,
   Param,
   Patch,
@@ -81,6 +82,12 @@ export class CardStatusController {
     return await this.cardStatusService.update(code, updateDto);
   }
 
+  @Delete('/:code')
+  @UserRoles(AUTH_ROLE.ADMIN)
+  async delete(@Param('code') code: string) {
+    return await this.cardStatusService.delete(code);
+  }
+
   @Post('')
   @UserRoles(AUTH_ROLE.ADMIN)
   async create(@Body() createDto: CardStatusDto) {

diff --git a/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts b/services/apps/alcs/src/alcs/card/card-status/card-status.service.ts
@@ -53,4 +53,10 @@ export class CardStatusService {
     const cards = await this.cardService.getByCardStatus(code);
     return cards.length;
   }
+
+  async delete(code: string) {
+    const cardStatus = await this.getOneOrFail(code);
+
+    return await this.cardStatusRepository.remove(cardStatus);
+  }
 }
diff --git a/services/apps/alcs/src/common/automapper/board.automapper.profile.ts b/services/apps/alcs/src/common/automapper/board.automapper.profile.ts
@@ -38,7 +38,9 @@ export class BoardAutomapperProfile extends AutomapperProfile {
         forMember(
           (ad) => ad.statuses,
           mapFrom((a) =>
-            this.mapper.mapArray(a.statuses, BoardStatus, BoardStatusDto),
+            this.mapper
+              .mapArray(a.statuses, BoardStatus, BoardStatusDto)
+              .sort((a1, b) => a1.order - b.order),
           ),
         ),
         forMember(