@equinor/fusion-framework-react 1.1.0 → 1.3.0

package/dist/types/app/index.d.ts

@@ -0,0 +1,7 @@
+export type { AppConfig, AppManifest, AppType } from '@equinor/fusion-framework-module-app';
+export { useApp } from './useApp';
+export { useApps } from './useApps';
+export { useCurrentApp } from './useCurrentApp';
+export { useCurrentAppChanged } from './useCurrentAppChanged';
+export { useAppConfig } from './useAppConfig';
+export { useAppEnv } from './useAppEnv';

package/dist/types/app/useApp.d.ts

@@ -0,0 +1,7 @@
+import { AppManifest } from '@equinor/fusion-framework-module-app';
+export declare const useApp: (appKey: string) => {
+    value: AppManifest | undefined;
+    error: Error | undefined;
+    isLoading: boolean;
+};
+export default useApp;

package/dist/types/app/useAppConfig.d.ts

@@ -0,0 +1,10 @@
+import { AppConfig } from '@equinor/fusion-framework-module-app';
+declare type UseAppConfigState<TType> = {
+    value?: AppConfig<TType>;
+    error?: Error;
+    isLoading: boolean;
+};
+export declare const useAppConfig: <TType>(args: {
+    appKey: string | undefined;
+}) => UseAppConfigState<TType>;
+export default useAppConfig;

package/dist/types/app/useAppEnv.d.ts

@@ -0,0 +1,7 @@
+import { useApp } from './useApp';
+export declare const useAppEnv: (appKey: string) => {
+    manifest: import("@equinor/fusion-framework-module-app").AppManifest | undefined;
+    config: import("@equinor/fusion-framework-module-app").AppConfig<unknown> | undefined;
+    isLoading: boolean;
+};
+export default useApp;

package/dist/types/app/useApps.d.ts

@@ -0,0 +1,7 @@
+import { AppManifest } from '@equinor/fusion-framework-module-app';
+export declare const useApps: () => {
+    value: AppManifest[] | undefined;
+    error: Error | undefined;
+    isLoading: boolean;
+};
+export default useApps;

package/dist/types/app/useCurrentApp.d.ts

@@ -0,0 +1,5 @@
+export declare const useCurrentApp: () => {
+    currentApp: import("@equinor/fusion-framework-module-app").AppManifest | undefined;
+    setCurrentApp: (appKey: string) => void;
+};
+export default useCurrentApp;

package/dist/types/app/useCurrentAppChanged.d.ts

@@ -0,0 +1,3 @@
+import { FrameworkEventMap } from '@equinor/fusion-framework-module-event';
+export declare const useCurrentAppChanged: (cb: (e: FrameworkEventMap['onCurrentAppChanged']) => Promise<void> | void) => void;
+export default useCurrentAppChanged;

package/dist/types/context/index.d.ts

@@ -0,0 +1,2 @@
+export * from '@equinor/fusion-framework-react-module-context';
+export { useCurrentContext } from './useCurrentContext';

package/dist/types/context/useCurrentContext.d.ts

@@ -0,0 +1,5 @@
+export declare const useCurrentContext: () => {
+    currentContext: import("@equinor/fusion-framework-react-module-context").ContextItem<Record<string, unknown>> | undefined;
+    setCurrentContext: (entry: import("@equinor/fusion-framework-react-module-context").ContextItem<Record<string, unknown>>) => void;
+};
+export default useCurrentContext;

package/dist/types/index.d.ts

@@ -2,4 +2,5 @@ export type { Fusion } from '@equinor/fusion-framework';
 export { FusionConfigurator } from '@equinor/fusion-framework';
 export { createFrameworkProvider } from './create-framework-provider';
 export { FrameworkProvider } from './context';
+export { useFramework } from './useFramework';
 export { default, Framework } from './Framework';

package/dist/types/useFramework.d.ts

@@ -0,0 +1,4 @@
+import type { Fusion } from '@equinor/fusion-framework';
+import type { AnyModule } from '@equinor/fusion-framework-module';
+export declare const useFramework: <TModules extends AnyModule[] = []>() => Fusion<TModules>;
+export default useFramework;

package/package.json

