asma-helpers 0.37.24 → 0.37.26
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/helpers/EnvironmentsUrls.d.ts +1 -0
- package/lib/helpers/EnvironmentsUrls.d.ts.map +1 -1
- package/lib/helpers/EnvironmentsUrls.js +2 -1
- package/lib/helpers/EnvironmentsUrls.js.map +1 -1
- package/lib/helpers/generateEnvConfigsBindings.d.ts +2 -1
- package/lib/helpers/generateEnvConfigsBindings.d.ts.map +1 -1
- package/lib/helpers/initEnvConfigsVars.d.ts +1 -1
- package/lib/helpers/initEnvConfigsVars.d.ts.map +1 -1
- package/lib/helpers/initEnvConfigsVars.js +0 -65
- package/lib/helpers/initEnvConfigsVars.js.map +1 -1
- package/package.json +1 -1
- package/src/helpers/EnvironmentsUrls.ts +2 -1
- package/src/helpers/initEnvConfigsVars.ts +1 -73
|
@@ -15,6 +15,7 @@ export declare const EnvironmentsUrls1: (adcuris_subdomains?: string[]) => {
|
|
|
15
15
|
SRV_ACTIVITIES: string;
|
|
16
16
|
SRV_AO_DIRECTORY: string;
|
|
17
17
|
SRV_AO_WRAPPER: string;
|
|
18
|
+
SRV_AO_WRAPPER_NEW: string;
|
|
18
19
|
SRV_AUTH: string;
|
|
19
20
|
DEVELOPMENT: boolean;
|
|
20
21
|
ENVIRONMENT_TO_OPERATE: "dev" | "test" | "stage" | "prod" | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentsUrls.d.ts","sourceRoot":"","sources":["../../src/helpers/EnvironmentsUrls.ts"],"names":[],"mappings":"AACA,OAAO,EAYH,gBAAgB,EAGnB,MAAM,+BAA+B,CAAA;AAEtC,eAAO,MAAM,iBAAiB,wBAAyB,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"EnvironmentsUrls.d.ts","sourceRoot":"","sources":["../../src/helpers/EnvironmentsUrls.ts"],"names":[],"mappings":"AACA,OAAO,EAYH,gBAAgB,EAGnB,MAAM,+BAA+B,CAAA;AAEtC,eAAO,MAAM,iBAAiB,wBAAyB,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IA2CvD;;OAEG;;;;;;;;CASV,CAAA"}
|
|
@@ -23,7 +23,8 @@ export const EnvironmentsUrls1 = (adcuris_subdomains) => {
|
|
|
23
23
|
SRV_ACTIVITIES: `${base_url}/api/activities`,
|
|
24
24
|
SRV_AO_DIRECTORY: `${base_url}/api-ao/directory`,
|
|
25
25
|
SRV_AO_WRAPPER: '',
|
|
26
|
-
|
|
26
|
+
SRV_AO_WRAPPER_NEW: '/api/wrapper',
|
|
27
|
+
SRV_AUTH: '/api/auth',
|
|
27
28
|
DEVELOPMENT: realWindow.location.hostname.includes('dev.') || realWindow.location.hostname.includes('localhost'),
|
|
28
29
|
ENVIRONMENT_TO_OPERATE: env_to_operate,
|
|
29
30
|
DEBUG_ADCURIS: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EnvironmentsUrls.js","sourceRoot":"","sources":["../../src/helpers/EnvironmentsUrls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,cAAc,EAAE,MAAM,IAAI,CAAA;AACzD,OAAO,EACH,YAAY,EACZ,GAAG,EACH,cAAc;AACd,WAAW;AACX,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,WAAW,EACX,qBAAqB,EACrB,QAAQ,EACR,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,MAAM,GACT,MAAM,+BAA+B,CAAA;AAEtC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,kBAA6B,EAAE,EAAE;IAC/D,IAAI,QAAQ,GAAG,cAAc,EAAE,CAAA;IAE/B,IAAI,MAAM,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,IAAI,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACnF,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;IAC/B,CAAC;IAED,OAAO;QACH,aAAa,EAAE,GAAG,QAAQ,gBAAgB;QAC1C,YAAY,EAAE,GAAG,QAAQ,eAAe;QACxC,aAAa,EAAE,GAAG,QAAQ,YAAY;QACtC,mBAAmB,EAAE,GAAG,QAAQ,kBAAkB;QAClD,iBAAiB,EAAE,GAAG,QAAQ,gBAAgB;QAC9C,WAAW,EAAE,GAAG,QAAQ,cAAc;QACtC,QAAQ,EAAE,GAAG,QAAQ,WAAW;QAChC,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC;QAChD,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,GAAG,QAAQ,cAAc;QACrC,SAAS,EAAE,GAAG,QAAQ,eAAe;QACrC,gBAAgB,EAAE,GAAG,QAAQ,mBAAmB;QAChD,cAAc,EAAE,GAAG,QAAQ,iBAAiB;QAE5C,gBAAgB,EAAE,GAAG,QAAQ,mBAAmB;QAChD,cAAc,EAAE,EAAE;QAClB,
|
|
1
|
+
{"version":3,"file":"EnvironmentsUrls.js","sourceRoot":"","sources":["../../src/helpers/EnvironmentsUrls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,SAAS,CAAC,cAAc,EAAE,MAAM,IAAI,CAAA;AACzD,OAAO,EACH,YAAY,EACZ,GAAG,EACH,cAAc;AACd,WAAW;AACX,eAAe,EACf,UAAU,EACV,qBAAqB,EACrB,WAAW,EACX,qBAAqB,EACrB,QAAQ,EACR,0BAA0B,EAC1B,gBAAgB,EAChB,cAAc,EACd,MAAM,GACT,MAAM,+BAA+B,CAAA;AAEtC,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,kBAA6B,EAAE,EAAE;IAC/D,IAAI,QAAQ,GAAG,cAAc,EAAE,CAAA;IAE/B,IAAI,MAAM,KAAK,QAAQ,IAAI,GAAG,KAAK,MAAM,IAAI,kBAAkB,EAAE,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACnF,QAAQ,GAAG,QAAQ,GAAG,KAAK,CAAA;IAC/B,CAAC;IAED,OAAO;QACH,aAAa,EAAE,GAAG,QAAQ,gBAAgB;QAC1C,YAAY,EAAE,GAAG,QAAQ,eAAe;QACxC,aAAa,EAAE,GAAG,QAAQ,YAAY;QACtC,mBAAmB,EAAE,GAAG,QAAQ,kBAAkB;QAClD,iBAAiB,EAAE,GAAG,QAAQ,gBAAgB;QAC9C,WAAW,EAAE,GAAG,QAAQ,cAAc;QACtC,QAAQ,EAAE,GAAG,QAAQ,WAAW;QAChC,aAAa,EAAE,YAAY,CAAC,GAAG,EAAE,cAAc,CAAC;QAChD,YAAY,EAAE,EAAE;QAChB,UAAU,EAAE,GAAG,QAAQ,cAAc;QACrC,SAAS,EAAE,GAAG,QAAQ,eAAe;QACrC,gBAAgB,EAAE,GAAG,QAAQ,mBAAmB;QAChD,cAAc,EAAE,GAAG,QAAQ,iBAAiB;QAE5C,gBAAgB,EAAE,GAAG,QAAQ,mBAAmB;QAChD,cAAc,EAAE,EAAE;QAClB,kBAAkB,EAAE,cAAc;QAClC,QAAQ,EAAE,WAAW;QACrB,WAAW,EACP,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC;QACvG,sBAAsB,EAAE,cAAc;QACtC,aAAa,EAAE,KAAK;QACpB,2BAA2B;QAC3B,iBAAiB,EAAE,eAAe,CAAC,GAAG,EAAE,cAAc,CAAC;QACvD,WAAW,EAAE,6CAA6C;QAC1D,UAAU,EAAE,UAAU,CAAC,GAAG,EAAE,cAAc,CAAC;QAC3C,iBAAiB,EAAE,qBAAqB,EAAE;QAC1C,6BAA6B,EAAE,CAAC;QAChC,GAAG,EAAE,cAAc,IAAI,GAAG;QAE1B,eAAe,EAAE,yCAAyC;QAC1D,YAAY,EAAE,sCAAsC;QACpD,sBAAsB,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;QAClD,sBAAsB,EAAE,gBAAgB;QACxC,iBAAiB,EAAE,MAAM;QACzB;;WAEG;QACH,qBAAqB,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,gBAAgB;QACpE,iBAAiB,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,gBAAgB;QAChE,iBAAiB,EAAE,qBAAqB,EAAE;QAC1C,iBAAiB,EAAE,UAAU,CAAC,QAAQ,CAAC,MAAM;QAC7C,kBAAkB,EAAE,WAAW,EAAE;QACjC,QAAQ,EAAE,QAAQ;QAClB,uBAAuB,EAAE,0BAA0B,EAAE;KACxD,CAAA;AACL,CAAC,CAAA"}
|
|
@@ -46,6 +46,7 @@ export declare function generateEnvConfigsBindings<T extends IBasicEnv, K extend
|
|
|
46
46
|
SRV_ACTIVITIES: string;
|
|
47
47
|
SRV_AO_DIRECTORY: string;
|
|
48
48
|
SRV_AO_WRAPPER: string;
|
|
49
|
+
SRV_AO_WRAPPER_NEW: string;
|
|
49
50
|
SRV_AUTH: string;
|
|
50
51
|
DEVELOPMENT: boolean;
|
|
51
52
|
ENVIRONMENT_TO_OPERATE: "dev" | "test" | "stage" | "prod" | undefined;
|
|
@@ -68,7 +69,7 @@ export declare function generateEnvConfigsBindings<T extends IBasicEnv, K extend
|
|
|
68
69
|
SIGNICAT_CLIENT_ID: string;
|
|
69
70
|
NBID_ENV: string | null;
|
|
70
71
|
OPENREPLAY_INGEST_POINT: string;
|
|
71
|
-
}, K extends "SRV_DIRECTORY" | "SRV_CALENDAR" | "SRV_PROXY_OLD" | "SRV_PROXY_OLD_HELSE" | "SRV_PROXY_OLD_WEB" | "SRV_STORAGE" | "SRV_CHAT" | "SRV_CONNECTOR" | "SRV_ARTIFACT" | "SRV_ADVOCA" | "SRV_PROXY" | "SRV_NOTIFICATION" | "SRV_ACTIVITIES" | "SRV_AO_DIRECTORY" | "SRV_AO_WRAPPER" | "SRV_AUTH" | "DEVELOPMENT" | "ENVIRONMENT_TO_OPERATE" | "DEBUG_ADCURIS" | "SIGNICAT_SIGN_URL" | "INFO_ADVOCA" | "DEVEXPRESS" | "ADVOCA_ACCESS_URL" | "AUTO_SAVE_INTERVAL_IN_MINUTES" | "ENV" | "API_KEY_GEOCODE" | "AZURE_APP_ID" | "AZURE_APP_REDIRECT_URI" | "OPENREPLAY_PROJECT_KEY" | "CDN_ASMA_BASE_URL" | "SIGNICAT_REDIRECT_URL" | "NBID_REDIRECT_URL" | "SIGNICAT_AUTH_URL" | "ADOPUS_ACCESS_URL" | "SIGNICAT_CLIENT_ID" | "NBID_ENV" | "OPENREPLAY_INGEST_POINT" | (keyof T & string) ? K : never> & S;
|
|
72
|
+
}, K extends "SRV_DIRECTORY" | "SRV_CALENDAR" | "SRV_PROXY_OLD" | "SRV_PROXY_OLD_HELSE" | "SRV_PROXY_OLD_WEB" | "SRV_STORAGE" | "SRV_CHAT" | "SRV_CONNECTOR" | "SRV_ARTIFACT" | "SRV_ADVOCA" | "SRV_PROXY" | "SRV_NOTIFICATION" | "SRV_ACTIVITIES" | "SRV_AO_DIRECTORY" | "SRV_AO_WRAPPER" | "SRV_AO_WRAPPER_NEW" | "SRV_AUTH" | "DEVELOPMENT" | "ENVIRONMENT_TO_OPERATE" | "DEBUG_ADCURIS" | "SIGNICAT_SIGN_URL" | "INFO_ADVOCA" | "DEVEXPRESS" | "ADVOCA_ACCESS_URL" | "AUTO_SAVE_INTERVAL_IN_MINUTES" | "ENV" | "API_KEY_GEOCODE" | "AZURE_APP_ID" | "AZURE_APP_REDIRECT_URI" | "OPENREPLAY_PROJECT_KEY" | "CDN_ASMA_BASE_URL" | "SIGNICAT_REDIRECT_URL" | "NBID_REDIRECT_URL" | "SIGNICAT_AUTH_URL" | "ADOPUS_ACCESS_URL" | "SIGNICAT_CLIENT_ID" | "NBID_ENV" | "OPENREPLAY_INGEST_POINT" | (keyof T & string) ? K : never> & S;
|
|
72
73
|
};
|
|
73
74
|
export {};
|
|
74
75
|
//# sourceMappingURL=generateEnvConfigsBindings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generateEnvConfigsBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAGtD,UAAU,SAAS;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAE/B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAA;CAC1C;AAED,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAE5D,MAAM,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAA;AAExD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAA;AAE7E,KAAK,OAAO,CAAC,CAAC,IAAI;KACb,CAAC,IAAI,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACzD,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAWjE;;;GAGG;AAEH,wBAAgB,oBAAoB,IAQP;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC7B,GAAG,gBAAgB,GAChB,SAAS,CAChB;AAED,wBAAgB,0BAA0B,CACtC,CAAC,SAAS,SAAS,EACnB,CAAC,SAAS,CACJ,MAAM,CAAC,GACP,OAAO,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CACnD,GACG,MAAM,EACV,CAAC,EACH,WAAW,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE
|
|
1
|
+
{"version":3,"file":"generateEnvConfigsBindings.d.ts","sourceRoot":"","sources":["../../src/helpers/generateEnvConfigsBindings.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAA;AAGtD,UAAU,SAAS;IACf,WAAW,CAAC,EAAE,OAAO,CAAA;IACrB,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAA;IAE1B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,sBAAsB,CAAC,EAAE,MAAM,CAAA;IAE/B,2BAA2B,CAAC,EAAE,OAAO,CAAA;IACrC,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,0BAA0B,CAAC,EAAE,OAAO,CAAA;IACpC,sBAAsB,CAAC,EAAE,OAAO,CAAA;IAChC,4BAA4B,CAAC,EAAE,MAAM,EAAE,CAAA;CAC1C;AAED,KAAK,gBAAgB,GAAG,UAAU,CAAC,OAAO,iBAAiB,CAAC,CAAA;AAE5D,MAAM,MAAM,mBAAmB,GAAG,MAAM,gBAAgB,CAAA;AAExD,KAAK,UAAU,CAAC,CAAC,EAAE,CAAC,SAAS,MAAM,IAAI,CAAC,SAAS,GAAG,CAAC,GAAG,MAAM,CAAC,EAAE,GAAG,CAAC,GAAG,KAAK,CAAA;AAE7E,KAAK,OAAO,CAAC,CAAC,IAAI;KACb,CAAC,IAAI,MAAM,CAAC,IAAI,UAAU,CAAC,CAAC,GAAG,MAAM,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;CACzD,CAAA;AAED,MAAM,MAAM,yBAAyB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAA;AAWjE;;;GAGG;AAEH,wBAAgB,oBAAoB,IAQP;IACrB,aAAa,EAAE,MAAM,CAAA;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC7B,GAAG,gBAAgB,GAChB,SAAS,CAChB;AAED,wBAAgB,0BAA0B,CACtC,CAAC,SAAS,SAAS,EACnB,CAAC,SAAS,CACJ,MAAM,CAAC,GACP,OAAO,CAAC,mBAAmB,EAAE,gBAAgB,CAAC,CACnD,GACG,MAAM,EACV,CAAC,EACH,WAAW,EAAE;IAAE,IAAI,EAAE,CAAC,CAAA;CAAE,EAAE,aAAa,EAAE,CAAC,EAAE,EAAE,UAAU,EAAE,CAAC,EAAE,kBAAkB,CAAC,EAAE,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgE3F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
export declare const env: string;
|
|
2
2
|
export type IEnv = typeof env;
|
|
3
3
|
export declare const env_to_operate: "dev" | "test" | "stage" | "prod" | undefined;
|
|
4
|
-
export declare let domain: "adopus" | "adcuris" | "advoca" |
|
|
4
|
+
export declare let domain: "adopus" | "adcuris" | "advoca" | undefined;
|
|
5
5
|
export declare function signicatSignUrl(_env: typeof env, env_to_operate?: typeof env): string;
|
|
6
6
|
export declare function srvConnector(env: IEnv, env_to_operate?: IEnv): string;
|
|
7
7
|
export declare function createAdvocaAccessUrl(): string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initEnvConfigsVars.d.ts","sourceRoot":"","sources":["../../src/helpers/initEnvConfigsVars.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,GAAG,QAKN,CAAA;AACV,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,CAAA;AAC7B,eAAO,MAAM,cAAc,+CAAyD,CAAA;AAEpF,eAAO,IAAI,MAAM,
|
|
1
|
+
{"version":3,"file":"initEnvConfigsVars.d.ts","sourceRoot":"","sources":["../../src/helpers/initEnvConfigsVars.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,GAAG,QAKN,CAAA;AACV,MAAM,MAAM,IAAI,GAAG,OAAO,GAAG,CAAA;AAC7B,eAAO,MAAM,cAAc,+CAAyD,CAAA;AAEpF,eAAO,IAAI,MAAM,EAAqD,QAAQ,GAAG,SAAS,GAAG,QAAQ,GAAG,SAAS,CAAA;AAajH,wBAAgB,eAAe,CAAC,IAAI,EAAE,OAAO,GAAG,EAAE,cAAc,CAAC,EAAE,OAAO,GAAG,UAK5E;AAmBD,wBAAgB,YAAY,CAAC,GAAG,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,IAAI,UAQ5D;AAED,wBAAgB,qBAAqB,WAMpC;AAUD,wBAAgB,UAAU,CAAC,IAAI,EAAE,IAAI,EAAE,cAAc,CAAC,EAAE,IAAI,UAK3D;AAID,wBAAgB,cAAc,WAa7B;AA6DD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAU9B,MAAM,CACvB;AAGD,eAAO,MAAM,QAAQ,eAAmC,CAAA;AAUxD,wBAAgB,qBAAqB,6FAMpC;AAGD,wBAAgB,0BAA0B,qIAMzC;AAED,wBAAgB,WAAW,2CAM1B"}
|
|
@@ -50,29 +50,6 @@ export function srvConnector(env, env_to_operate) {
|
|
|
50
50
|
export function createAdvocaAccessUrl() {
|
|
51
51
|
let advoca_url = 'https://subdomain.advoca.no';
|
|
52
52
|
const subdomain = window.location.host.split('.').slice(0, -2).join('.');
|
|
53
|
-
/* const host_name_arr = realWindow.location.hostname.split('.')
|
|
54
|
-
|
|
55
|
-
let subdomain = 'web'
|
|
56
|
-
|
|
57
|
-
if (host_name_arr.length === 3 && host_name_arr[0]) {
|
|
58
|
-
subdomain = host_name_arr[0]
|
|
59
|
-
}
|
|
60
|
-
|
|
61
|
-
// new subdomain structure => subdomain.subdomain.advoca.no
|
|
62
|
-
if (host_name_arr.length === 4 && host_name_arr[0]) {
|
|
63
|
-
subdomain = host_name_arr[0] + '.' + host_name_arr[1]
|
|
64
|
-
}
|
|
65
|
-
|
|
66
|
-
// excludes for shell => dev/stage.advoca.no, for more dynamic, depends on customer, convert it in code
|
|
67
|
-
if (host_name_arr.length === 4 && host_name_arr[0] && host_name_arr[1] && host_name_arr[0] === 'shell') {
|
|
68
|
-
subdomain = host_name_arr[1]
|
|
69
|
-
}
|
|
70
|
-
|
|
71
|
-
// for adcuris
|
|
72
|
-
if (realWindow.location.hostname.includes('adcuris')) {
|
|
73
|
-
advoca_url = advoca_url.replace('adcuris', 'advoca')
|
|
74
|
-
subdomain = subdomain.replace('advoca-', '').replace('advoca', 'www')
|
|
75
|
-
} */
|
|
76
53
|
return advoca_url.replace('subdomain', subdomain);
|
|
77
54
|
}
|
|
78
55
|
const DEVEXPRESS = {
|
|
@@ -95,49 +72,7 @@ export function computeBaseUrl() {
|
|
|
95
72
|
* tld - top level domain. This is last part of domain name. For example, in google.com, com is tld.
|
|
96
73
|
*/
|
|
97
74
|
let tld = domain === 'adcuris' ? 'health' : 'no';
|
|
98
|
-
if (domain === 'avans') {
|
|
99
|
-
domain = 'adopus';
|
|
100
|
-
}
|
|
101
|
-
/* let tld = 'no'
|
|
102
|
-
|
|
103
|
-
if (domain === 'adcuris') {
|
|
104
|
-
tld = 'health'
|
|
105
|
-
}
|
|
106
|
-
*/
|
|
107
|
-
/* if (env == 'localhost') {
|
|
108
|
-
// default
|
|
109
|
-
if (!env_to_operate || env_to_operate.includes('localhost')) {
|
|
110
|
-
env_computed = subdomain ? subdomain + '.dev' : 'dev'
|
|
111
|
-
// custom
|
|
112
|
-
} else {
|
|
113
|
-
env_computed =
|
|
114
|
-
env_to_operate === 'prod' && !subdomain
|
|
115
|
-
? 'web'
|
|
116
|
-
: env_to_operate === 'prod'
|
|
117
|
-
? subdomain
|
|
118
|
-
: subdomain
|
|
119
|
-
? `${subdomain}.${env_to_operate}`
|
|
120
|
-
: env_to_operate
|
|
121
|
-
}
|
|
122
|
-
|
|
123
|
-
base_url = `https://${env_computed}.${domain}.${tld}`
|
|
124
|
-
} else if (subdomain === 'cdn') {
|
|
125
|
-
env_computed = 'dev'
|
|
126
|
-
|
|
127
|
-
base_url = `https://${env_computed}.${domain}.${tld}`
|
|
128
|
-
} */
|
|
129
75
|
let computed_subdomain = computedSubdomain();
|
|
130
|
-
/* if (domain === 'advoca') {
|
|
131
|
-
computed_subdomain = computed_subdomain || window.location.host.split('.').slice(0, -2).join('.')
|
|
132
|
-
|
|
133
|
-
if () {
|
|
134
|
-
domain = 'adcuris'
|
|
135
|
-
|
|
136
|
-
tld = 'health'
|
|
137
|
-
} else {
|
|
138
|
-
domain = 'adopus'
|
|
139
|
-
}
|
|
140
|
-
} */
|
|
141
76
|
if (computed_subdomain) {
|
|
142
77
|
base_url = `https://${computed_subdomain}.${domain}.${tld}`;
|
|
143
78
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"initEnvConfigsVars.js","sourceRoot":"","sources":["../../src/helpers/initEnvConfigsVars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAA;AAC1C,MAAM,CAAC,MAAM,GAAG,GACZ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAK,CAAC;IACpE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,MAAM,CAAC;IACvE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,OAAO,CAAC;IAC1E,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC;IAC9C,MAAM,CAAA;AAEV,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,2CAA2C,CAAA;AAEpF,MAAM,CAAC,IAAI,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"initEnvConfigsVars.js","sourceRoot":"","sources":["../../src/helpers/initEnvConfigsVars.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,IAAI,CAAA;AAC/B,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAA;AAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAA;AAC1C,MAAM,CAAC,MAAM,GAAG,GACZ,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,IAAI,KAAK,CAAC;IACpE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,IAAI,MAAM,CAAC;IACvE,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC,IAAI,OAAO,CAAC;IAC1E,CAAC,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC;IAC9C,MAAM,CAAA;AAEV,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC,2CAA2C,CAAA;AAEpF,MAAM,CAAC,IAAI,MAAM,GAAG,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAgD,CAAA;AAEjH,IAAI,CAAC,MAAM,IAAI,CAAC,CAAC,QAAQ,EAAE,SAAS,EAAE,QAAQ,EAAE,OAAO,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;IACxE,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAA;AACrG,CAAC;AAED,MAAM,iBAAiB,GAAG;IACtB,GAAG,EAAE,kDAAkD;IACvD,SAAS,EAAE,kDAAkD;IAC7D,IAAI,EAAE,kDAAkD;IACxD,KAAK,EAAE,6CAA6C;IACpD,IAAI,EAAE,6CAA6C;CACtD,CAAA;AACD,MAAM,UAAU,eAAe,CAAC,IAAgB,EAAE,cAA2B;IACzE,IAAI,IAAI,KAAK,WAAW,IAAI,cAAc,EAAE,CAAC;QACzC,OAAO,iBAAiB,CAAC,cAAc,CAAC,CAAA;IAC5C,CAAC;IACD,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAA;AAClC,CAAC;AAED,MAAM,aAAa,GAAG;IAClB,OAAO,EAAE;QACL,GAAG,EAAE,mCAAmC;QACxC,SAAS,EAAE,mCAAmC;QAC9C,IAAI,EAAE,mCAAmC;QACzC,KAAK,EAAE,0CAA0C;QACjD,IAAI,EAAE,uCAAuC;KAChD;IACD,MAAM,EAAE;QACJ,GAAG,EAAE,iCAAiC;QACtC,SAAS,EAAE,iCAAiC;QAC5C,IAAI,EAAE,iCAAiC;QACvC,KAAK,EAAE,mCAAmC;QAC1C,IAAI,EAAE,kCAAkC;KAC3C;CACJ,CAAA;AAED,MAAM,UAAU,YAAY,CAAC,GAAS,EAAE,cAAqB;IACzD,MAAM,IAAI,GAAG,CAAC,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,QAAQ,CAAA;IAExF,IAAI,GAAG,KAAK,WAAW,IAAI,cAAc,EAAE,CAAC;QACxC,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,cAAc,CAAC,CAAA;IAC9C,CAAC;IAED,OAAO,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAA;AACnC,CAAC;AAED,MAAM,UAAU,qBAAqB;IACjC,IAAI,UAAU,GAAG,6BAA6B,CAAA;IAE9C,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;IAExE,OAAO,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAA;AACrD,CAAC;AAED,MAAM,UAAU,GAAG;IACf,GAAG,EAAE,qCAAqC;IAC1C,SAAS,EAAE,qCAAqC;IAChD,IAAI,EAAE,qCAAqC;IAC3C,KAAK,EAAE,qCAAqC;IAC5C,IAAI,EAAE,kCAAkC;CAC3C,CAAA;AAED,MAAM,UAAU,UAAU,CAAC,IAAU,EAAE,cAAqB;IACxD,IAAI,IAAI,KAAK,WAAW,IAAI,cAAc,EAAE,CAAC;QACzC,OAAO,UAAU,CAAC,cAAc,CAAC,CAAA;IACrC,CAAC;IACD,OAAO,UAAU,CAAC,GAAG,CAAC,CAAA;AAC1B,CAAC;AAED,uBAAuB;AAEvB,MAAM,UAAU,cAAc;IAC1B,IAAI,QAAQ,GAAG,EAAE,CAAA;IACjB;;OAEG;IACH,IAAI,GAAG,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAA;IAEhD,IAAI,kBAAkB,GAAG,iBAAiB,EAAE,CAAA;IAE5C,IAAI,kBAAkB,EAAE,CAAC;QACrB,QAAQ,GAAG,WAAW,kBAAkB,IAAI,MAAM,IAAI,GAAG,EAAE,CAAA;IAC/D,CAAC;IACD,OAAO,QAAQ,CAAA;AACnB,CAAC;AACD,SAAS,iBAAiB;IACtB,IAAI,cAAc,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,CAAC;QACtF,OAAO,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,SAAS,CAAA;IACrD,CAAC;IAED,SAAS;IACT,IAAI,cAAc,EAAE,CAAC;QACjB,CAAC,SAAS;YACN,OAAO,CAAC,KAAK,CACT,2HAA2H,CAC9H,CAAA;QACL,OAAO,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,SAAS,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,cAAc,EAAE,CAAA;IACrG,CAAC;IAED,IAAI,SAAS,KAAK,KAAK,EAAE,CAAC;QACtB,OAAO,SAAS,CAAA;IACpB,CAAC;IAED;;QAEI;IAEJ,OAAM;IACN;;;;;;+BAM2B;IAE3B,qBAAqB;AACzB,CAAC;AAED,0CAA0C;AAC1C,MAAM,sBAAsB,GAAG;IAC3B,0CAA0C;IAC1C,GAAG,EAAE,sBAAsB;IAC3B,SAAS,EAAE,sBAAsB;IACjC,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,sBAAsB;IAC7B,IAAI,EAAE,EAAE;IACR,IAAI,EAAE;QACF,MAAM,EAAE,sBAAsB;QAC9B,OAAO,EAAE,sBAAsB;KAClC;CACJ,CAAA;AAED,MAAM,6BAA6B,GAAG;IAClC,GAAG,EAAE,sBAAsB;IAC3B,SAAS,EAAE,sBAAsB;IACjC,IAAI,EAAE,sBAAsB;IAC5B,KAAK,EAAE,sBAAsB;IAC7B,IAAI,EAAE,EAAE;IACR,IAAI,EAAE;QACF,MAAM,EAAE,sBAAsB;QAC9B,OAAO,EAAE,sBAAsB;KAClC;CACJ,CAAA;AAED,MAAM,UAAU,gBAAgB,CAAC,OAAe;IAC5C,MAAM,IAAI,GAAG,cAAc,IAAI,GAAG,CAAA;IAElC,MAAM,QAAQ,GAAG,OAAO,CAAC,WAAW,EAAE,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAA;IAE3E,IAAI,GAAG,GAAG,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,6BAA6B,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,sBAAsB,CAAC,IAAI,CAAC,CAAA;IAElG,IAAI,IAAI,KAAK,MAAM,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE,CAAC;QAC7C,GAAG,GAAG,GAAG,CAAC,QAAQ,CAAC,CAAA;IACvB,CAAC;IACD,OAAO,GAAa,CAAA;AACxB,CAAC;AAED,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAA;AACtC,MAAM,CAAC,MAAM,QAAQ,GAAG,YAAY,CAAC,OAAO,CAAC,UAAU,CAAC,CAAA;AAExD,MAAM,WAAW,GACb,QAAQ,KAAK,SAAS;IACtB,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAA;AAEzG,MAAM,eAAe,GAAG,CAAC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,QAAQ,EAAE,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAC7F,MAAM,CAAC,QAAQ,CAAC,SAAS,CAAC,CAC7B,CAAA;AAED,MAAM,UAAU,qBAAqB;IACjC,MAAM,OAAO,GAAG,WAAW,IAAI,eAAe,CAAA;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,6CAA6C,CAAC,CAAC,CAAC,wCAAwC,CAAA;IAE9G,OAAO,GAAG,CAAA;AACd,CAAC;AACD,MAAM,OAAO,GAAG,GAAG,KAAK,WAAW,IAAI,GAAG,KAAK,KAAK,IAAI,GAAG,KAAK,MAAM,IAAI,GAAG,KAAK,OAAO,CAAA;AACzF,MAAM,OAAO,GAAG,MAAM,KAAK,SAAS,CAAA;AACpC,MAAM,UAAU,0BAA0B;IACtC,OAAO,OAAO;QACV,CAAC,CAAC,2CAA2C;QAC7C,CAAC,CAAC,OAAO;YACT,CAAC,CAAC,0CAA0C;YAC5C,CAAC,CAAC,qCAAqC,CAAA;AAC/C,CAAC;AAED,MAAM,UAAU,WAAW;IACvB,MAAM,OAAO,GAAG,WAAW,IAAI,eAAe,CAAA;IAE9C,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC,CAAC,gBAAgB,CAAA;IAE5D,OAAO,GAAG,CAAA;AACd,CAAC"}
|
package/package.json
CHANGED
|
@@ -40,7 +40,8 @@ export const EnvironmentsUrls1 = (adcuris_subdomains?: string[]) => {
|
|
|
40
40
|
|
|
41
41
|
SRV_AO_DIRECTORY: `${base_url}/api-ao/directory`,
|
|
42
42
|
SRV_AO_WRAPPER: '',
|
|
43
|
-
|
|
43
|
+
SRV_AO_WRAPPER_NEW: '/api/wrapper',
|
|
44
|
+
SRV_AUTH: '/api/auth',
|
|
44
45
|
DEVELOPMENT:
|
|
45
46
|
realWindow.location.hostname.includes('dev.') || realWindow.location.hostname.includes('localhost'),
|
|
46
47
|
ENVIRONMENT_TO_OPERATE: env_to_operate,
|
|
@@ -10,12 +10,7 @@ export const env =
|
|
|
10
10
|
export type IEnv = typeof env
|
|
11
11
|
export const env_to_operate = realWindow.__asma_development_environment_to_operate__
|
|
12
12
|
|
|
13
|
-
export let domain = realWindow.location.hostname.split('.').at(-2) as
|
|
14
|
-
| 'adopus'
|
|
15
|
-
| 'adcuris'
|
|
16
|
-
| 'advoca'
|
|
17
|
-
| 'avans'
|
|
18
|
-
| undefined
|
|
13
|
+
export let domain = realWindow.location.hostname.split('.').at(-2) as 'adopus' | 'adcuris' | 'advoca' | undefined
|
|
19
14
|
|
|
20
15
|
if (!domain || !['adopus', 'adcuris', 'advoca', 'avans'].includes(domain)) {
|
|
21
16
|
throw new Error('Domain not found! please use dns ..[advoca,adopus,avans].[no,health,localhost]')
|
|
@@ -67,30 +62,6 @@ export function createAdvocaAccessUrl() {
|
|
|
67
62
|
|
|
68
63
|
const subdomain = window.location.host.split('.').slice(0, -2).join('.')
|
|
69
64
|
|
|
70
|
-
/* const host_name_arr = realWindow.location.hostname.split('.')
|
|
71
|
-
|
|
72
|
-
let subdomain = 'web'
|
|
73
|
-
|
|
74
|
-
if (host_name_arr.length === 3 && host_name_arr[0]) {
|
|
75
|
-
subdomain = host_name_arr[0]
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
// new subdomain structure => subdomain.subdomain.advoca.no
|
|
79
|
-
if (host_name_arr.length === 4 && host_name_arr[0]) {
|
|
80
|
-
subdomain = host_name_arr[0] + '.' + host_name_arr[1]
|
|
81
|
-
}
|
|
82
|
-
|
|
83
|
-
// excludes for shell => dev/stage.advoca.no, for more dynamic, depends on customer, convert it in code
|
|
84
|
-
if (host_name_arr.length === 4 && host_name_arr[0] && host_name_arr[1] && host_name_arr[0] === 'shell') {
|
|
85
|
-
subdomain = host_name_arr[1]
|
|
86
|
-
}
|
|
87
|
-
|
|
88
|
-
// for adcuris
|
|
89
|
-
if (realWindow.location.hostname.includes('adcuris')) {
|
|
90
|
-
advoca_url = advoca_url.replace('adcuris', 'advoca')
|
|
91
|
-
subdomain = subdomain.replace('advoca-', '').replace('advoca', 'www')
|
|
92
|
-
} */
|
|
93
|
-
|
|
94
65
|
return advoca_url.replace('subdomain', subdomain)
|
|
95
66
|
}
|
|
96
67
|
|
|
@@ -118,51 +89,8 @@ export function computeBaseUrl() {
|
|
|
118
89
|
*/
|
|
119
90
|
let tld = domain === 'adcuris' ? 'health' : 'no'
|
|
120
91
|
|
|
121
|
-
if (domain === 'avans') {
|
|
122
|
-
domain = 'adopus'
|
|
123
|
-
}
|
|
124
|
-
/* let tld = 'no'
|
|
125
|
-
|
|
126
|
-
if (domain === 'adcuris') {
|
|
127
|
-
tld = 'health'
|
|
128
|
-
}
|
|
129
|
-
*/
|
|
130
|
-
/* if (env == 'localhost') {
|
|
131
|
-
// default
|
|
132
|
-
if (!env_to_operate || env_to_operate.includes('localhost')) {
|
|
133
|
-
env_computed = subdomain ? subdomain + '.dev' : 'dev'
|
|
134
|
-
// custom
|
|
135
|
-
} else {
|
|
136
|
-
env_computed =
|
|
137
|
-
env_to_operate === 'prod' && !subdomain
|
|
138
|
-
? 'web'
|
|
139
|
-
: env_to_operate === 'prod'
|
|
140
|
-
? subdomain
|
|
141
|
-
: subdomain
|
|
142
|
-
? `${subdomain}.${env_to_operate}`
|
|
143
|
-
: env_to_operate
|
|
144
|
-
}
|
|
145
|
-
|
|
146
|
-
base_url = `https://${env_computed}.${domain}.${tld}`
|
|
147
|
-
} else if (subdomain === 'cdn') {
|
|
148
|
-
env_computed = 'dev'
|
|
149
|
-
|
|
150
|
-
base_url = `https://${env_computed}.${domain}.${tld}`
|
|
151
|
-
} */
|
|
152
92
|
let computed_subdomain = computedSubdomain()
|
|
153
93
|
|
|
154
|
-
/* if (domain === 'advoca') {
|
|
155
|
-
computed_subdomain = computed_subdomain || window.location.host.split('.').slice(0, -2).join('.')
|
|
156
|
-
|
|
157
|
-
if () {
|
|
158
|
-
domain = 'adcuris'
|
|
159
|
-
|
|
160
|
-
tld = 'health'
|
|
161
|
-
} else {
|
|
162
|
-
domain = 'adopus'
|
|
163
|
-
}
|
|
164
|
-
} */
|
|
165
|
-
|
|
166
94
|
if (computed_subdomain) {
|
|
167
95
|
base_url = `https://${computed_subdomain}.${domain}.${tld}`
|
|
168
96
|
}
|