Merge pull request #441 from bcgov/oleks

DSS-573: Sends Notices to invalid host emails

frontend/src/app/app.routes.ts

@@ -9,7 +9,7 @@ import { PageNotFoundComponent } from './common/components/page-not-found/page-n
 import { approvedUserGuard } from './common/guards/approved-user.guard';
 import { activeUserGuard } from './common/guards/active-user.guard';
 import { accessRequestTokenGuard } from './common/guards/access-request-token.guard';
-import { listing_file_upload, listing_read, role_read, role_write, takedown_action, user_write } from './common/consts/permissions.const';
+import { listing_file_upload, listing_read, role_read, role_write, takedown_action, upload_history_read, user_write } from './common/consts/permissions.const';
 import { hasPermissionsGuard } from './common/guards/has-permissions.guard';
 import { TermsAndConditionsComponent } from './common/components/terms-and-conditions/terms-and-conditions.component';
 import { areTermsAceptedGuard } from './common/guards/are-terms-acepted.guard';
@@ -38,7 +38,7 @@ export const routes: Routes = [
         path: 'upload-listing-history',
         canActivate: [approvedUserGuard, activeUserGuard, areTermsAceptedGuard, hasPermissionsGuard],
         component: ListingUploadHistoryComponent,
-        data: { permissions: [listing_file_upload] }
+        data: { permissions: [upload_history_read] }
     },
     {
         path: 'terms-and-conditions',

frontend/src/app/common/consts/permissions.const.ts

@@ -7,4 +7,5 @@ export const listing_read: string = 'listing_read';
 export const ceu_action: string = 'ceu_action';
 export const audit_read: string = 'audit_read';
 export const role_read: string = 'role_read';
-export const role_write: string = 'role_write';
+export const role_write: string = 'role_write';
+export const upload_history_read: string = 'upload_history_read';

frontend/src/app/common/services/dashboard.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { DashboardCard } from '../models/dashboard-card';
-import { ceu_action, listing_file_upload, listing_read, role_read, takedown_action, user_write } from '../consts/permissions.const';
+import { ceu_action, listing_file_upload, listing_read, role_read, takedown_action, upload_history_read, user_write } from '../consts/permissions.const';
 import { User } from '../models/user';
 
 @Injectable({
@@ -41,7 +41,7 @@ export class DashboardService {
     this.cards = [
       {
         title: 'Platform Upload History',
-        accessPermission: listing_file_upload,
+        accessPermission: upload_history_read,
         description: 'View all platform upload history here',
         buttonIcon: '',
         buttonText: 'Platform Upload History',

frontend/src/app/common/services/top-menu.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@angular/core';
 import { TopMenuItem } from '../models/top-menu-item';
-import { ceu_action, licence_file_upload, listing_file_upload, listing_read, role_read, takedown_action, user_write } from '../consts/permissions.const';
+import { ceu_action, licence_file_upload, listing_file_upload, listing_read, role_read, takedown_action, upload_history_read, user_write } from '../consts/permissions.const';
 import { User } from '../models/user';
 
 @Injectable({
@@ -94,7 +94,7 @@ export class TopMenuService {
         folderName: 'Upload',
       },
       {
-        accessPermission: listing_file_upload,
+        accessPermission: upload_history_read,
         buttonId: 'platformUploadHistory_mi_btn',
         route: '/upload-listing-history',
         description: 'View all platform upload history here',

frontend/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.html

@@ -71,18 +71,22 @@ <h4>All fields are required except where stated.</h4>
                 <td [class.warning]="listing.matchScoreAmt<addressWarningScoreLimit">{{ listing.matchAddressTxt }}
                 </td>
                 <td>
-                    <p-checkbox [(ngModel)]="listing.sendNoticeToHosts" [binary]="true" inputId="binary"></p-checkbox>
+                    <p-checkbox [disabled]="!listing.hasAtLeastOneValidHostEmail"
+                        [(ngModel)]="listing.sendNoticeToHosts" [binary]="true" inputId="binary"></p-checkbox>
                 </td>
-                <td>{{ !listing.hasAtLeastOneValidHostEmail? 'Yes':'No' }}</td>
+                <td [class.no-email]="!listing.hasAtLeastOneValidHostEmail">{{ !listing.hasAtLeastOneValidHostEmail?
+                    'Yes':'No' }}</td>
                 <td class="host-info limit-width">
                     <span class="tip" (click)="op.toggle($event)">
                         <i class="pi pi-info-circle"></i>
                     </span>
                     <p-overlayPanel #op>
-                        <span class="host-data" *ngFor="let hostData of listing.hostsInfo"
-                            [class.invalid-email]="!hostData.hasValidEmail">{{hostData.host}}<br></span>
+                        <span class="host-data" *ngFor="let hostData of listing.hosts"
+                            [class.invalid-email]="!hostData.hasValidEmail">{{hostData.fullNm}}
+                            {{hostData.emailAddressDsc}}<br></span>
                     </p-overlayPanel>
-                    <span class="host-data" *ngFor="let hostData of listing.hostsInfo">{{hostData.host}};</span>
+                    <span class="host-data" *ngFor="let hostData of listing.hosts">{{hostData.fullNm}}
+                        {{hostData.emailAddressDsc}};</span>
                 </td>
             </tr>
         </ng-template>

frontend/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.scss

@@ -35,6 +35,12 @@
                 }
             }
         }
+
+        td {
+            &.no-email {
+                color: #D32F2F;
+            }
+        }
     }
 
     .limit-width {

frontend/src/app/features/components/bulk-compliance-notice/bulk-compliance-notice.component.ts

@@ -81,7 +81,7 @@ export class BulkComplianceNoticeComponent implements OnInit {
         else {
           this.returnUrl = param['returnUrl'];
           this.listings = [...this.searchStateService.selectedListings];
-          this.extendedListings = this.listings.map((listing) => ({ ...listing, sendNoticeToHosts: true }));
+          this.extendedListings = this.listings.map((listing) => ({ ...listing, sendNoticeToHosts: listing.hasAtLeastOneValidHostEmail }));
           this.searchStateService.selectedListings = new Array<ListingDetailsWithHostCheckboxExtension>();
           this.selectedListings = this.extendedListings;
 

frontend/src/app/features/components/listings-table/listing-details/listing-details.component.ts

@@ -65,16 +65,16 @@ export class ListingDetailsComponent implements OnInit {
 
   sendTakedownRequest(): void {
     this.searchStateService.selectedListings = [this.listing];
-    this.router.navigate(['/bulk-takedown-request'], { queryParams: { returnUrl: this.getUrlFromState() } })
+    this.router.navigate(['/bulk-takedown-request'], { queryParams: { returnUrl: this.getUrlFromState() } });
   }
 
   sendNoticeOfNonCompliance(): void {
     this.searchStateService.selectedListings = [this.listing];
-    this.router.navigate(['/bulk-compliance-notice'], { queryParams: { returnUrl: this.getUrlFromState() } })
+    this.router.navigate(['/bulk-compliance-notice'], { queryParams: { returnUrl: this.getUrlFromState() } });
   }
 
   private getUrlFromState(): string {
-    return `/listing/${this.id}`
+    return `/listing/${this.id}`;
   }
 
   private getListingDetailsById(id: number): void {