@equinor/fusion-framework-cli 10.7.0-beta-AH-test-778ecddcafac619d1bdc9be4a2c50f2f8c15cc68 → 10.7.1
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 +11 -6
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js +6 -2
- package/dist/bin/dev-portal/ContextSelector/useContextResolver.js.map +1 -1
- package/dist/bin/dev-portal/useAppContextNavigation.js +20 -15
- package/dist/bin/dev-portal/useAppContextNavigation.js.map +1 -1
- package/dist/bin/public/assets/{index-Bg_bVFV6.js → index-Cjshb4Ms.js} +303 -302
- package/dist/bin/public/index.html +1 -1
- package/dist/lib/plugins/app-proxy/app-proxy-plugin.js +21 -22
- package/dist/lib/plugins/app-proxy/app-proxy-plugin.js.map +1 -1
- package/dist/lib/plugins/help-proxy/help-proxy-plugin.js +16 -17
- package/dist/lib/plugins/help-proxy/help-proxy-plugin.js.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +17 -17
package/CHANGELOG.md
CHANGED
|
@@ -1,10 +1,19 @@
|
|
|
1
1
|
# Change Log
|
|
2
2
|
|
|
3
|
-
## 10.7.
|
|
3
|
+
## 10.7.1
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- [#2954](https://github.com/equinor/fusion-framework/pull/2954) [`aac72ce`](https://github.com/equinor/fusion-framework/commit/aac72ce780588c72eb517d3e8c4860f002cc570d) Thanks [@odinr](https://github.com/odinr)! - fixed issues with overriding proxy options
|
|
8
|
+
|
|
9
|
+
- [#2955](https://github.com/equinor/fusion-framework/pull/2955) [`6f104e2`](https://github.com/equinor/fusion-framework/commit/6f104e2ed191e77c6127376e035bbf7af80f166b) Thanks [@asbjornhaland](https://github.com/asbjornhaland)! - - Add env to 'onReactAppLoaded' event
|
|
10
|
+
- Prevent context provider change if app key is not current app for 'onReactAppLoaded'
|
|
11
|
+
|
|
12
|
+
## 10.7.0
|
|
4
13
|
|
|
5
14
|
### Minor Changes
|
|
6
15
|
|
|
7
|
-
- [#2930](https://github.com/equinor/fusion-framework/pull/2930) [`
|
|
16
|
+
- [#2930](https://github.com/equinor/fusion-framework/pull/2930) [`5da6b2d`](https://github.com/equinor/fusion-framework/commit/5da6b2d4cb7fb93ff3784753a0052d3362ab828d) Thanks [@odinr](https://github.com/odinr)! - **@equinor/fusion-framework-react:**
|
|
8
17
|
|
|
9
18
|
- Enhanced `useAppContextNavigation` to support custom context path extraction and generation. This allows for more flexible navigation handling based on application-specific requirements.
|
|
10
19
|
|
|
@@ -52,10 +61,6 @@
|
|
|
52
61
|
.subscribe((path) => history.push(path));
|
|
53
62
|
```
|
|
54
63
|
|
|
55
|
-
### Patch Changes
|
|
56
|
-
|
|
57
|
-
- pre-release changeset for tag **beta-AH-test**, all public packages are patched
|
|
58
|
-
|
|
59
64
|
## 10.6.1
|
|
60
65
|
|
|
61
66
|
### Patch Changes
|
|
@@ -93,8 +93,12 @@ export const useContextResolver = () => {
|
|
|
93
93
|
/** observe changes to app modules and clear / set the context provider on change */
|
|
94
94
|
useObservableSubscription(instance$, onContextProviderChange, clearContextProvider);
|
|
95
95
|
useEffect(() => framework.modules.event.addEventListener('onReactAppLoaded', (e) => {
|
|
96
|
-
|
|
97
|
-
|
|
96
|
+
var _a;
|
|
97
|
+
// Only change provider if event is for current app
|
|
98
|
+
if (e.detail.env.manifest.appKey === ((_a = framework.modules.app.current) === null || _a === void 0 ? void 0 : _a.appKey)) {
|
|
99
|
+
console.debug('useContextResolver::onReactAppLoaded', 'using legacy register hack method');
|
|
100
|
+
return onContextProviderChange(e.detail.modules);
|
|
101
|
+
}
|
|
98
102
|
}), [framework, onContextProviderChange]);
|
|
99
103
|
const processError = useCallback((err) => {
|
|
100
104
|
if (err.name === 'QueryClientError') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"useContextResolver.js","sourceRoot":"","sources":["../../../../src/bin/dev-portal/ContextSelector/useContextResolver.ts"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClE,OAAO,EAAE,YAAY,EAAE,MAAM,iCAAiC,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,qCAAqC,CAAC;AAQpE,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,kCAAkC,CAAC;AACjG,OAAO,+BAA+B,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,WAAW,CAAC;AAEZ,OAAO,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,EAAE,EAAE,EAAE,MAAM,MAAM,CAAC;AAWjE,SAAS,qBAAqB,CAAC,MAAc;IAC3C,OAAO,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;AACxE,CAAC;AAED;;;;;GAKG;AACH,MAAM,MAAM,GAAG,CAAC,GAAuB,EAAiB,EAAE;IACxD,OAAO,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;;QACnB,MAAM,UAAU,GAAG;YACjB,EAAE,EAAE,CAAC,CAAC,EAAE;YACR,KAAK,EAAE,CAAC,CAAC,KAAK;YACd,QAAQ,EAAE,MAAA,CAAC,CAAC,QAAQ,mCAAI,CAAC,CAAC,IAAI,CAAC,EAAE;YACjC,OAAO,EAAE,CAAC,CAAC,OAAO;YAClB,IAAI,EAAE,CAAC,CAAC,IAAI;SACb,CAAC;QAEF,QAAQ,CAAC,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC;YAClB,KAAK,aAAa;gBAChB,uCACK,UAAU,KACb,IAAI,EACF,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ;wBACjD,CAAC,CAAC,gDAAgD,CAAC,CAAC,KAAK,CAAC,SAAS,MAAM;wBACzE,CAAC,CAAC,EAAE,IACR;YACJ,KAAK,UAAU;gBACb,uCACK,UAAU,KACb,OAAO,EAAE,MAAM,EACf,IAAI,EACF,CAAC,CAAC,KAAK,CAAC,KAAK,IAAK,CAAC,CAAC,KAAK,CAAC,KAAgB,CAAC,WAAW,EAAE,KAAK,QAAQ;wBACnE,CAAC,CAAC,gDAAgD,qBAAqB,CAAC,CAAC,CAAC,KAAK,CAAC,KAAe,CAAC,MAAM;wBACtG,CAAC,CAAC,EAAE,IACR;YACJ;gBACE,OAAO,UAAU,CAAC;QACtB,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;;;GAIG;AACH,MAAM,UAAU,GAAG,CAAC,KAAiC,EAAqB,EAAE;IAC1E,OAAO,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,cAAc,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,KAAK,CAAC,CAAC;AAC1E,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAIhC,EAAE;IACF,uBAAuB;IACvB,MAAM,SAAS,GAAG,YAAY,EAAiC,CAAC;IAEhE,MAAM,EAAE,UAAU,EAAE,GAAG,aAAa,EAAE,CAAC;IAEvC,qCAAqC;IACrC,MAAM,SAAS,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,SAAS,KAAI,KAAK,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC;IAE9E,4BAA4B;IAC5B,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAA0B,IAAI,CAAC,CAAC;IAExE,gCAAgC;IAChC,MAAM,EAAE,KAAK,EAAE,cAAc,EAAE,GAAG,kBAAkB,CAClD,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,eAAe,KAAI,KAAK,EAAE,CAAC,QAAQ,CAAC,CAAC,CAC9D,CAAC;IAEF,MAAM,WAAW,GAAkB,OAAO,CAAC,GAAG,EAAE;QAC9C,OAAO,cAAc,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACxD,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,0DAA0D;IAC1D,MAAM,uBAAuB,GAAG,WAAW,CAAC,CAAC,OAA2B,EAAE,EAAE;QAC1E,iEAAiE;QACjE,MAAM,eAAe,GAAI,OAA+C,CAAC,OAAO,CAAC;QACjF,IAAI,eAAe,EAAE,CAAC;YACpB,WAAW,CAAC,eAAe,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,WAAW,CAAC,IAAI,CAAC,CAAC;QACpB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,6BAA6B;IAC7B,MAAM,oBAAoB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC5C,WAAW,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,qFAAqF;IACrF,yBAAyB,CAAC,SAAS,EAAE,uBAAuB,EAAE,oBAAoB,CAAC,CAAC;IACpF,SAAS,CACP,GAAG,EAAE,CACH,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE;;QACjE,mDAAmD;QACnD,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,MAAM,MAAK,MAAA,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,OAAO,0CAAE,MAAM,CAAA,EAAE,CAAC;YAC3E,OAAO,CAAC,KAAK,CACX,sCAAsC,EACtC,mCAAmC,CACpC,CAAC;YACF,OAAO,uBAAuB,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACnD,CAAC;IACH,CAAC,CAAC,EACJ,CAAC,SAAS,EAAE,uBAAuB,CAAC,CACrC,CAAC;IAEF,MAAM,YAAY,GAAG,WAAW,CAAC,CAAC,GAAU,EAAiB,EAAE;QAC7D,IAAI,GAAG,CAAC,IAAI,KAAK,kBAAkB,EAAE,CAAC;YACpC,OAAO,YAAY,CAAE,GAAwB,CAAC,KAAc,CAAC,CAAC;QAChE,CAAC;QAED,IAAI,GAAG,CAAC,IAAI,KAAK,0BAA0B,EAAE,CAAC;YAC5C,MAAM,KAAK,GAAG,GAA+B,CAAC;YAC9C,OAAO;gBACL,UAAU,CAAC;oBACT,EAAE,EAAE,KAAK,CAAC,IAAI;oBACd,KAAK,EAAE,KAAK,CAAC,KAAK;oBAClB,QAAQ,EAAE,KAAK,CAAC,WAAW;oBAC3B,OAAO,EAAE,gBAAgB;oBACzB,UAAU,EAAE,IAAI;iBACjB,CAAC;aACH,CAAC;QACJ,CAAC;QAED,OAAO;YACL,UAAU,CAAC;gBACT,KAAK,EAAE,2BAA2B;gBAClC,QAAQ,EAAE,0DAA0D;gBACpE,OAAO,EAAE,gBAAgB;gBACzB,UAAU,EAAE,IAAI;aACjB,CAAC;SACH,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP;;;OAGG;IACH,MAAM,SAAS,GAAG,CAAC,CAAC;IACpB,MAAM,QAAQ,GAAG,OAAO,CACtB,GAA2B,EAAE,CAC3B,QAAQ,IAAI;QACV,WAAW,EAAE,CAAO,MAAc,EAA0B,EAAE;YAC5D,IAAI,MAAM,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;gBAC9B,OAAO;oBACL,UAAU,CAAC;wBACT,kDAAkD;wBAClD,EAAE,EAAE,YAAY;wBAChB,KAAK,EAAE,QAAQ,SAAS,GAAG,MAAM,CAAC,MAAM,uBAAuB;wBAC/D,UAAU,EAAE,IAAI;qBACjB,CAAC;iBACH,CAAC;YACJ,CAAC;YACD,IAAI,CAAC;gBACH,OAAO,aAAa,CAClB,QAAQ,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CAChC,GAAG,CAAC,MAAM,CAAC,EACX,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CACR,CAAC,CAAC,MAAM;oBACN,CAAC,CAAC,CAAC;oBACH,CAAC,CAAC;wBACE,UAAU,CAAC;4BACT,kDAAkD;4BAClD,EAAE,EAAE,YAAY;4BAChB,KAAK,EAAE,kBAAkB;4BACzB,OAAO,EAAE,aAAa;4BACtB,UAAU,EAAE,IAAI;yBACjB,CAAC;qBACH,CACN;gBACD,sBAAsB;gBACtB,UAAU,CAAC,CAAC,GAAG,EAAE,EAAE;oBACjB,OAAO,CAAC,KAAK,CACX,yBAAyB,EACzB,uCAAuC,MAAM,EAAE,EAC/C,GAAG,EACH,GAAG,CAAC,KAAK,CACV,CAAC;oBAEF,OAAO,EAAE,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC/B,CAAC,CAAC,CACH,CACF,CAAC;gBACF,gCAAgC;YAClC,CAAC;YAAC,OAAO,CAAC,EAAE,CAAC;gBACX,MAAM,GAAG,GAAG,CAAU,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,yBAAyB,EAAE,wBAAwB,MAAM,GAAG,EAAE,CAAC,CAAC,CAAC;gBAC/E,OAAO,YAAY,CAAC,GAAG,CAAC,CAAC;YAC3B,CAAC;QACH,CAAC,CAAA;QACD,aAAa,EAAE,WAAW;KAC3B,EACH,CAAC,QAAQ,EAAE,WAAW,EAAE,YAAY,CAAC,CACtC,CAAC;IACF,OAAO,EAAE,QAAQ,EAAE,QAAQ,EAAE,cAAc,EAAE,WAAW,EAAE,CAAC;AAC7D,CAAC,CAAC;AAEF,eAAe,kBAAkB,CAAC"}
|
|
@@ -4,6 +4,19 @@ import { extractContextIdFromPath } from '@equinor/fusion-framework-module-conte
|
|
|
4
4
|
import { useObservableSubscription } from '@equinor/fusion-observable/react';
|
|
5
5
|
import { EMPTY } from 'rxjs';
|
|
6
6
|
import { useFrameworkModule } from '@equinor/fusion-framework-react';
|
|
7
|
+
const generatePathname = (currentPathname, item, context, pathContextId) => {
|
|
8
|
+
var _a, _b, _c, _d;
|
|
9
|
+
if (pathContextId) {
|
|
10
|
+
// context id exists in the url, replace it with the new context id
|
|
11
|
+
const pathname = (_b = (_a = context === null || context === void 0 ? void 0 : context.generatePathFromContext) === null || _a === void 0 ? void 0 : _a.call(context, item, currentPathname)) !== null && _b !== void 0 ? _b : currentPathname.replace(pathContextId, item.id);
|
|
12
|
+
console.debug(`🌍 Portal: context changed, navigating to app's context url:`, `found context id [${pathContextId}] in url, replacing with [${pathname}]`);
|
|
13
|
+
return pathname;
|
|
14
|
+
}
|
|
15
|
+
// could not find context id in the url, set the path to the new context id
|
|
16
|
+
const pathname = (_d = (_c = context === null || context === void 0 ? void 0 : context.generatePathFromContext) === null || _c === void 0 ? void 0 : _c.call(context, item, currentPathname)) !== null && _d !== void 0 ? _d : `/${item === null || item === void 0 ? void 0 : item.id}`;
|
|
17
|
+
console.debug(`🌍 Portal: context changed, navigating to app's context url:`, `could not find context id in url, navigating to path [${pathname}]`);
|
|
18
|
+
return pathname;
|
|
19
|
+
};
|
|
7
20
|
/**
|
|
8
21
|
* when current application changes, this hook will observe the application module instances.
|
|
9
22
|
* If the module has Context and Navigation, this hook will navigate when the context changes
|
|
@@ -22,7 +35,7 @@ export const useAppContextNavigation = () => {
|
|
|
22
35
|
(_a = context === null || context === void 0 ? void 0 : context.currentContext$) !== null && _a !== void 0 ? _a : EMPTY,
|
|
23
36
|
// when the context changes, navigate to the new context
|
|
24
37
|
useCallback((item) => {
|
|
25
|
-
var _a, _b
|
|
38
|
+
var _a, _b;
|
|
26
39
|
// sanity check, if the item or navigation is undefined, early return
|
|
27
40
|
if (item === undefined || navigation === undefined) {
|
|
28
41
|
return;
|
|
@@ -47,20 +60,11 @@ export const useAppContextNavigation = () => {
|
|
|
47
60
|
}
|
|
48
61
|
return;
|
|
49
62
|
}
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
? // context id exists in the url, replace it with the new context id
|
|
56
|
-
((_d = (_c = context === null || context === void 0 ? void 0 : context.generatePathFromContext) === null || _c === void 0 ? void 0 : _c.call(context, item, currentPathname)) !== null && _d !== void 0 ? _d : currentPathname.replace(pathContextId, item.id))
|
|
57
|
-
: // context was cleared, set the path to the root
|
|
58
|
-
'/'
|
|
59
|
-
: // could not find context id in the url, set the path to the new context id
|
|
60
|
-
`/${item === null || item === void 0 ? void 0 : item.id}`;
|
|
61
|
-
console.debug('🌍 Portal:', "context changed, navigating to app's context url:", pathContextId
|
|
62
|
-
? `found context id [${pathContextId}] in url, ${item ? `replacing with [${item.id}]` : 'context was cleared, navigating to root'}`
|
|
63
|
-
: `could not find context id in url, navigating to context id [${item ? item.id : 'root'}]`);
|
|
63
|
+
if (item === undefined) {
|
|
64
|
+
// no-op
|
|
65
|
+
return;
|
|
66
|
+
}
|
|
67
|
+
const pathname = generatePathname(currentPathname, item, context, (_b = (_a = context === null || context === void 0 ? void 0 : context.extractContextIdFromPath) === null || _a === void 0 ? void 0 : _a.call(context, currentPathname)) !== null && _b !== void 0 ? _b : extractContextIdFromPath(currentPathname));
|
|
64
68
|
// if app has its own navigation, use it to navigate
|
|
65
69
|
if (appNavigation) {
|
|
66
70
|
// update the path of the app navigation, preserving search and hash
|
|
@@ -75,6 +79,7 @@ export const useAppContextNavigation = () => {
|
|
|
75
79
|
navigation,
|
|
76
80
|
// application navigation instance, may change when the application changes
|
|
77
81
|
appNavigation,
|
|
82
|
+
context,
|
|
78
83
|
]));
|
|
79
84
|
};
|
|
80
85
|
//# sourceMappingURL=useAppContextNavigation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAppContextNavigation.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/useAppContextNavigation.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAEpC,OAAO,EAAE,oBAAoB,EAAE,MAAM,qCAAqC,CAAC;
|
|
1
|
+
{"version":3,"file":"useAppContextNavigation.js","sourceRoot":"","sources":["../../../src/bin/dev-portal/useAppContextNavigation.ts"],"names":[],"mappings":"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"}
|