@equinor/fusion-framework-module-app
Advanced tools
Comparing version 6.0.0-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598 to 6.0.0-alpha-dep-8ca2072f748f36baccdefa6e0d6544f474e92730
# Change Log | ||
## 6.0.0-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598 | ||
## 6.0.0-alpha-dep-8ca2072f748f36baccdefa6e0d6544f474e92730 | ||
### Major Changes | ||
- [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`dbdccb0`](https://github.com/equinor/fusion-framework/commit/dbdccb0c8878b59a6f5f2d404b3daf8f2b138ea6) Thanks [@eikeland](https://github.com/eikeland)! - Adjusted module to the new app service API. | ||
- [#2178](https://github.com/equinor/fusion-framework/pull/2178) [`c5d0818`](https://github.com/equinor/fusion-framework/commit/c5d0818df9793ac4d8a2aed2a07cf359d909d522) Thanks [@eikeland](https://github.com/eikeland)! - Adjusted module to the new app service API. | ||
@@ -21,2 +21,3 @@ > [!WARNING] | ||
- Modified `AppConfigurator` to utilize `AppClient` for client configuration. | ||
- Updated `useApps` hook with new input parameter for `filterByCurrentUser` in `fusion-framework-react`. | ||
@@ -23,0 +24,0 @@ **Migration** |
@@ -66,3 +66,3 @@ import { from, of, concat } from 'rxjs'; | ||
switchMap(({ payload }) => { | ||
const endpoint = [provider.getBaseUri(), payload].join('/').replace(/\/{2,}/g, '/'); | ||
const endpoint = [provider.assetUri, payload].join('/').replace(/\/{2,}/g, '/'); | ||
// dynamically import the application script | ||
@@ -69,0 +69,0 @@ return from(import(/* @vite-ignore */ endpoint)).pipe( |
@@ -42,5 +42,5 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) { | ||
// TODO - explain why, used in import of resources aka proxy url | ||
setBaseUri(base_or_cb) { | ||
setAssetUri(base_or_cb) { | ||
const cb = typeof base_or_cb === 'string' ? () => __awaiter(this, void 0, void 0, function* () { return base_or_cb; }) : base_or_cb; | ||
this._set('baseUri', cb); | ||
this._set('assetUri', cb); | ||
} | ||
@@ -55,4 +55,4 @@ _createConfig(init, initial) { | ||
} | ||
if (!this._has('baseUri')) { | ||
this.setBaseUri('/apps-proxy'); | ||
if (!this._has('assetUri')) { | ||
this.setAssetUri('/apps-proxy'); | ||
} | ||
@@ -59,0 +59,0 @@ return super._createConfig(init, initial); |
@@ -48,3 +48,3 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) { | ||
__classPrivateFieldSet(this, _AppModuleProvider_current$, new BehaviorSubject(undefined), "f"); | ||
__classPrivateFieldSet(this, _AppModuleProvider_appBaseUri, (_a = config.baseUri) !== null && _a !== void 0 ? _a : '', "f"); | ||
__classPrivateFieldSet(this, _AppModuleProvider_appBaseUri, (_a = config.assetUri) !== null && _a !== void 0 ? _a : '', "f"); | ||
__classPrivateFieldGet(this, _AppModuleProvider_subscription, "f").add(this.current$ | ||
@@ -97,3 +97,3 @@ .pipe(pairwise(), takeWhile(() => !!event)) | ||
} | ||
getBaseUri() { | ||
get assetUri() { | ||
return __classPrivateFieldGet(this, _AppModuleProvider_appBaseUri, "f"); | ||
@@ -100,0 +100,0 @@ } |
@@ -7,7 +7,7 @@ import { BaseConfigBuilder, ConfigBuilderCallback, type ModuleInitializerArgs } from '@equinor/fusion-framework-module'; | ||
client: IAppClient; | ||
baseUri?: string; | ||
assetUri?: string; | ||
} | ||
export interface IAppConfigurator { | ||
setClient: (client_or_cb: Promise<AppModuleConfig['client']> | ConfigBuilderCallback<AppModuleConfig['client']>) => void; | ||
setBaseUri: (base_or_cb: string | ConfigBuilderCallback<string>) => void; | ||
setAssetUri: (base_or_cb: string | ConfigBuilderCallback<string>) => void; | ||
} | ||
@@ -21,4 +21,4 @@ export declare class AppConfigurator extends BaseConfigBuilder<AppModuleConfig> implements IAppConfigurator { | ||
setClient(client_or_cb: Promise<AppModuleConfig['client']> | ConfigBuilderCallback<AppModuleConfig['client']>): void; | ||
setBaseUri(base_or_cb: string | ConfigBuilderCallback<string>): void; | ||
setAssetUri(base_or_cb: string | ConfigBuilderCallback<string>): void; | ||
protected _createConfig(init: ModuleInitializerArgs<IAppConfigurator, [HttpModule, ServiceDiscoveryModule]>, initial?: Partial<AppModuleConfig>): import("rxjs").ObservableInput<AppModuleConfig>; | ||
} |
@@ -48,3 +48,3 @@ import { Observable } from 'rxjs'; | ||
clearCurrentApp(): void; | ||
getBaseUri(): string; | ||
get assetUri(): string; | ||
/** | ||
@@ -51,0 +51,0 @@ * This should not be used, only for legacy creation backdoor |
{ | ||
"name": "@equinor/fusion-framework-module-app", | ||
"version": "6.0.0-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598", | ||
"version": "6.0.0-alpha-dep-8ca2072f748f36baccdefa6e0d6544f474e92730", | ||
"description": "", | ||
@@ -60,7 +60,7 @@ "main": "dist/esm/index.js", | ||
"typescript": "^5.5.4", | ||
"@equinor/fusion-framework-module": "^4.3.5-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598", | ||
"@equinor/fusion-framework-module-event": "^4.2.4-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598", | ||
"@equinor/fusion-framework-module-http": "^6.1.0-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598", | ||
"@equinor/fusion-framework-module-msal": "^3.1.5-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598", | ||
"@equinor/fusion-framework-module-service-discovery": "^8.0.0-alpha-8601e3ca5d5b2d11057913cdfc04bbc5e908a598" | ||
"@equinor/fusion-framework-module": "^4.3.5", | ||
"@equinor/fusion-framework-module-event": "^4.2.4", | ||
"@equinor/fusion-framework-module-http": "^6.1.0", | ||
"@equinor/fusion-framework-module-msal": "^3.1.5", | ||
"@equinor/fusion-framework-module-service-discovery": "^8.0.0" | ||
}, | ||
@@ -67,0 +67,0 @@ "scripts": { |
@@ -108,3 +108,3 @@ import { from, of, concat } from 'rxjs'; | ||
switchMap(({ payload }) => { | ||
const endpoint = [provider.getBaseUri(), payload].join('/').replace(/\/{2,}/g, '/'); | ||
const endpoint = [provider.assetUri, payload].join('/').replace(/\/{2,}/g, '/'); | ||
// dynamically import the application script | ||
@@ -111,0 +111,0 @@ return from(import(/* @vite-ignore */ endpoint)).pipe( |
@@ -15,3 +15,4 @@ import { | ||
client: IAppClient; | ||
baseUri?: string; | ||
// uri which to fetch the assets from aka the bundle of the application | ||
assetUri?: string; | ||
} | ||
@@ -25,3 +26,3 @@ | ||
) => void; | ||
setBaseUri: (base_or_cb: string | ConfigBuilderCallback<string>) => void; | ||
setAssetUri: (base_or_cb: string | ConfigBuilderCallback<string>) => void; | ||
} | ||
@@ -65,5 +66,5 @@ | ||
// TODO - explain why, used in import of resources aka proxy url | ||
public setBaseUri(base_or_cb: string | ConfigBuilderCallback<string>) { | ||
public setAssetUri(base_or_cb: string | ConfigBuilderCallback<string>) { | ||
const cb = typeof base_or_cb === 'string' ? async () => base_or_cb : base_or_cb; | ||
this._set('baseUri', cb); | ||
this._set('assetUri', cb); | ||
} | ||
@@ -83,4 +84,4 @@ | ||
if (!this._has('baseUri')) { | ||
this.setBaseUri('/apps-proxy'); | ||
if (!this._has('assetUri')) { | ||
this.setAssetUri('/apps-proxy'); | ||
} | ||
@@ -87,0 +88,0 @@ |
@@ -67,3 +67,3 @@ import { | ||
this.#appBaseUri = config.baseUri ?? ''; | ||
this.#appBaseUri = config.assetUri ?? ''; | ||
@@ -140,3 +140,3 @@ this.#subscription.add( | ||
public getBaseUri(): string { | ||
public get assetUri(): string { | ||
return this.#appBaseUri; | ||
@@ -143,0 +143,0 @@ } |
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
Sorry, the diff of this file is not supported yet
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
4192
384586