Skip to content
Snippets Groups Projects
Commit 0faca320 authored by Florent POITTEVIN's avatar Florent POITTEVIN
Browse files

refacto: remove linkTo for urlBinding on storagion node

parent 820dc1f8
No related branches found
No related tags found
No related merge requests found
......@@ -39,10 +39,9 @@ export class AipStatusSummaryPresentational extends SharedAbstractPresentational
ngOnInit(): void {
super.ngOnInit();
const storagionUrl: string[] = BaseResourceApiEnum.archivalStorageList.map(sto => sto.linkedTo);
storagionUrl.forEach(url => {
BaseResourceApiEnum.archivalStorageList.forEach(storagion => {
this.aipCopyList.copies.forEach(copy => {
if (copy.storageUrl === url) {
if (copy.storageUrl === storagion.url) {
this.aipCopySorted.push(copy);
}
});
......@@ -63,7 +62,7 @@ export class AipStatusSummaryPresentational extends SharedAbstractPresentational
}
getStoragionNumber(aipCopy: AipCopy): number {
const storagion = BaseResourceApiEnum.archivalStorageList.find(sto => aipCopy.storageUrl === sto.linkedTo).index;
const storagion = BaseResourceApiEnum.archivalStorageList.find(sto => aipCopy.storageUrl === sto.url).index;
if (isNotNullNorUndefined(storagion)) {
return storagion;
}
......
......@@ -2,10 +2,7 @@ import {ApiModuleEnum} from "@app/shared/enums/api-module.enum";
import {ApiResourceNameEnum} from "@app/shared/enums/api-resource-name.enum";
import {environment} from "@environments/environment";
import {Storage} from "@shared/models/storage.model";
import {
MappingObjectUtil,
ResourceApiEnum,
} from "solidify-frontend";
import {ResourceApiEnum} from "solidify-frontend";
export class ApiKeyword {
static PARENT_ID: string = "parentId";
......@@ -58,11 +55,9 @@ export class BaseResourceApiEnum {
const newList: Storage[] = [];
let index = 1;
environment.archivalStorage.forEach(url => {
const urlBehindProxy = MappingObjectUtil.get(environment.storagionUrlsBindingExternalToInternalBehindProxy, url);
newList.push({
index: index,
url: url,
linkedTo: urlBehindProxy ?? url,
});
index++;
});
......
export interface Storage {
index: number;
url: string;
linkedTo?: string;
}
import {LanguagesEnum} from "@app/shared/enums/languages.enum";
import {ThemeEnum} from "@app/shared/enums/theme.enum";
import {
DefaultSolidifyEnvironment,
MappingObject,
} from "solidify-frontend";
import {DefaultSolidifyEnvironment} from "solidify-frontend";
export interface DlcmEnvironment extends DefaultSolidifyEnvironment {
appTitle: string;
......@@ -30,9 +27,6 @@ export interface DlcmEnvironment extends DefaultSolidifyEnvironment {
archivalStorage?: string[] | undefined;
dataManagement?: string | undefined;
// Storagion URLs binding to specify only when behind proxy
storagionUrlsBindingExternalToInternalBehindProxy: MappingObject<string>;
// Documentation
documentationTocApisGuide: string | undefined;
documentationTocIntegrationGuide: string | undefined;
......
......@@ -29,10 +29,6 @@ export const defaultEnvironment: DlcmEnvironment = {
// Base URL For Module Applications (override by AppAction.LoadModules)
admin: "http://localhost:16115/dlcm/admin",
storagionUrlsBindingExternalToInternalBehindProxy: {
"http://to-set/archival-storage": "http://to-set-to-local-url-behind-proxy/archival-storage",
},
// Documentation
documentationTocApisGuide: "DLCM-APIs-toc.html",
documentationTocIntegrationGuide: "DLCM-IntegrationGuide-toc.html",
......
......@@ -22,10 +22,5 @@ export const environment: DlcmEnvironment = {
loginUrl: "https://e-research-test.unige.ch/dlcm-test/authorization/oauth/authorize",
admin: "https://e-research-test.unige.ch/dlcm-test/administration/admin",
forceRuntimeOverrideSetting: true,
storagionUrlsBindingExternalToInternalBehindProxy: {
"https://e-research-test.unige.ch/dlcm-test/storagion/archival-storage": "http://dlcm-storagion:16107/dlcm-test/storagion/archival-storage",
"https://e-research-test.unige.ch/dlcm-test/storagion2/archival-storage": "http://dlcm-storagion2:16109/dlcm-test/storagion2/archival-storage",
},
...environmentLocal,
};
......@@ -13,8 +13,4 @@ export const environment: DlcmEnvironment = {
loginUrl: "https://e-research-test.unige.ch/dlcm-test/authorization/oauth/authorize",
admin: "https://e-research-test.unige.ch/dlcm-test/administration/admin",
forceRuntimeOverrideSetting: true,
storagionUrlsBindingExternalToInternalBehindProxy: {
"https://e-research-test.unige.ch/dlcm-test/storagion/archival-storage": "http://dlcm-storagion:16107/dlcm-test/storagion/archival-storage",
"https://e-research-test.unige.ch/dlcm-test/storagion2/archival-storage": "http://dlcm-storagion2:16109/dlcm-test/storagion2/archival-storage",
},
};
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