Merge pull request #777 from bcgov/oleks

DSS-783, DSS-1005, DSS-1004, DSS-780, DSS-998: A few small fixes

frontend/src/app/common/pipes/text-cleanup.pipe.spec.ts

@@ -0,0 +1,8 @@
+import { TextCleanupPipe } from './text-cleanup.pipe';
+
+describe('TextCleanupPipe', () => {
+  it('create an instance', () => {
+    const pipe = new TextCleanupPipe();
+    expect(pipe).toBeTruthy();
+  });
+});

frontend/src/app/common/pipes/text-cleanup.pipe.ts

@@ -0,0 +1,22 @@
+import { Pipe, PipeTransform } from '@angular/core';
+
+@Pipe({
+  name: 'textCleanup',
+  standalone: true,
+})
+export class TextCleanupPipe implements PipeTransform {
+
+  transform(value: string, ...args: unknown[]): string {
+    let cleanedValue = value;
+
+    cleanedValue = cleanedValue.trim();
+
+    if (cleanedValue.startsWith(',')) {
+      cleanedValue = cleanedValue.slice(1);
+      cleanedValue = cleanedValue.trim();
+    }
+
+    return cleanedValue;
+  }
+
+}

frontend/src/app/features/components/listings-table/aggregated-listings-table/aggregated-listings-table.component.html

@@ -118,7 +118,7 @@ <h2 class="title">Aggregated Listings</h2>
                         </span>
                     </td>
                     <td>{{ row.lastActionNm }}</td>
-                    <td>{{ row.lastActionDtm |date }}</td>
+                    <td>{{ row.lastActionDtm |date:'yyyy-MM-dd' }}</td>
                     <td>{{ row.listings.length }}</td>
                 </tr>
             </ng-template>
@@ -210,7 +210,7 @@ <h2 class="title">Aggregated Listings</h2>
                         </div>
                     </td>
                     <td>{{ listing.lastActionNm }}</td>
-                    <td>{{ listing.lastActionDtm |date }}</td>
+                    <td>{{ listing.lastActionDtm |date:'yyyy-MM-dd' }}</td>
                 </tr>
             </ng-template>
         </p-table>
@@ -222,7 +222,7 @@ <h2 class="title">Aggregated Listings</h2>
 <ng-template pTemplate="emptymessage">
     <tr>
         <td></td>
-        <td colspan="6">No listings matched your search. Please try again. </td>
+        <td colspan="7">No listings matched your search. Please try again. </td>
     </tr>
 </ng-template>
 </p-table>

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

@@ -104,7 +104,7 @@ <h2>Detailed Listing Information for</h2>
             </div>
             <div class="row">
                 <span class="label">Address (Platform Listing):</span>
-                <span class="value">{{listing.originalAddressTxt}}</span>
+                <span class="value">{{listing.originalAddressTxt | textCleanup}}</span>
             </div>
             <div class="row">
                 <span class="label">Entire Unit? (Platform Listing):</span>
@@ -211,7 +211,7 @@ <h2>Detailed Listing Information for</h2>
                     <ng-template pTemplate="body" let-addressChange>
                         <tr>
                             <td>{{ addressChange.type }}</td>
-                            <td>{{ addressChange.platformAddress }}</td>
+                            <td>{{ addressChange.platformAddress | textCleanup }}</td>
                             <td>{{ addressChange.bestMatchAddress }}</td>
                             <td>{{ addressChange.date |date:'yyyy-MM-dd' }}</td>
                             <td>{{ addressChange.user }}</td>
@@ -243,7 +243,7 @@ <h2>Detailed Listing Information for</h2>
                 <ng-template pTemplate="body" let-actionHistory>
                     <tr class="small-text">
                         <td>{{ actionHistory.action }}</td>
-                        <td>{{ actionHistory.date |date}}</td>
+                        <td>{{ actionHistory.date |date:'yyyy-MM-dd'}}</td>
                         <td>{{ actionHistory.user }}</td>
                     </tr>
                 </ng-template>

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

@@ -23,6 +23,7 @@ import { BusinessLicence } from '../../../../common/models/business-licence';
 import { BusinessLicenceService } from '../../../../common/services/business-licence.service';
 import { BLSearchResultRow } from '../../../../common/models/bl-search-result-row';
 import { UrlProtocolPipe } from '../../../../common/pipes/url-protocol.pipe';
