Change from incidentLabel to incidentGuid (#2209)

Author: sukhpalp

client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-gallery-panel/incident-gallery-panel-mobile/incident-gallery-panel-mobile.component.ts

@@ -1,10 +1,10 @@
 import { ChangeDetectorRef, Component, Input, OnInit } from '@angular/core';
-import { AppConfigService } from '@wf1/core-ui';
-import { PublishedIncidentService } from '../../../../services/published-incident-service';
 import { ActivatedRoute } from '@angular/router';
+import { AppConfigService } from '@wf1/core-ui';
+import { InitDetail } from 'lightgallery/lg-events';
 import { LightGallery } from 'lightgallery/lightgallery';
+import { PublishedIncidentService } from '../../../../services/published-incident-service';
 import { convertToMobileFormat, convertToYoutubeId } from '../../../../utils';
-import { InitDetail } from 'lightgallery/lg-events';
 
 @Component({
   selector: 'incident-gallery-panel-mobile',
@@ -35,7 +35,7 @@ export class IncidentGalleryPanelMobileComponent implements OnInit {
     private appConfigService: AppConfigService,
     private cdr: ChangeDetectorRef,
     private router: ActivatedRoute,
-  ) {}
+  ) { }
 
   ngAfterViewChecked(): void {
     if (this.refreshGallery && this.lightGallery) {
@@ -69,7 +69,7 @@ export class IncidentGalleryPanelMobileComponent implements OnInit {
     this.allImagesAndVideosStub = [];
     // fetch the Videos
     this.publishedIncidentService
-      .fetchExternalUri(this.incident.incidentNumberLabel)
+      .fetchExternalUri(this.incident.incidentGuid)
       .toPromise()
       .then((results) => {
         if (results?.collection && results.collection.length > 0) {
@@ -78,7 +78,7 @@ export class IncidentGalleryPanelMobileComponent implements OnInit {
 
         // fetch image attachments
         this.publishedIncidentService
-          .fetchPublishedIncidentAttachments(this.incident.incidentNumberLabel)
+          .fetchPublishedIncidentAttachments(this.incident.incidentGuid)
           .toPromise()
           .then((results) => {
             // Loop through the attachments, for each one, create a ref, and set href to the bytes
@@ -169,16 +169,12 @@ export class IncidentGalleryPanelMobileComponent implements OnInit {
           fileName: attachment.attachmentFileName,
           primary: attachment.primary.toString(),
           type: 'image',
-          href: `${
-            this.appConfigService.getConfig().rest['wfnews']
-          }/publicPublishedIncidentAttachment/${
-            this.incident.incidentNumberLabel
-          }/attachments/${attachment.attachmentGuid}/bytes`,
-          thumbnail: `${
-            this.appConfigService.getConfig().rest['wfnews']
-          }/publicPublishedIncidentAttachment/${
-            this.incident.incidentNumberLabel
-          }/attachments/${attachment.attachmentGuid}/bytes?thumbnail=true`,
+          href: `${this.appConfigService.getConfig().rest['wfnews']
+            }/publicPublishedIncidentAttachment/${this.incident.incidentNumberLabel
+            }/attachments/${attachment.attachmentGuid}/bytes`,
+          thumbnail: `${this.appConfigService.getConfig().rest['wfnews']
+            }/publicPublishedIncidentAttachment/${this.incident.incidentNumberLabel
+            }/attachments/${attachment.attachmentGuid}/bytes?thumbnail=true`,
         });
       }
     }

client/wfnews-war/src/main/angular/src/app/components/public-incident-page/incident-info-panel/incident-info-panel.component.ts

@@ -222,9 +222,7 @@ export class IncidentInfoPanelComponent implements AfterViewInit, OnChanges {
           // fetch image attachments
           this.publishedIncidentService
             .fetchPublishedIncidentAttachments(
-              this.incident.incidentNumberLabel
-                ? this.incident.incidentNumberLabel
-                : this.incident.incidentNumberLabelFull,
+              this.incident.incidentGuid,
             )
             .toPromise()
             .then((attachments) => {

client/wfnews-war/src/main/angular/src/app/components/public-incident-page/public-incident-page.component.ts

@@ -148,7 +148,7 @@ export class PublicIncidentPageComponent implements OnInit {
     await this.getAreaRestrictions();
 
     this.publishedIncidentService
-      .fetchPublishedIncidentAttachments(this.incident.incidentNumberLabelFull)
+      .fetchPublishedIncidentAttachments(this.incident.incidentGuid)
       .toPromise()
       .then((results) => {
         if (results?.collection?.length > 0) {
@@ -158,7 +158,7 @@ export class PublicIncidentPageComponent implements OnInit {
       });
 
     this.publishedIncidentService
-      .fetchAttachments(this.incident.incidentNumberLabelFull)
+      .fetchAttachments(this.incident.incidentGuid)
       .toPromise()
       .then((docs) => {
         // remove any non-image types