@equinor/fusion-framework-react 7.2.1 → 7.2.2-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e

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

@@ -1,13 +1,17 @@
-import { AppManifest } from '@equinor/fusion-framework-module-app';
+import { ApplicationManifest } from '@equinor/fusion-framework-module-app';
+type UseAppsArgs = {
+    /** @deprecated - no longer available */
+    includeHidden?: boolean;
+    filterByCurrentUser?: boolean;
+};
 /**
  * React Hook - Get apps from framework
- * @param args Object with boolean  member includeHidden
- * @returns Object {apps, isLoading} where apps is Array of AppManifest, isLoading is a boolean on observable complete
+ * @param args Object with filterByCurrentUser: boolean
+ * @returns Object {apps, isLoading, error} where apps is Array of ApplicationManifest, isLoading is a boolean on observable complete
+ * @since 7.1.1
  */
-export declare const useApps: (args?: {
-    includeHidden: boolean;
-}) => {
-    apps: AppManifest[] | undefined;
+export declare const useApps: (args?: UseAppsArgs) => {
+    apps: ApplicationManifest[] | undefined;
     isLoading: boolean;
     error: unknown;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@equinor/fusion-framework-react",
-  "version": "7.2.1",
+  "version": "7.2.2-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
   "description": "",
   "main": "dist/esm/index.js",
   "exports": {
@@ -69,11 +69,11 @@
   },
   "dependencies": {
     "rxjs": "^7.8.1",
-    "@equinor/fusion-framework": "^7.2.6",
-    "@equinor/fusion-framework-react-module": "^3.1.5",
-    "@equinor/fusion-framework-module": "^4.3.4",
-    "@equinor/fusion-observable": "^8.4.1",
-    "@equinor/fusion-framework-react-module-http": "^6.0.3"
+    "@equinor/fusion-framework": "^7.2.7-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-module": "^4.3.5-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-react-module": "^3.1.6-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-react-module-http": "^7.0.0-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-observable": "^8.4.1"
   },
   "devDependencies": {
     "@types/react": "^18.2.50",
@@ -81,17 +81,17 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "^5.5.4",
-    "@equinor/fusion-framework-module-feature-flag": "^1.1.8",
     "@equinor/fusion-framework-module-app": "^5.3.11",
-    "@equinor/fusion-framework-module-event": "^4.2.3",
-    "@equinor/fusion-framework-react-module-context": "^6.2.12"
+    "@equinor/fusion-framework-module-feature-flag": "^1.1.9-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-module-event": "^4.2.4-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-react-module-context": "^6.2.13-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e"
   },
   "peerDependencies": {
     "@types/react": "^17.0.0 || ^18.0.0",
     "react": "^17.0.0 || ^18.0.0",
     "react-dom": "^17.0.0 || ^18.0.0",
-    "@equinor/fusion-framework-react-module-signalr": "^3.0.14",
-    "@equinor/fusion-framework-module-feature-flag": "^1.1.8"
+    "@equinor/fusion-framework-module-feature-flag": "^1.1.9-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e",
+    "@equinor/fusion-framework-react-module-signalr": "^3.0.15-alpha-afdec66178b3cac96597125945ba7e1b4ca2ca7e"
   },
   "peerDependenciesMeta": {
     "@equinor/fusion-framework-module-event": {

package/src/app/useApps.ts

@@ -1,30 +1,40 @@
-import { AppManifest } from '@equinor/fusion-framework-module-app';
+import { ApplicationManifest } from '@equinor/fusion-framework-module-app';
 import { useObservableState } from '@equinor/fusion-observable/react';
 import { useMemo } from 'react';
 
 import { useAppProvider } from './useAppProvider';
 
+type UseAppsArgs = {
+    /** @deprecated - no longer available */
+    includeHidden?: boolean;
+    // only show apps that the current user has access to
+    filterByCurrentUser?: boolean;
+};
+
 /**
  * React Hook - Get apps from framework
- * @param args Object with boolean  member includeHidden
- * @returns Object {apps, isLoading} where apps is Array of AppManifest, isLoading is a boolean on observable complete
+ * @param args Object with filterByCurrentUser: boolean
+ * @returns Object {apps, isLoading, error} where apps is Array of ApplicationManifest, isLoading is a boolean on observable complete
+ * @since 7.1.1
  */
-export const useApps = (args?: {
-    includeHidden: boolean;
-}): { apps: AppManifest[] | undefined; isLoading: boolean; error: unknown } => {
+export const useApps = (
+    args?: UseAppsArgs,
+): { apps: ApplicationManifest[] | undefined; isLoading: boolean; error: unknown } => {
     const provider = useAppProvider();
+
+    const { filterByCurrentUser } = args || {};
+
     const {
-        value: manifests,
+        value: apps,
         complete,
         error,
-    } = useObservableState(useMemo(() => provider.getAllAppManifests(), [provider]));
-
-    const apps = useMemo(() => {
-        if (manifests && !args?.includeHidden) {
-            return manifests.filter((app) => !app.hide);
-        }
-        return manifests;
-    }, [args, manifests]);
+    } = useObservableState(
+        useMemo(
+            () =>
+                provider.getAppManifests(filterByCurrentUser ? { filterByCurrentUser } : undefined),
+            [provider, filterByCurrentUser],
+        ),
+    );
 
     return { apps, isLoading: !complete, error };
 };