[angular-16 | DONE | UPDATED] environments/: Updated how properties are built - use common properties from library.
This commit is contained in:
parent
a9fb9c5651
commit
6a9448f4d8
|
@ -1 +1 @@
|
||||||
Subproject commit f6e927f4c2e9fee5518182d3b770548ccd2c8d37
|
Subproject commit 5184ffad194e23864411f989f9403cd984afb4a3
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9e58421a1adf3fbeb361e21616feaea8c7f867af
|
Subproject commit d1b2d5e585722751792d12645d17f820cd6a7860
|
|
@ -4,8 +4,9 @@
|
||||||
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
||||||
|
|
||||||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||||
|
import {common, commonBeta} from "../app/openaireLibrary/utils/properties/environments/environment";
|
||||||
|
|
||||||
export let properties: EnvProperties = {
|
let props: EnvProperties = {
|
||||||
environment: "beta",
|
environment: "beta",
|
||||||
adminToolsPortalType: "eosc",
|
adminToolsPortalType: "eosc",
|
||||||
dashboard: "eosc",
|
dashboard: "eosc",
|
||||||
|
@ -119,3 +120,7 @@ export let properties: EnvProperties = {
|
||||||
loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"}
|
loginUrl : "https://explore.eosc-portal.eu/egi-login-service/openid_connect_login", cookieName: "EGIAccessToken"}
|
||||||
}]
|
}]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export let properties: EnvProperties = {
|
||||||
|
...props, ...common, ...commonBeta
|
||||||
|
}
|
|
@ -4,8 +4,9 @@
|
||||||
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
||||||
|
|
||||||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||||
|
import {common, commonProd} from "../app/openaireLibrary/utils/properties/environments/environment";
|
||||||
|
|
||||||
export let properties: EnvProperties = {
|
let props: EnvProperties = {
|
||||||
environment: "production",
|
environment: "production",
|
||||||
adminToolsPortalType: "eosc",
|
adminToolsPortalType: "eosc",
|
||||||
dashboard: "eosc",
|
dashboard: "eosc",
|
||||||
|
@ -125,3 +126,7 @@ export let properties: EnvProperties = {
|
||||||
{label : "S3", id: "s3", auth: "keys"}
|
{label : "S3", id: "s3", auth: "keys"}
|
||||||
}]
|
}]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export let properties: EnvProperties = {
|
||||||
|
...props, ...common, ...commonProd
|
||||||
|
}
|
|
@ -4,8 +4,9 @@
|
||||||
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
// The eoscInfo of which env maps to which file can be found in `.angular-cli.json`.
|
||||||
|
|
||||||
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
import {EnvProperties} from "../app/openaireLibrary/utils/properties/env-properties";
|
||||||
|
import {common, commonDev} from "../app/openaireLibrary/utils/properties/environments/environment";
|
||||||
|
|
||||||
export let properties: EnvProperties = {
|
let props: EnvProperties = {
|
||||||
environment: "development",
|
environment: "development",
|
||||||
adminToolsPortalType: "eosc",
|
adminToolsPortalType: "eosc",
|
||||||
dashboard: "eosc",
|
dashboard: "eosc",
|
||||||
|
@ -147,3 +148,7 @@ export let properties: EnvProperties = {
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
};
|
};
|
||||||
|
|
||||||
|
export let properties: EnvProperties = {
|
||||||
|
...props, ...common, ...commonDev
|
||||||
|
}
|
Loading…
Reference in New Issue