Merge pull request #1150 from bcgov/feature/ALCS-1287-2

Covenant Bug Fixes
bcgov · Nov 9, 2023 · cba129f · cba129f
2 parents 3248aab + e839980
commit cba129f
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 0 deletions.
diff --git a/...s/application/applicant-info/application-details/cove-details/cove-details.component.scss b/...s/application/applicant-info/application-details/cove-details/cove-details.component.scss
@@ -6,4 +6,5 @@
   grid-column-gap: 36px;
   grid-row-gap: 12px;
   margin-bottom: 12px;
+  overflow-y: hidden;
 }
diff --git a/...rc/app/features/applications/application-details/cove-details/cove-details.component.scss b/...rc/app/features/applications/application-details/cove-details/cove-details.component.scss
@@ -8,4 +8,5 @@
   grid-column-gap: rem(36);
   grid-row-gap: rem(12);
   margin-bottom: rem(12);
+  overflow-y: hidden;
 }
diff --git a/...d/src/app/features/public/application/submission/cove-details/cove-details.component.scss b/...d/src/app/features/public/application/submission/cove-details/cove-details.component.scss
@@ -9,4 +9,5 @@
   grid-column-gap: rem(36);
   grid-row-gap: rem(12);
   margin-bottom: rem(12);
+  overflow-y: hidden;
 }
diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.spec.ts
@@ -706,6 +706,7 @@ describe('ApplicationSubmissionService', () => {
       new ApplicationDocument({}),
       new User({
         uuid: 'user_uuid',
+        clientRoles: [],
       }),
     );
 
@@ -721,6 +722,7 @@ describe('ApplicationSubmissionService', () => {
       new ApplicationDocument({}),
       new User({
         uuid: 'NOT_user_uuid',
+        clientRoles: [],
       }),
     );
 

diff --git a/services/apps/alcs/src/portal/application-submission/application-submission.service.ts b/services/apps/alcs/src/portal/application-submission/application-submission.service.ts
@@ -1078,6 +1078,13 @@ export class ApplicationSubmissionService {
   }
 
   async canDeleteDocument(document: ApplicationDocument, user: User) {
+    const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) =>
+      user.clientRoles!.includes(value),
+    );
+    if (overlappingRoles.length > 0) {
+      return true;
+    }
+
     const documentFlags = await this.getDocumentFlags(document);
 
     const isOwner = user.uuid === documentFlags.ownerUuid;

diff --git a/...s/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/...s/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts
@@ -499,6 +499,7 @@ describe('NoticeOfIntentSubmissionService', () => {
       new NoticeOfIntentDocument({}),
       new User({
         uuid: 'user_uuid',
+        clientRoles: [],
       }),
     );
 
@@ -514,6 +515,7 @@ describe('NoticeOfIntentSubmissionService', () => {
       new NoticeOfIntentDocument({}),
       new User({
         uuid: 'NOT_user_uuid',
+        clientRoles: [],
       }),
     );
 

diff --git a/...s/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/...s/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts
@@ -611,6 +611,13 @@ export class NoticeOfIntentSubmissionService {
   }
 
   async canDeleteDocument(document: NoticeOfIntentDocument, user: User) {
+    const overlappingRoles = ROLES_ALLOWED_APPLICATIONS.filter((value) =>
+      user.clientRoles!.includes(value),
+    );
+    if (overlappingRoles.length > 0) {
+      return true;
+    }
+
     const documentFlags = await this.getDocumentFlags(document);
 
     const isOwner = user.uuid === documentFlags.ownerUuid;