Skip to content

Commit

Permalink
conflict in admin page
Browse files Browse the repository at this point in the history
  • Loading branch information
@yzlucas
yzlucas committed Jun 14, 2024
1 parent 393b935 commit f85ecf4
Show file tree
Hide file tree
Showing 2 changed files with 94 additions and 186 deletions.
278 changes: 92 additions & 186 deletions .../src/main/angular/src/app/components/admin-incident-form/admin-incident-form.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -216,12 +216,11 @@ export class AdminIncidentForm implements OnInit, OnChanges {
this.incidentNumberSequnce = params['incidentNumberSequence'];

const self = this;
let publishedWFIM = false;

this.publishedIncidentService
.fetchIMIncident(this.wildFireYear, this.incidentNumberSequnce)
.subscribe(
async (incidentResponse) => {
(incidentResponse) => {
self.currentAdminIncident = incidentResponse.response;
this.currentIncidentName = self.currentAdminIncident.incidentName;
this.publishedIncidentType = self.currentAdminIncident.type;
Expand Down Expand Up @@ -299,66 +298,99 @@ export class AdminIncidentForm implements OnInit, OnChanges {
this.cdr.detectChanges();
});

const publishedIncident = new Promise((resolve, reject) => {
incidentResponse.getPublishedIncident.toPromise().then(
(result) => {
if (result) {
publishedWFIM = true;
resolve(result)
} else reject(result)
}, (err) => {
console.log('No published data found...');
console.error(err);
self.publishedIncidentDetailGuid = null;
publishedWFIM = false;
reject(err)
}
);
});


// If WFIM returns a 404 for the incident, fetch the published incident from the WFNEWS public API
// set cause fields that should be specific to the public side
// give the admin screen default cause comments, as they should be null in the public API at this point
const publicPublishedIncident = new Promise((resolve, reject) => {
this.publishedIncidentService.fetchPublishedIncident(self.currentAdminIncident.incidentLabel, this.wildFireYear)
.toPromise().then(
(response) => {
// resolve only if the incident has not been published in WFIM
if (!publishedWFIM) resolve(response)
else reject(response)
}, (err) => {
console.log('No public published data found...');
console.error(err);
reject(err)
}
incidentResponse.getPublishedIncident.subscribe(
(result) => {
const response = result.body;
self.publishedIncidentDetailGuid =
response.publishedIncidentDetailGuid;
self.incident.traditionalTerritory =
response.traditionalTerritoryDetail;
self.incident.lastPublished = response.publishedTimestamp;
self.incident.location = response.incidentLocation;

self.incident.sizeComments =
response.incidentSizeDetail ||
'Fire size is based on most current information available.';
Object.entries(SizeTypeOptionDisclaimer).forEach(
([index, disclaimer]) => {
if (disclaimer === response.incidentSizeDetail) {
self.incident.sizeType = Number.parseInt(index, 10);
}
},
);
});

const results = await Promise.allSettled([publishedIncident, publicPublishedIncident]);

results.forEach((result) => {
let iterate = true;
if (result?.status == 'fulfilled') {
if (iterate) {
const res = result?.value;
if (!publishedWFIM) {
this.populatePublicFields(res)
} else {
this.populatePublishedIMFields(res)
}
this.populateCommonFields(res)
iterate = false;
}
}
});


self.incident.cause = 0;
self.incident.causeComments = response.incidentCauseDetail;
Object.entries(CauseOptionDisclaimer).forEach(
([index, disclaimer]) => {
if (disclaimer === response.incidentCauseDetail) {
self.incident.cause = Number.parseInt(index, 10);
}
},
);
if (!response.incidentCauseDetail) {
self.incident.causeComments = CauseOptionDisclaimer[0];
}
self.incident.publishedStatus =
response.newsPublicationStatusCode;
self.incident.responseComments = response.resourceDetail;

self.incident.wildifreCrewsInd =
response.wildfireCrewResourcesInd;
self.incident.crewsComments =
response.wildfireCrewResourcesDetail;

self.incident.aviationInd =
response.wildfireAviationResourceInd;
self.incident.aviationComments =
response.wildfireAviationResourceDetail;

self.incident.incidentManagementInd =
response.incidentMgmtCrewRsrcInd;
self.incident.incidentManagementComments =
response.incidentMgmtCrewRsrcDetail;
self.incident.heavyEquipmentInd =
response.heavyEquipmentResourcesInd;
self.incident.heavyEquipmentComments =
response.heavyEquipmentResourcesDetail;
self.incident.structureProtectionInd =
response.structureProtectionRsrcInd;
self.incident.structureProtectionComments =
response.structureProtectionRsrcDetail;

self.incident.crewResourceCount =
response?.crewResourceCount || undefined;
self.incident.aviationResourceCount =
response?.aviationResourceCount || undefined;
self.incident.heavyEquipmentResourceCount =
response?.heavyEquipmentResourceCount || undefined;
self.incident.incidentManagementResourceCount =
response?.incidentManagementResourceCount || undefined;
self.incident.structureProtectionResourceCount =
response?.structureProtectionResourceCount || undefined;

self.incident.contact.fireCentre =
response.contactOrgUnitIdentifer?.toString();
self.incident.contact.phoneNumber =
response.contactPhoneNumber;
self.incident.contact.emailAddress =
response.contactEmailAddress;
self.incident.incidentOverview = response.incidentOverview;
this.cdr.detectChanges();
this.incidentForm.patchValue(this.incident);
this.incidentForm.markAsPristine();
this.evacOrdersDetailsPanel.getEvacOrders();
},
(error) => {
console.log('No published data found...');
console.error(error);
self.publishedIncidentDetailGuid = null;
},
);

this.incidentForm.patchValue(this.incident);
this.incidentForm.markAsPristine();
this.cdr.detectChanges();
this.evacOrdersDetailsPanel.getEvacOrders();
},
(incidentResponseError) => {
console.error(incidentResponseError);
Expand All @@ -382,134 +414,6 @@ export class AdminIncidentForm implements OnInit, OnChanges {
return !value ? null : value;
}

populatePublicFields(result) {
this.incident.cause = result?.generalIncidentCauseCatId;
if (result?.incidentCauseDetail != null) {
this.incident.causeComments = result?.incidentCauseDetail
} else this.incident.causeComments = this.populateCauseComments(result?.generalIncidentCauseCatId);
}

populatePublishedIMFields(result) {
if (result?.body) {
const response = result.body;
this.publishedIncidentDetailGuid =
response?.publishedIncidentDetailGuid;

this.incident.cause = 0;
this.incident.causeComments = response?.incidentCauseDetail;
Object.entries(CauseOptionDisclaimer).forEach(
([index, disclaimer]) => {
if (disclaimer === response?.incidentCauseDetail) {
this.incident.cause = Number.parseInt(index, 10);
}
},
);
if (!response?.incidentCauseDetail) {
this.incident.causeComments = CauseOptionDisclaimer[0];
}
}
}

populateIncidentWithPublishedIncident(incidentLabel, wildfireYear, self) {
this.publishedIncidentService.fetchPublishedIncident(incidentLabel, wildfireYear)
.subscribe(response => {
if (response) {
// set cause fields that should be specific to the public side
// give the admin screen default cause comments, as they should be null in the public API at this point
self.incident.cause = response.generalIncidentCauseCatId;
if (response.incidentCauseDetail != null) {
self.incident.causeComments = response.incidentCauseDetail
} else self.incident.causeComments = this.populateCauseComments(response.generalIncidentCauseCatId);
this.populateCommonFields(response);
}
}),
(error) => {
console.log('No public published data found...');
console.error(error);
},

this.incidentForm?.patchValue(this.incident);
this.incidentForm?.markAsPristine();
this.evacOrdersDetailsPanel?.getEvacOrders();
this.cdr.detectChanges();
}

populateCauseComments(causeCode: number) {
switch (causeCode) {
case 1: return "Humans start wildfires in several ways, either by accident or intentionally.";
case 2: return "When lightning strikes an object it can release enough heat to ignite a tree or other fuels.";
case 3: return "Wildfire investigations often take time and can be very complex. Investigations may be carried out by one or more agencies, including the BC Wildfire Service, the Compliance and Enforcement Branch, the RCMP, or other law enforcement agencies, and may be cross jurisdictional."
default: return "A wildfire of undetermined cause, including a wildfire that is currently under investigation, as well as one where the investigation has been completed.";
}
}

populateCommonFields(result) {
const response = result?.body;
if (response) {
this.incident.traditionalTerritory = response.traditionalTerritoryDetail;
this.incident.lastPublished = response.publishedTimestamp;
this.incident.location = response.incidentLocation;

this.incident.sizeComments =
response.incidentSizeDetail ||
'Fire size is based on most current information available.';
Object.entries(SizeTypeOptionDisclaimer).forEach(
([index, disclaimer]) => {
if (disclaimer === response.incidentSizeDetail) {
this.incident.sizeType = Number.parseInt(index, 10);
}
},
);

this.incident.publishedStatus =
response.newsPublicationStatusCode;
this.incident.responseComments = response.resourceDetail;

this.incident.wildifreCrewsInd =
response.wildfireCrewResourcesInd;
this.incident.crewsComments =
response.wildfireCrewResourcesDetail;

this.incident.aviationInd =
response.wildfireAviationResourceInd;
this.incident.aviationComments =
response.wildfireAviationResourceDetail;

this.incident.incidentManagementInd =
response.incidentMgmtCrewRsrcInd;
this.incident.incidentManagementComments =
response.incidentMgmtCrewRsrcDetail;
this.incident.heavyEquipmentInd =
response.heavyEquipmentResourcesInd;
this.incident.heavyEquipmentComments =
response.heavyEquipmentResourcesDetail;
this.incident.structureProtectionInd =
response.structureProtectionRsrcInd;
this.incident.structureProtectionComments =
response.structureProtectionRsrcDetail;

this.incident.crewResourceCount =
response?.crewResourceCount || undefined;
this.incident.aviationResourceCount =
response?.aviationResourceCount || undefined;
this.incident.heavyEquipmentResourceCount =
response?.heavyEquipmentResourceCount || undefined;
this.incident.incidentManagementResourceCount =
response?.incidentManagementResourceCount || undefined;
this.incident.structureProtectionResourceCount =
response?.structureProtectionResourceCount || undefined;

this.incident.contact.fireCentre =
response.contactOrgUnitIdentifer?.toString();
this.incident.contact.phoneNumber =
response.contactPhoneNumber;
this.incident.contact.emailAddress =
response.contactEmailAddress;
this.incident.incidentOverview = response.incidentOverview;
this.cdr.detectChanges();
}
}

async publishChanges() {
this.publishDisabled = true;
this.cdr.detectChanges();
Expand Down Expand Up @@ -585,8 +489,9 @@ export class AdminIncidentForm implements OnInit, OnChanges {
try {
const doc = await self.publishIncident(publishedIncidentResource);
if (doc) {
this.publishedIncidentDetailGuid = doc.publishedIncidentDetailGuid;
this.publishedIncidentDetailGuid = doc?.publishedIncidentDetailGuid;
}

// Handle evac orders
await this.evacOrdersDetailsPanel.persistEvacOrders();
if (doc) {
Expand All @@ -612,6 +517,7 @@ export class AdminIncidentForm implements OnInit, OnChanges {
}
}
publishIncident(incident): Promise<any> {

if (incident.publishedIncidentDetailGuid == null) {
// If publishedIncidentGuid is null, just save the incident
// let publishedGuid;
Expand Down Expand Up @@ -802,4 +708,4 @@ export class AdminIncidentForm implements OnInit, OnChanges {
}
}

}
}
2 changes: 2 additions & 0 deletions client/wfnews-war/src/main/angular/src/app/store/wildfiresList/wildfiresList.effects.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ export class WildfiresListEffect {
url = url.concat('&longitude=').concat(long.toString());
url = url.concat('&radius=').concat((radius * 1000).toString());
} else if (searchText) {
// "[" and "]" are invalid character and will cause java.lang.IllegalArgumentException
searchText = searchText.replace(/[\[\]]/g, '');
url += `&searchText=${searchText}`;
}

Expand Down

0 comments on commit f85ecf4

Please sign in to comment.