Skip to content
Snippets Groups Projects
Commit 5dd80c71 authored by Alicia.DeDiosFuente's avatar Alicia.DeDiosFuente Committed by Florent Poittevin
Browse files

fix: return archival storage principal node when requesting show status...

fix: return archival storage principal node when requesting show status history in preservation job report
parent 4bb8f3af
No related branches found
No related tags found
1 merge request!214fix: return archival storage principal node when requesting show status...
...@@ -3,7 +3,7 @@ import {Store} from "@ngxs/store"; ...@@ -3,7 +3,7 @@ import {Store} from "@ngxs/store";
import {AipTabEnum} from "@preservation/aip/enums/aip-tab.enum"; import {AipTabEnum} from "@preservation/aip/enums/aip-tab.enum";
import { import {
AccessResourceApiEnum, AccessResourceApiEnum,
ArchivalStorageResourceApiEnum, ArchivalStorageResourceApiEnum, BaseResourceApiEnum,
} from "@shared/enums/api.enum"; } from "@shared/enums/api.enum";
import { import {
AppRoutesEnum, AppRoutesEnum,
...@@ -11,6 +11,7 @@ import { ...@@ -11,6 +11,7 @@ import {
} from "@shared/enums/routes.enum"; } from "@shared/enums/routes.enum";
import { import {
isNullOrUndefined, isNullOrUndefined,
isNumber,
StringUtil, StringUtil,
} from "solidify-frontend"; } from "solidify-frontend";
...@@ -62,8 +63,13 @@ export class AipHelper { ...@@ -62,8 +63,13 @@ export class AipHelper {
storagionNumber = store.selectSnapshot(state => state.router.state.root.children[0].children[0].children[0].params[PreservationPlanningRoutesEnum.storagionNumberWithoutPrefixParam]); storagionNumber = store.selectSnapshot(state => state.router.state.root.children[0].children[0].children[0].params[PreservationPlanningRoutesEnum.storagionNumberWithoutPrefixParam]);
} }
} }
const storagion = ArchivalStorageResourceApiEnum.aipStorages.find(aip => aip.index === +storagionNumber); const storagion = ArchivalStorageResourceApiEnum.aipStorages.find(aip => aip.index === +storagionNumber);
if (isNullOrUndefined(storagion)) { if (isNullOrUndefined(storagion)) {
if (String(storagionNumber) === PreservationPlanningRoutesEnum.job) {
//in case the request comes from preservation job to show the history status, return the principal storagion url
return ArchivalStorageResourceApiEnum.aip;
}
throw new Error(`The storagion index '${storagionNumber}' is not find in setting`); throw new Error(`The storagion index '${storagionNumber}' is not find in setting`);
} }
return storagion.url; return storagion.url;
......
...@@ -70,7 +70,7 @@ export class JobReportDetailDialog extends SharedAbstractContainer implements On ...@@ -70,7 +70,7 @@ export class JobReportDetailDialog extends SharedAbstractContainer implements On
logo: "history", logo: "history",
callback: (jobExecutionReportLine: JobExecutionReportLine) => this.historyDataFile(jobExecutionReportLine), callback: (jobExecutionReportLine: JobExecutionReportLine) => this.historyDataFile(jobExecutionReportLine),
placeholder: TRANSLATE("crud.list.action.history"), placeholder: TRANSLATE("crud.list.action.history"),
displayOnCondition: (jobExecutionReportLine: JobExecutionReportLine) => jobExecutionReportLine.status === JobReportAipStatusEnum.ERROR, displayOnCondition: (jobExecutionReportLine: JobExecutionReportLine) => jobExecutionReportLine.status !== JobReportAipStatusEnum.ERROR,
}, },
]; ];
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment