@equinor/fusion-framework-app 9.3.6 → 9.3.8
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/CHANGELOG.md +19 -0
- package/dist/esm/AppConfigurator.js +9 -13
- package/dist/esm/AppConfigurator.js.map +1 -1
- package/dist/esm/configure-modules.js +5 -15
- package/dist/esm/configure-modules.js.map +1 -1
- package/dist/esm/enable-bookmark.js +1 -2
- package/dist/esm/enable-bookmark.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/dist/types/version.d.ts +1 -1
- package/package.json +7 -7
- package/src/version.ts +1 -1
- package/tsconfig.json +5 -11
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,24 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
+
## 9.3.8
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies []:
|
|
8
|
+
- @equinor/fusion-framework-module-bookmark@2.1.5
|
|
9
|
+
- @equinor/fusion-framework@7.3.6
|
|
10
|
+
- @equinor/fusion-framework-module-app@6.1.9
|
|
11
|
+
|
|
12
|
+
## 9.3.7
|
|
13
|
+
|
|
14
|
+
### Patch Changes
|
|
15
|
+
|
|
16
|
+
- Updated dependencies [[`88aab5c`](https://github.com/equinor/fusion-framework/commit/88aab5c50c3ae77d80ce420902db0ba843a8d85f), [`e164abc`](https://github.com/equinor/fusion-framework/commit/e164abcf52ff84d181ed5406d2a28441d54da9a8)]:
|
|
17
|
+
- @equinor/fusion-framework-module-bookmark@2.1.4
|
|
18
|
+
- @equinor/fusion-framework-module-http@6.2.4
|
|
19
|
+
- @equinor/fusion-framework@7.3.5
|
|
20
|
+
- @equinor/fusion-framework-module-app@6.1.8
|
|
21
|
+
|
|
3
22
|
## 9.3.6
|
|
4
23
|
|
|
5
24
|
### Patch Changes
|
|
@@ -1,17 +1,9 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { ModuleConsoleLogger, ModulesConfigurator, } from '@equinor/fusion-framework-module';
|
|
11
2
|
import event from '@equinor/fusion-framework-module-event';
|
|
12
3
|
import http, { configureHttpClient, configureHttp, } from '@equinor/fusion-framework-module-http';
|
|
13
4
|
import auth from '@equinor/fusion-framework-module-msal';
|
|
14
5
|
export class AppConfigurator extends ModulesConfigurator {
|
|
6
|
+
env;
|
|
15
7
|
constructor(env) {
|
|
16
8
|
super([event, http, auth]);
|
|
17
9
|
this.env = env;
|
|
@@ -28,13 +20,17 @@ export class AppConfigurator extends ModulesConfigurator {
|
|
|
28
20
|
options) {
|
|
29
21
|
this.addConfig({
|
|
30
22
|
module: http,
|
|
31
|
-
configure: (config, ref) =>
|
|
32
|
-
const service =
|
|
23
|
+
configure: async (config, ref) => {
|
|
24
|
+
const service = await ref?.serviceDiscovery.resolveService(serviceName);
|
|
33
25
|
if (!service) {
|
|
34
26
|
throw Error(`failed to configure service [${serviceName}]`);
|
|
35
27
|
}
|
|
36
|
-
config.configureClient(serviceName,
|
|
37
|
-
|
|
28
|
+
config.configureClient(serviceName, {
|
|
29
|
+
...options,
|
|
30
|
+
baseUri: service.uri,
|
|
31
|
+
defaultScopes: service.defaultScopes,
|
|
32
|
+
});
|
|
33
|
+
},
|
|
38
34
|
});
|
|
39
35
|
}
|
|
40
36
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AppConfigurator.js","sourceRoot":"","sources":["../../src/AppConfigurator.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"AppConfigurator.js","sourceRoot":"","sources":["../../src/AppConfigurator.ts"],"names":[],"mappings":"AAEA,OAAO,EAGL,mBAAmB,EACnB,mBAAmB,GACpB,MAAM,kCAAkC,CAAC;AAE1C,OAAO,KAAK,MAAM,wCAAwC,CAAC;AAE3D,OAAO,IAAI,EAAE,EACX,mBAAmB,EACnB,aAAa,GAEd,MAAM,uCAAuC,CAAC;AAE/C,OAAO,IAAI,MAAM,uCAAuC,CAAC;AAmDzD,MAAM,OAAO,eAKX,SAAQ,mBAA+C;IAG3B;IAA5B,YAA4B,GAAS;QACnC,KAAK,CAAC,CAAC,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;QADD,QAAG,GAAH,GAAG,CAAM;QAEnC,IAAI,CAAC,MAAM,GAAG,IAAI,mBAAmB,CAAC,iBAAiB,CAAC,CAAC;IAC3D,CAAC;IAEM,aAAa,CAAC,GAAG,IAAsC;QAC5D,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACzC,CAAC;IAEM,mBAAmB,CAAC,GAAG,IAA4C;QACxE,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAC/C,CAAC;IAEM,yBAAyB,CAC9B,WAAmB;IACnB,8DAA8D;IAC9D,OAAmE;QAEnE,IAAI,CAAC,SAAS,CAAC;YACb,MAAM,EAAE,IAAI;YACZ,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,EAAE;gBAC/B,MAAM,OAAO,GAAG,MAAM,GAAG,EAAE,gBAAgB,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC;gBACxE,IAAI,CAAC,OAAO,EAAE,CAAC;oBACb,MAAM,KAAK,CAAC,gCAAgC,WAAW,GAAG,CAAC,CAAC;gBAC9D,CAAC;gBACD,MAAM,CAAC,eAAe,CAAC,WAAW,EAAE;oBAClC,GAAG,OAAO;oBACV,OAAO,EAAE,OAAO,CAAC,GAAG;oBACpB,aAAa,EAAE,OAAO,CAAC,aAAa;iBACrC,CAAC,CAAC;YACL,CAAC;SACF,CAAC,CAAC;IACL,CAAC;CACF;AAED,eAAe,eAAe,CAAC"}
|
|
@@ -1,12 +1,3 @@
|
|
|
1
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
2
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
3
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
4
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
5
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
6
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
7
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
8
|
-
});
|
|
9
|
-
};
|
|
10
1
|
import { AppConfigurator } from './AppConfigurator';
|
|
11
2
|
/**
|
|
12
3
|
*
|
|
@@ -35,21 +26,20 @@ export const configureModules = (cb) =>
|
|
|
35
26
|
* @param args - Fusion and application environments (manifest, config ...)
|
|
36
27
|
* @returns initialized app modules
|
|
37
28
|
*/
|
|
38
|
-
(args) =>
|
|
39
|
-
var _a;
|
|
29
|
+
async (args) => {
|
|
40
30
|
const configurator = new AppConfigurator(args.env);
|
|
41
31
|
if (cb) {
|
|
42
|
-
|
|
32
|
+
await Promise.resolve(cb(configurator, args));
|
|
43
33
|
}
|
|
44
|
-
const modules = (
|
|
34
|
+
const modules = (await configurator.initialize(args.fusion.modules));
|
|
45
35
|
// @eikeland
|
|
46
36
|
// TODO - remove check after fusion-cli is updated (app module is not enabled in fusion-cli)
|
|
47
|
-
if (
|
|
37
|
+
if (args.env.manifest?.appKey) {
|
|
48
38
|
modules.event.dispatchEvent('onAppModulesLoaded', {
|
|
49
39
|
detail: { appKey: args.env.manifest.appKey, modules },
|
|
50
40
|
});
|
|
51
41
|
}
|
|
52
42
|
return modules;
|
|
53
|
-
}
|
|
43
|
+
};
|
|
54
44
|
export default configureModules;
|
|
55
45
|
//# sourceMappingURL=configure-modules.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configure-modules.js","sourceRoot":"","sources":["../../src/configure-modules.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"configure-modules.js","sourceRoot":"","sources":["../../src/configure-modules.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAGpD;;;;;;;;;;;;;;;;;;GAkBG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAC3B,CAKE,EAA6C,EACmC,EAAE;AACpF;;;;;;GAMG;AACH,KAAK,EAAE,IAAiC,EAAyC,EAAE;IACjF,MAAM,YAAY,GAAG,IAAI,eAAe,CAAkC,IAAI,CAAC,GAAG,CAAC,CAAC;IACpF,IAAI,EAAE,EAAE,CAAC;QACP,MAAM,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,YAAY,EAAE,IAAI,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,MAAM,OAAO,GAAG,CAAC,MAAM,YAAY,CAAC,UAAU,CAC5C,IAAI,CAAC,MAAM,CAAC,OAAO,CAEpB,CAA4C,CAAC;IAE9C,YAAY;IACZ,4FAA4F;IAC5F,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;QAC9B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,oBAAoB,EAAE;YAChD,MAAM,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE;SACtD,CAAC,CAAC;IACL,CAAC;IACD,OAAO,OAAO,CAAC;AACjB,CAAC,CAAC;AAEJ,eAAe,gBAAgB,CAAC"}
|
|
@@ -16,9 +16,8 @@ export const enableBookmark = (config) => {
|
|
|
16
16
|
module: {
|
|
17
17
|
name: 'bookmark',
|
|
18
18
|
initialize(args) {
|
|
19
|
-
var _a;
|
|
20
19
|
// get the bookmark provider from the ref (portal)
|
|
21
|
-
const provider =
|
|
20
|
+
const provider = args.ref?.bookmark;
|
|
22
21
|
if (!provider) {
|
|
23
22
|
console.error('Bookmark provider not found');
|
|
24
23
|
return {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"enable-bookmark.js","sourceRoot":"","sources":["../../src/enable-bookmark.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAwB,EAAQ,EAAE;IAC/D,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAgB,CAAC;IACjD,MAAM,CAAC,SAAS,CAAC;QACf,MAAM,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,UAAU,CAAC,IAAI
|
|
1
|
+
{"version":3,"file":"enable-bookmark.js","sourceRoot":"","sources":["../../src/enable-bookmark.ts"],"names":[],"mappings":"AAMA;;;;;;;;;GASG;AACH,8DAA8D;AAC9D,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,MAAwB,EAAQ,EAAE;IAC/D,kCAAkC;IAClC,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAAgB,CAAC;IACjD,MAAM,CAAC,SAAS,CAAC;QACf,MAAM,EAAE;YACN,IAAI,EAAE,UAAU;YAChB,UAAU,CAAC,IAAI;gBACb,kDAAkD;gBAClD,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAC;gBACpC,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;oBAC7C,OAAO,EAAE,CAAC;gBACZ,CAAC;gBACD,6DAA6D;gBAC7D,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE;oBACzB,GAAG,CAAC,MAAM,EAAE,IAAI;wBACd,QAAQ,IAAI,EAAE,CAAC;4BACb,KAAK,qBAAqB;gCACxB,OAAO,CAAC,SAAmC,EAAE,EAAE;oCAC7C,kEAAkE;oCAClE,MAAM,cAAc,GAAG,MAAM,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC;oCAC7D,gBAAgB,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;oCACrC,qEAAqE;oCACrE,OAAO,GAAG,EAAE;wCACV,gBAAgB,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC;wCACxC,cAAc,EAAE,CAAC;oCACnB,CAAC,CAAC;gCACJ,CAAC,CAAC;wBACN,CAAC;wBACD;;;;;2BAKG;wBACH,IAAI,IAAI,IAAI,MAAM,EAAE,CAAC;4BACnB,yDAAyD;4BACzD,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU,EAAE,CAAC;gCACvC,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;4BACnC,CAAC;4BACD,sBAAsB;4BACtB,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC;wBACtB,CAAC;oBACH,CAAC;iBACF,CAAC,CAAC;YACL,CAAC;YACD,OAAO;gBACL,KAAK,MAAM,QAAQ,IAAI,gBAAgB,EAAE,CAAC;oBACxC,QAAQ,EAAE,CAAC;gBACb,CAAC;gBACD,gBAAgB,CAAC,KAAK,EAAE,CAAC;YAC3B,CAAC;SACuB;KAC3B,CAAC,CAAC;AACL,CAAC,CAAC"}
|
package/dist/esm/version.js
CHANGED