@@ -1,16 +1,24 @@
 {
     "name": "@equinor/fusion-framework-react",
-    "version": "1.1.0",
+    "version": "1.3.0",
     "description": "",
     "main": "dist/esm/index.js",
     "exports": {
         ".": "./dist/esm/index.js",
+        "./app": "./dist/esm/app/index.js",
+        "./context": "./dist/esm/context/index.js",
         "./hooks": "./dist/esm/hooks/index.js",
         "./http": "./dist/esm/http/index.js"
     },
     "types": "dist/types/index.d.ts",
     "typesVersions": {
         "*": {
+            "app": [
+                "dist/types/app/index.d.ts"
+            ],
+            "context": [
+                "dist/types/context/index.d.ts"
+            ],
             "hooks": [
                 "dist/types/hooks/index.d.ts"
             ],
@@ -35,8 +43,10 @@
         "directory": "packages/react"
     },
     "dependencies": {
-        "@equinor/fusion-framework": "^4.0.16",
-        "@equinor/fusion-framework-react-module-http": "^1.0.14"
+        "@equinor/fusion-framework": "^4.2.0",
+        "@equinor/fusion-framework-react-module-context": "^0.1.0",
+        "@equinor/fusion-framework-react-module-http": "^1.0.15",
+        "rxjs": "^7.5.7"
     },
     "devDependencies": {
         "@types/react": "^17.0.11",
@@ -58,5 +68,5 @@
             "optional": true
         }
     },
-    "gitHead": "3506d6ea39362a9fb2764ac764fe8356fda0de01"
+    "gitHead": "21ae1ec0a760c03a0887eced5532de8443274916"
 }

package/src/app/index.ts

@@ -0,0 +1,8 @@
+export type { AppConfig, AppManifest, AppType } from '@equinor/fusion-framework-module-app';
+
+export { useApp } from './useApp';
+export { useApps } from './useApps';
+export { useCurrentApp } from './useCurrentApp';
+export { useCurrentAppChanged } from './useCurrentAppChanged';
+export { useAppConfig } from './useAppConfig';
+export { useAppEnv } from './useAppEnv';

package/src/app/useApp.ts

@@ -0,0 +1,26 @@
+import { useEffect, useState } from 'react';
+import { AppManifest } from '@equinor/fusion-framework-module-app';
+import { useFramework } from '../hooks';
+
+export const useApp = (appKey: string) => {
+    const provider = useFramework().modules.app;
+    const [value, setValue] = useState<AppManifest | undefined>(undefined);
+    const [error, setError] = useState<Error | undefined>();
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+
+    useEffect(() => {
+        setIsLoading(true);
+        const request = provider.getApp(appKey).subscribe({
+            next: (value) => setValue(value),
+            error: (err) => setError(err),
+            complete: () => setIsLoading(false),
+        });
+        return () => {
+            setIsLoading(false);
+            request.unsubscribe();
+        };
+    }, [provider, setValue, setError, setIsLoading, appKey]);
+    return { value, error, isLoading };
+};
+
+export default useApp;

package/src/app/useAppConfig.ts

@@ -0,0 +1,43 @@
+import { useEffect, useState } from 'react';
+import { AppConfig } from '@equinor/fusion-framework-module-app';
+
+import { useFramework } from '../hooks';
+
+type UseAppConfigState<TType> = {
+    value?: AppConfig<TType>;
+    error?: Error;
+    isLoading: boolean;
+};
+
+export const useAppConfig = <TType>(args: {
+    appKey: string | undefined;
+}): UseAppConfigState<TType> => {
+    const { appKey } = args;
+    const provider = useFramework().modules.app;
+    const [value, setValue] = useState<AppConfig<TType> | undefined>();
+    const [error, setError] = useState<Error | undefined>();
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+
+    useEffect(() => {
+        setValue(undefined);
+    }, [setValue, appKey]);
+
+    useEffect(() => {
+        if (!appKey) {
+            return;
+        }
+        setIsLoading(true);
+        const request = provider.getAppConfig<TType>(appKey).subscribe({
+            next: (value) => setValue(value),
+            error: (err) => setError(err),
+            complete: () => setIsLoading(false),
+        });
+        return () => {
+            setIsLoading(false);
+            request.unsubscribe();
+        };
+    }, [provider, setValue, setError, setIsLoading, appKey]);
+    return { value, error, isLoading };
+};
+
+export default useAppConfig;

package/src/app/useAppEnv.ts

@@ -0,0 +1,11 @@
+import { useApp } from './useApp';
+import { useAppConfig } from './useAppConfig';
+
+export const useAppEnv = (appKey: string) => {
+    const { value: manifest, isLoading: manifestLoading } = useApp(appKey);
+    const { value: config, isLoading: configLoading } = useAppConfig({ appKey });
+
+    return { manifest, config, isLoading: manifestLoading || configLoading };
+};
+
+export default useApp;

package/src/app/useApps.ts

@@ -0,0 +1,26 @@
+import { AppManifest } from '@equinor/fusion-framework-module-app';
+import { useEffect, useState } from 'react';
+import { useFramework } from '../hooks';
+
+export const useApps = () => {
+    const provider = useFramework().modules.app;
+    const [value, setValue] = useState<AppManifest[] | undefined>(undefined);
+    const [error, setError] = useState<Error | undefined>();
+    const [isLoading, setIsLoading] = useState<boolean>(false);
+
+    useEffect(() => {
+        setIsLoading(true);
+        const request = provider.getAllApps().subscribe({
+            next: (value) => setValue(value),
+            error: (err) => setError(err),
+            complete: () => setIsLoading(false),
+        });
+        return () => {
+            setIsLoading(false);
+            request.unsubscribe();
+        };
+    }, [provider, setValue, setError, setIsLoading]);
+    return { value, error, isLoading };
+};
+
+export default useApps;

