diff --git a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss b/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss index 6ae03fd94e..ee94070123 100644 --- a/alcs-frontend/src/app/features/application/applicant-info/application-details/cove-details/cove-details.component.scss +++ b/alcs-frontend/src/app/features/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/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss index a2993dd182..8873c2183e 100644 --- a/portal-frontend/src/app/features/applications/application-details/cove-details/cove-details.component.scss +++ b/portal-frontend/src/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/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss b/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss index d1f221301c..3c6d77658f 100644 --- a/portal-frontend/src/app/features/public/application/submission/cove-details/cove-details.component.scss +++ b/portal-frontend/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 index 8eb2f02e21..8dbeb1a57c 100644 --- 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 index 92d536f50d..158054d176 100644 --- 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/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts index 4408c939be..ab2c5b609c 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.spec.ts +++ b/services/apps/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/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts b/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts index 18df0e3920..3db3992421 100644 --- a/services/apps/alcs/src/portal/notice-of-intent-submission/notice-of-intent-submission.service.ts +++ b/services/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;