+import { TextCleanupPipe } from '../../../../common/pipes/text-cleanup.pipe';
 
 @Component({
   selector: 'app-listing-details',
@@ -40,6 +41,7 @@ import { UrlProtocolPipe } from '../../../../common/pipes/url-protocol.pipe';
     TooltipModule,
     TagModule,
     UrlProtocolPipe,
+    TextCleanupPipe,
   ],
   templateUrl: './listing-details.component.html',
   styleUrl: './listing-details.component.scss'

frontend/src/app/features/components/manage-jurisdictions/manage-jurisdictions.component.html

@@ -40,7 +40,7 @@ <h2>Manage Jurisdictions</h2>
                     <i class="pi pi-angle-up"
                         *ngIf="this.sort && this.sort.prop === 'businessLicenceFormatTxt' && this.sort.dir === 'asc'"></i>
                 </th>
-                <th style="width: 19rem">Update Local Government Information</th>
+                <th *ngIf="canEdit" style="width: 19rem">Update Local Government Information</th>
             </tr>
         </ng-template>
 
@@ -58,7 +58,7 @@ <h2>Manage Jurisdictions</h2>
                 <td>{{jurisdiction.localGovernmentTypeNm || '-'}}</td>
                 <td>{{jurisdiction.organizationCd || '-'}}</td>
                 <td>{{jurisdiction.businessLicenceFormatTxt || '-'}} </td>
-                <td style="text-align: center">
+                <td *ngIf="canEdit" style="text-align: center">
                     <a id="lg-edit-{{index}}-icon"
                         [routerLink]="'/update-local-government-information/'+jurisdiction.organizationId">
                         <span class="edit-icon"></span>
@@ -114,7 +114,7 @@ <h2>Manage Jurisdictions</h2>
                     <i class="pi pi-angle-up"
                         *ngIf="this.sortSub && this.sortSub.prop === 'isBusinessLicenceRequired' && this.sortSub.dir === 'asc'"></i>
                 </th>
-                <th> Update Jurisdiction Info </th>
+                <th *ngIf="canEdit"> Update Jurisdiction Info </th>
             </tr>
         </ng-template>
 
@@ -125,7 +125,7 @@ <h2>Manage Jurisdictions</h2>
                 <td>{{jurisdiction.isPrincipalResidenceRequired?'Yes':'No'}} </td>
                 <td>{{jurisdiction.isStrProhibited?'Yes':'No'}} </td>
                 <td>{{jurisdiction.isBusinessLicenceRequired?'Yes':'No'}} </td>
-                <td style="text-align: center">
+                <td *ngIf="canEdit" style="text-align: center">
                     <a id="jurisdiction-edit-{{index}}-icon"
                         [routerLink]="'/update-jurisdiction-information/'+jurisdiction.organizationId">
                         <span class="edit-icon"></span>

frontend/src/app/features/components/manage-jurisdictions/manage-jurisdictions.component.ts

@@ -9,6 +9,8 @@ import { CommonModule } from '@angular/common';
 import { LocalGovernment } from '../../../common/models/jurisdiction';
 import { PagingResponse, PagingResponsePageInfo } from '../../../common/models/paging-response';
 import { GlobalLoaderService } from '../../../common/services/global-loader.service';
+import { UserDataService } from '../../../common/services/user-data.service';
+import { jurisdiction_write } from '../../../common/consts/permissions.const';
 
 @Component({
   selector: 'app-manage-jurisdictions',
@@ -30,9 +32,11 @@ export class ManageJurisdictionsComponent implements OnInit {
   sort!: { prop: string; dir: 'asc' | 'desc' };
   sortSub!: { prop: string; dir: 'asc' | 'desc' };
   currentPage!: PagingResponsePageInfo;
+  canEdit = false;
 
   constructor(
     private organizationsService: OrganizationService,
+    private userService: UserDataService,
     private cd: ChangeDetectorRef,
     private router: Router,
     private loaderService: GlobalLoaderService,
@@ -98,8 +102,6 @@ export class ManageJurisdictionsComponent implements OnInit {
         this.currentPage = result.pageInfo;
         this.jurisdictions = result.sourceList;
 
-        console.info('First jurisdiction', this.jurisdictions[0]);
-
         this.cd.detectChanges();
       },
       complete: () => {
@@ -115,6 +117,11 @@ export class ManageJurisdictionsComponent implements OnInit {
   }
 
   private init(): void {
+    this.canUserEditJurisdiction()
     this.getPlatforms();
   }
+
+  private canUserEditJurisdiction() {
+    this.canEdit = this.userService.currentUser.permissions.includes(jurisdiction_write);
+  }
 }

frontend/src/app/features/components/manage-jurisdictions/update-jurisdiction-information/update-jurisdiction-information.component.html

@@ -22,7 +22,7 @@ <h2>Update Jurisdiction Information</h2>
             <div class="col">
                 <div class="form-group-row">
                     <div class="form-group-row-col">
-                        <label for="shapeFileId">Jurisdiction Name</label>
+                        <label for="shapeFileId">Shape File ID</label>
                     </div>
                     <div class="form-group-row-col">
                         <input placeholder="Enter Value" [ngClass]="'full-width-text-field'" type="text" pInputText

frontend/src/app/features/components/platform-management/view-platform/view-platform.component.html

@@ -33,15 +33,38 @@ <h2>Detailed Platform Contact Information</h2>
                     </span>
                 </div>
                 <div class="row">
-                    <strong>Email for Non-Compliance Notices:</strong>
+                    <strong>Email(s) for Non-Compliance Notices:</strong>
                     <span>
-                        {{platform.primaryNoticeOfTakedownContactEmail || '-'}}
+                        @if(platform.primaryNoticeOfTakedownContactEmail &&
+                        platform.secondaryNoticeOfTakedownContactEmail){
+                        {{platform.primaryNoticeOfTakedownContactEmail}},
+                        {{platform.secondaryNoticeOfTakedownContactEmail}}
+                        } @else {
+                        {{platform.primaryNoticeOfTakedownContactEmail}}{{platform.secondaryNoticeOfTakedownContactEmail}}
+                        }
+
+                        @if(!platform.primaryNoticeOfTakedownContactEmail &&
+                        !platform.secondaryNoticeOfTakedownContactEmail){
+                        -
+                        }
+
                     </span>
                 </div>
                 <div class="row">
-                    <strong>Email for Takedown Request Letters:</strong>
+                    <strong>Email(s) for Takedown Request Letters:</strong>
                     <span>
-                        {{platform.primaryTakedownRequestContactEmail || '-'}}
+                        @if(platform.primaryTakedownRequestContactEmail &&
+                        platform.secondaryTakedownRequestContactEmail){
+                        {{platform.primaryTakedownRequestContactEmail}},
+                        {{platform.secondaryTakedownRequestContactEmail}}
+                        } @else {
+                        {{platform.primaryTakedownRequestContactEmail}}{{platform.secondaryTakedownRequestContactEmail}}
+                        }
+
+                        @if(!platform.primaryTakedownRequestContactEmail &&
+                        !platform.secondaryTakedownRequestContactEmail){
+                        -
+                        }
                     </span>
                 </div>
                 <div class="row">
@@ -99,15 +122,32 @@ <h2>Detailed Platform Contact Information</h2>
                     </span>
                 </div>
                 <div class="row">
-                    <strong>Email for Non-Compliance Notices:</strong>
+                    <strong>Email(s) for Non-Compliance Notices:</strong>
                     <span>
-                        {{sub.primaryNoticeOfTakedownContactEmail || '-'}}
+
+                        @if(sub.primaryNoticeOfTakedownContactEmail && sub.secondaryNoticeOfTakedownContactEmail){
+                        {{sub.primaryNoticeOfTakedownContactEmail}}, {{sub.secondaryNoticeOfTakedownContactEmail}}
+                        } @else {
+                        {{sub.primaryNoticeOfTakedownContactEmail}}{{sub.secondaryNoticeOfTakedownContactEmail}}
+                        }
+
+                        @if(!sub.primaryNoticeOfTakedownContactEmail && !sub.secondaryNoticeOfTakedownContactEmail){
+                        -
+                        }
                     </span>
                 </div>
                 <div class="row">
-                    <strong>Email for Takedown Request Letters:</strong>
+                    <strong>Email(s) for Takedown Request Letters:</strong>
                     <span>
-                        {{sub.primaryTakedownRequestContactEmail || '-'}}
+                        @if(sub.primaryTakedownRequestContactEmail && sub.secondaryTakedownRequestContactEmail){
+                        {{sub.primaryTakedownRequestContactEmail}}, {{sub.secondaryTakedownRequestContactEmail}}
+                        } @else {
+                        {{sub.primaryTakedownRequestContactEmail}}{{sub.secondaryTakedownRequestContactEmail}}
+                        }
+
+                        @if(!sub.primaryTakedownRequestContactEmail && !sub.secondaryTakedownRequestContactEmail){
+                        -
+                        }
                     </span>
                 </div>
                 <div class="row">

frontend/src/app/features/components/roles-list/role-details/role-details.component.scss

@@ -72,7 +72,6 @@
     .permissions-container {
         margin-top: 24px;
         width: 100%;
-        height: 666px;
         border-radius: 4px;
         box-shadow: 0px 3.2px 7.2px 0px rgba(0, 0, 0, 0.23);