package/src/app/useCurrentApp.ts

@@ -0,0 +1,19 @@
+import { useObservableState } from '@equinor/fusion-observable/react';
+import { useCallback } from 'react';
+
+import { useFramework } from '../hooks/use-framework';
+
+export const useCurrentApp = () => {
+    const provider = useFramework().modules.app;
+    const currentApp = useObservableState(provider.current$);
+    const setCurrentApp = useCallback(
+        (appKey: string) => provider.setCurrentApp(appKey),
+        [provider]
+    );
+    return {
+        currentApp,
+        setCurrentApp,
+    };
+};
+
+export default useCurrentApp;

package/src/app/useCurrentAppChanged.ts

@@ -0,0 +1,12 @@
+import { FrameworkEventMap } from '@equinor/fusion-framework-module-event';
+import { useEffect } from 'react';
+import { useFramework } from '../hooks/use-framework';
+
+export const useCurrentAppChanged = (
+    cb: (e: FrameworkEventMap['onCurrentAppChanged']) => Promise<void> | void
+) => {
+    const { event } = useFramework().modules;
+    useEffect(() => event.addEventListener('onCurrentAppChanged', cb), [event, cb]);
+};
+
+export default useCurrentAppChanged;

package/src/context/index.ts

@@ -0,0 +1,3 @@
+export * from '@equinor/fusion-framework-react-module-context';
+
+export { useCurrentContext } from './useCurrentContext';

package/src/context/useCurrentContext.ts

@@ -0,0 +1,6 @@
+import { useCurrentContext as _useCurrentContext } from '@equinor/fusion-framework-react-module-context';
+import { useFramework } from '../useFramework';
+
+export const useCurrentContext = () => _useCurrentContext(useFramework().modules.context);
+
+export default useCurrentContext;

package/src/hooks/use-framework.ts

@@ -1,25 +1,18 @@
 import type { Fusion } from '@equinor/fusion-framework';
 import type { AnyModule } from '@equinor/fusion-framework-module';
 
-import { useContext } from 'react';
-import { context } from '../context';
+import _useFramework from '../useFramework';
+
+// TODO - remove next major!
+
 /**
- * @example
+ * @deprecated
+ *
  * ```ts
- * const useSometing = () => {
- *  const fusion = useFramework();
- *  return fusion.something;
- * }
+ * import { useFramework } from '@equinor/fusion-framework';
  * ```
  */
 export const useFramework = <TModules extends Array<AnyModule> = []>(): Fusion<TModules> => {
-    let framework = useContext(context);
-    if (!framework) {
-        console.warn('could not locate fusion in context!');
-    }
-    framework ??= window.Fusion;
-    if (!framework) {
-        console.error('Could not load framework, might not be initiated?');
-    }
-    return framework;
+    console.warn('@deprecated', 'import { useFramework } from @equinor/fusion-framework');
+    return _useFramework();
 };

package/src/index.tsx

@@ -9,4 +9,6 @@ export { FusionConfigurator } from '@equinor/fusion-framework';
 export { createFrameworkProvider } from './create-framework-provider';
 export { FrameworkProvider } from './context';
 
+export { useFramework } from './useFramework';
+
 export { default, Framework } from './Framework';

package/src/useFramework.ts

@@ -0,0 +1,27 @@
+import type { Fusion } from '@equinor/fusion-framework';
+import type { AnyModule } from '@equinor/fusion-framework-module';
+
+import { useContext } from 'react';
+import { context } from './context';
+/**
+ * @example
+ * ```ts
+ * const useSometing = () => {
+ *  const fusion = useFramework();
+ *  return fusion.something;
+ * }
+ * ```
+ */
+export const useFramework = <TModules extends Array<AnyModule> = []>(): Fusion<TModules> => {
+    let framework = useContext(context);
+    if (!framework) {
+        console.warn('could not locate fusion in context!');
+    }
+    framework ??= window.Fusion;
+    if (!framework) {
+        console.error('Could not load framework, might not be initiated?');
+    }
+    return framework;
+};
+
+export default useFramework;

package/tsconfig.json

@@ -10,6 +10,15 @@
   "references": [
     {
       "path": "../framework"
+    },
+    {
+      "path": "../module-app"
+    },
+    {
+      "path": "../module-context"
+    },
+    {
+      "path": "../react-module-context"
     }
   ],
   "include": [