@j2inn/fin5-ui-utils 6.0.5 → 7.0.0

package/dist/fin5Top/fin5Top.d.ts

@@ -3,7 +3,7 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
 export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
 export declare const fin5Top: Fin5Top | null;
 export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
-export interface Fin5Top {
+export interface Fin5Top extends Window {
     app: Fin5App;
     languageManager: LanguageManager;
     finstack?: {

package/dist/react/app/Fin5AppContainer.js

@@ -49,6 +49,22 @@ const getServiceUrl = ({ origin, path }) => `${origin}/${PATH_PREFIX}/api/${path
 const getOpUrl = ({ origin, project, op }) => `${origin}/api/${project}/${op}`;
 const getHaystackServiceUrl = ({ origin, project, path, }) => `${origin}/${PATH_PREFIX}/api/haystack${project ? `/${project}` : ''}/${path}`;
 const getHostServiceUrl = ({ origin, path, }) => `${origin}/${PATH_PREFIX}/api/host/${path}`;
+/**
+ * Runtime type guard that checks whether a store instance
+ * exposes a boolean `initialized` flag.
+ *
+ * @param {AppStore | null | undefined} appStore - The store instance to test
+ * @returns {appStore is AppStore & { initialized: boolean }} True if `appStore` has a boolean `initialized` property
+ *
+ * @remarks
+ * To use the FINX onMessage feature, ensure the concrete store declares `initialized` ahead of time,
+ * and set to true when children components have fully rendered.
+ */
+function hasInitialized(appStore) {
+    return (!!appStore &&
+        'initialized' in appStore &&
+        typeof appStore.initialized === 'boolean');
+}
 /**
  * Creates a basic application container environment to run a view in FIN5.
  */
@@ -67,6 +83,9 @@ exports.Fin5AppContainer = (0, mobx_react_lite_1.observer)(({ children, appStore
     }
     const target = fin5Top_1.fin5Top?.app?.TargetRef?.() || '';
     rootStore.target = target ? haystack_core_1.HRef.make(target).value : '';
+    const initialized = hasInitialized(appStore)
+        ? appStore.initialized
+        : false;
     const getClient = () => client ??
         new haystack_nclient_1.Client({
             base: new URL(window.location.href),
@@ -92,6 +111,30 @@ exports.Fin5AppContainer = (0, mobx_react_lite_1.observer)(({ children, appStore
             setLoading(false);
         });
     }, [client, containerProject]);
+    (0, react_1.useEffect)(() => {
+        const onMessage = (event) => {
+            if (fin5Top_1.fin5Top?.location.origin === event.origin &&
+                appStore?.onMessage) {
+                appStore.onMessage({
+                    message: event.data.message,
+                    params: event.data,
+                    client: getClient(),
+                    appRootStore: rootStore,
+                });
+            }
+        };
+        window.addEventListener('message', onMessage);
+        return () => window.removeEventListener('message', onMessage);
+    }, []);
+    (0, react_1.useEffect)(() => {
+        // tell the top level app its ready
+        if (initialized) {
+            fin5Top_1.fin5Top?.postMessage({
+                kind: 'iframeApp',
+                loading: false,
+            });
+        }
+    }, [initialized]);
     return (react_1.default.createElement(app_react_1.AppRootStoreContext.Provider, { value: rootStore },
         react_1.default.createElement(app_react_1.AppStoreContext.Provider, { value: appStore },
             react_1.default.createElement(haystack_react_1.ClientContext.Provider, { value: containerClient },

package/dist/react/app/Fin5AppContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}

package/dist/react/app/Fin5AppRootStore.d.ts

@@ -1,4 +1,4 @@
-import { App, AppAccessLevel, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
+import { App, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
 import { HDict } from 'haystack-core';
 /**
  * An application root store for use with FIN5.
@@ -28,13 +28,13 @@ export declare class Fin5AppRootStore implements AppRootStore {
     readonly historySidebar: CustomHistory;
     constructor();
     openAppInNewWindow(): void;
-    open(): void;
+    open(appId: string, state?: Record<string, unknown>): void;
     openSidebar(): void;
     postAppMessage(): void;
     registerSidebars(): void;
     unregisterSidebars(): void;
     registerQuicklinks(): void;
     unregisterQuicklinks(): void;
-    hasAppAccess: (_: string, access: AppAccessLevel) => boolean;
+    hasAppAccess: (appId: string) => boolean;
     hasSidebar(): boolean;
 }

package/dist/react/app/Fin5AppRootStore.js

@@ -48,19 +48,40 @@ class Fin5AppRootStore {
         });
     }
     openAppInNewWindow() { }
-    open() { }
+    open(appId, state) {
+        if (this.hasAppAccess(appId)) {
+            if (state) {
+                this.history.pushState(state);
+            }
+        }
+    }
     openSidebar() { }
     postAppMessage() { }
     registerSidebars() { }
     unregisterSidebars() { }
     registerQuicklinks() { }
     unregisterQuicklinks() { }
-    hasAppAccess = (_, access) => {
+    hasAppAccess = (appId) => {
         // For FIN5, an operator only has readonly app level access.
         const user = this.currentUser;
-        return user?.get('userRole')?.value === 'op'
-            ? access === 'read'
-            : !!user;
+        if (user) {
+            if (!user.has('userRole')) {
+                return false;
+            }
+            if (user.get('userRole')?.value === 'su') {
+                return true;
+            }
+            // if no appAccess is present, then all apps are granted
+            if (user.has('appAccess')) {
+                const appAccess = user.get('appAccess')?.value;
+                const apps = appAccess?.split(',');
+                return apps?.includes(appId) ?? false;
+            }
+            else {
+                return true;
+            }
+        }
+        return false;
     };
     hasSidebar() {
         return false;

package/dist/react/app/Fin5AppRootStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fin5AppRootStore.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppRootStore.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAYH,+BAAqD;AAErD;;GAEG;AACH,MAAa,gBAAgB;IAC5B,OAAO,GAAG,EAAE,CAAA;IACZ,WAAW,GAAG,KAAK,CAAA;IACnB,MAAM,GAAG,EAAE,CAAA;IACX,UAAU,GAAa,EAAE,CAAA;IACzB,MAAM,GAAG,EAAE,CAAA;IACX,aAAa,GAAG,EAAE,CAAA;IAClB,WAAW,CAAmB;IAC9B,IAAI,GAAG;QAGN,OAAO,SAAS,CAAA;IACjB,CAAC;IACD,IAAI,OAAO;QAGV,OAAO,SAAS,CAAA;IACjB,CAAC;IACQ,IAAI,GAAU,EAAE,CAAA;IAChB,OAAO,GAAkB;QACjC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;KACD,CAAA;IACQ,cAAc,GAAkB;QACxC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;KACD,CAAA;IAED;QACC,IAAA,yBAAkB,EAAC,IAAI,EAAE;YACxB,WAAW,EAAE,iBAAU,CAAC,GAAG;YAC3B,IAAI,EAAE,iBAAU,CAAC,GAAG;SACpB,CAAC,CAAA;IACH,CAAC;IAED,kBAAkB,KAAU,CAAC;IAC7B,IAAI,KAAU,CAAC;IACf,WAAW,KAAU,CAAC;IACtB,cAAc,KAAU,CAAC;IACzB,gBAAgB,KAAU,CAAC;IAC3B,kBAAkB,KAAU,CAAC;IAC7B,kBAAkB,KAAU,CAAC;IAC7B,oBAAoB,KAAU,CAAC;IAC/B,YAAY,GAAG,CAAC,CAAS,EAAE,MAAsB,EAAW,EAAE;QAC7D,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAA;QAE7B,OAAO,IAAI,EAAE,GAAG,CAAO,UAAU,CAAC,EAAE,KAAK,KAAK,IAAI;YACjD,CAAC,CAAC,MAAM,KAAK,MAAM;YACnB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACV,CAAC,CAAA;IACD,UAAU;QACT,OAAO,KAAK,CAAA;IACb,CAAC;CACD;AAhED,4CAgEC"}
+{"version":3,"file":"Fin5AppRootStore.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppRootStore.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAMH,+BAAqD;AAErD;;GAEG;AACH,MAAa,gBAAgB;IAC5B,OAAO,GAAG,EAAE,CAAA;IACZ,WAAW,GAAG,KAAK,CAAA;IACnB,MAAM,GAAG,EAAE,CAAA;IACX,UAAU,GAAa,EAAE,CAAA;IACzB,MAAM,GAAG,EAAE,CAAA;IACX,aAAa,GAAG,EAAE,CAAA;IAClB,WAAW,CAAmB;IAC9B,IAAI,GAAG;QAGN,OAAO,SAAS,CAAA;IACjB,CAAC;IACD,IAAI,OAAO;QAGV,OAAO,SAAS,CAAA;IACjB,CAAC;IACQ,IAAI,GAAU,EAAE,CAAA;IAChB,OAAO,GAAkB;QACjC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;KACD,CAAA;IACQ,cAAc,GAAkB;QACxC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;KACD,CAAA;IAED;QACC,IAAA,yBAAkB,EAAC,IAAI,EAAE;YACxB,WAAW,EAAE,iBAAU,CAAC,GAAG;YAC3B,IAAI,EAAE,iBAAU,CAAC,GAAG;SACpB,CAAC,CAAA;IACH,CAAC;IAED,kBAAkB,KAAU,CAAC;IAC7B,IAAI,CAAC,KAAa,EAAE,KAA+B;QAClD,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,KAAK,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;aAC7B;SACD;IACF,CAAC;IACD,WAAW,KAAU,CAAC;IACtB,cAAc,KAAU,CAAC;IACzB,gBAAgB,KAAU,CAAC;IAC3B,kBAAkB,KAAU,CAAC;IAC7B,kBAAkB,KAAU,CAAC;IAC7B,oBAAoB,KAAU,CAAC;IAC/B,YAAY,GAAG,CAAC,KAAa,EAAW,EAAE;QACzC,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAA;QAC7B,IAAI,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACZ;YAED,IAAI,IAAI,CAAC,GAAG,CAAO,UAAU,CAAC,EAAE,KAAK,KAAK,IAAI,EAAE;gBAC/C,OAAO,IAAI,CAAA;aACX;YAED,wDAAwD;YACxD,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAO,WAAW,CAAC,EAAE,KAAK,CAAA;gBACpD,MAAM,IAAI,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClC,OAAO,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;aACrC;iBAAM;gBACN,OAAO,IAAI,CAAA;aACX;SACD;QAED,OAAO,KAAK,CAAA;IACb,CAAC,CAAA;IACD,UAAU;QACT,OAAO,KAAK,CAAA;IACb,CAAC;CACD;AAtFD,4CAsFC"}

package/dist/react/hooks/useFin5ColorScheme.js

@@ -10,7 +10,20 @@ const fin5Top_1 = require("../../fin5Top/fin5Top");
 const react_1 = require("react");
 function useFin5ColorScheme() {
     const theme = (0, react_jss_1.useTheme)();
-    const colorScheme = (0, fin5Top_1.getFin5top)()?.app.GetColorScheme?.();
+    const fin5 = (0, fin5Top_1.getFin5top)();
+    const colorScheme = fin5?.app.GetColorScheme?.();
+    const currentTheme = fin5?.app.get('currentTheme');
+    const isDarkMode = currentTheme === 'dark';
+    if (isDarkMode && colorScheme) {
+        const primaryColor = fin5?.document
+            ?.querySelector('html.theme-dark .app-launcher .app-item.selected')
+            ?.computedStyleMap()
+            ?.get('background-color')
+            ?.toString();
+        if (primaryColor) {
+            colorScheme.primary = primaryColor;
+        }
+    }
     const brandedTheme = (0, react_1.useMemo)(() => {
         if (!colorScheme) {
             return undefined;
@@ -23,6 +36,8 @@ function useFin5ColorScheme() {
             },
             dark: {
                 ...ui_1.DEFAULT_THEME.dark,
+                textColor: (0, ui_1.tint)(colorScheme.bodyBackground, 100),
+                popupBgColor: colorScheme.bodyBackground,
                 bodyBg: colorScheme.bodyBackground,
                 bgColor: (0, ui_1.lighten)(colorScheme.bodyBackground, 5),
             },
@@ -38,13 +53,15 @@ function useFin5ColorScheme() {
         colorScheme?.bodyBackground,
         colorScheme?.sidebarBackground,
     ]);
-    if (brandedTheme && theme.type === 'light') {
-        return brandedTheme.light;
+    if (!brandedTheme) {
+        return theme;
     }
-    if (brandedTheme && theme.type === 'dark') {
+    if (isDarkMode) {
         return brandedTheme.dark;
     }
-    return theme;
+    else {
+        return brandedTheme.light;
+    }
 }
 exports.useFin5ColorScheme = useFin5ColorScheme;
 //# sourceMappingURL=useFin5ColorScheme.js.map

package/dist/react/hooks/useFin5ColorScheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,kCAOkB;AAClB,yCAAoC;AACpC,mDAAkD;AAClD,iCAA+B;AAE/B,SAAgB,kBAAkB;IACjC,MAAM,KAAK,GAAG,IAAA,oBAAQ,GAAY,CAAA;IAClC,MAAM,WAAW,GAAG,IAAA,oBAAU,GAAE,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,IAAA,kBAAa,EAAC;YACpB,KAAK,EAAE;gBACN,GAAG,kBAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,kBAAa,CAAC,IAAI;gBACrB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,kBAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,IAAA,UAAK,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC3C,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;IAED,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QAC1C,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;IAED,OAAO,KAAK,CAAA;AACb,CAAC;AAzCD,gDAyCC"}
+{"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AAEH,kCAOkB;AAClB,yCAAoC;AACpC,mDAAkD;AAClD,iCAA+B;AAE/B,SAAgB,kBAAkB;IACjC,MAAM,KAAK,GAAG,IAAA,oBAAQ,GAAY,CAAA;IAClC,MAAM,IAAI,GAAG,IAAA,oBAAU,GAAE,CAAA;IACzB,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IAChD,MAAM,YAAY,GAAG,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAA;IACvE,MAAM,UAAU,GAAG,YAAY,KAAK,MAAM,CAAA;IAC1C,IAAI,UAAU,IAAI,WAAW,EAAE;QAC9B,MAAM,YAAY,GAAG,IAAI,EAAE,QAAQ;YAClC,EAAE,aAAa,CAAC,kDAAkD,CAAC;YACnE,EAAE,gBAAgB,EAAE;YACpB,EAAE,GAAG,CAAC,kBAAkB,CAAC;YACzB,EAAE,QAAQ,EAAE,CAAA;QAEb,IAAI,YAAY,EAAE;YACjB,WAAW,CAAC,OAAO,GAAG,YAAY,CAAA;SAClC;KACD;IAED,MAAM,YAAY,GAAG,IAAA,eAAO,EAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,IAAA,kBAAa,EAAC;YACpB,KAAK,EAAE;gBACN,GAAG,kBAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,kBAAa,CAAC,IAAI;gBACrB,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC;gBAChD,YAAY,EAAE,WAAW,CAAC,cAAc;gBACxC,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,IAAA,YAAO,EAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,kBAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAA,SAAI,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,IAAA,UAAK,EAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,KAAK,CAAA;KACZ;IAED,IAAI,UAAU,EAAE;QACf,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;SAAM;QACN,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;AACF,CAAC;AA1DD,gDA0DC"}

package/dist_es/fin5Top/fin5Top.d.ts

@@ -3,7 +3,7 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
 export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
 export declare const fin5Top: Fin5Top | null;
 export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
-export interface Fin5Top {
+export interface Fin5Top extends Window {
     app: Fin5App;
     languageManager: LanguageManager;
     finstack?: {

package/dist_es/react/app/Fin5AppContainer.js

@@ -20,6 +20,22 @@ const getServiceUrl = ({ origin, path }) => `${origin}/${PATH_PREFIX}/api/${path
 const getOpUrl = ({ origin, project, op }) => `${origin}/api/${project}/${op}`;
 const getHaystackServiceUrl = ({ origin, project, path, }) => `${origin}/${PATH_PREFIX}/api/haystack${project ? `/${project}` : ''}/${path}`;
 const getHostServiceUrl = ({ origin, path, }) => `${origin}/${PATH_PREFIX}/api/host/${path}`;
+/**
+ * Runtime type guard that checks whether a store instance
+ * exposes a boolean `initialized` flag.
+ *
+ * @param {AppStore | null | undefined} appStore - The store instance to test
+ * @returns {appStore is AppStore & { initialized: boolean }} True if `appStore` has a boolean `initialized` property
+ *
+ * @remarks
+ * To use the FINX onMessage feature, ensure the concrete store declares `initialized` ahead of time,
+ * and set to true when children components have fully rendered.
+ */
+function hasInitialized(appStore) {
+    return (!!appStore &&
+        'initialized' in appStore &&
+        typeof appStore.initialized === 'boolean');
+}
 /**
  * Creates a basic application container environment to run a view in FIN5.
  */
@@ -38,6 +54,9 @@ export const Fin5AppContainer = observer(({ children, appStore, client, project,
     }
     const target = fin5Top?.app?.TargetRef?.() || '';
     rootStore.target = target ? HRef.make(target).value : '';
+    const initialized = hasInitialized(appStore)
+        ? appStore.initialized
+        : false;
     const getClient = () => client ??
         new Client({
             base: new URL(window.location.href),
@@ -63,6 +82,30 @@ export const Fin5AppContainer = observer(({ children, appStore, client, project,
             setLoading(false);
         });
     }, [client, containerProject]);
+    useEffect(() => {
+        const onMessage = (event) => {
+            if (fin5Top?.location.origin === event.origin &&
+                appStore?.onMessage) {
+                appStore.onMessage({
+                    message: event.data.message,
+                    params: event.data,
+                    client: getClient(),
+                    appRootStore: rootStore,
+                });
+            }
+        };
+        window.addEventListener('message', onMessage);
+        return () => window.removeEventListener('message', onMessage);
+    }, []);
+    useEffect(() => {
+        // tell the top level app its ready
+        if (initialized) {
+            fin5Top?.postMessage({
+                kind: 'iframeApp',
+                loading: false,
+            });
+        }
+    }, [initialized]);
     return (React.createElement(AppRootStoreContext.Provider, { value: rootStore },
         React.createElement(AppStoreContext.Provider, { value: appStore },
             React.createElement(ClientContext.Provider, { value: containerClient },

package/dist_es/react/app/Fin5AppContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}

package/dist_es/react/app/Fin5AppRootStore.d.ts

@@ -1,4 +1,4 @@
-import { App, AppAccessLevel, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
+import { App, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
 import { HDict } from 'haystack-core';
 /**
  * An application root store for use with FIN5.
@@ -28,13 +28,13 @@ export declare class Fin5AppRootStore implements AppRootStore {
     readonly historySidebar: CustomHistory;
     constructor();
     openAppInNewWindow(): void;
-    open(): void;
+    open(appId: string, state?: Record<string, unknown>): void;
     openSidebar(): void;
     postAppMessage(): void;
     registerSidebars(): void;
     unregisterSidebars(): void;
     registerQuicklinks(): void;
     unregisterQuicklinks(): void;
-    hasAppAccess: (_: string, access: AppAccessLevel) => boolean;
+    hasAppAccess: (appId: string) => boolean;
     hasSidebar(): boolean;
 }

package/dist_es/react/app/Fin5AppRootStore.js

@@ -45,19 +45,40 @@ export class Fin5AppRootStore {
         });
     }
     openAppInNewWindow() { }
-    open() { }
+    open(appId, state) {
+        if (this.hasAppAccess(appId)) {
+            if (state) {
+                this.history.pushState(state);
+            }
+        }
+    }
     openSidebar() { }
     postAppMessage() { }
     registerSidebars() { }
     unregisterSidebars() { }
     registerQuicklinks() { }
     unregisterQuicklinks() { }
-    hasAppAccess = (_, access) => {
+    hasAppAccess = (appId) => {
         // For FIN5, an operator only has readonly app level access.
         const user = this.currentUser;
-        return user?.get('userRole')?.value === 'op'
-            ? access === 'read'
-            : !!user;
+        if (user) {
+            if (!user.has('userRole')) {
+                return false;
+            }
+            if (user.get('userRole')?.value === 'su') {
+                return true;
+            }
+            // if no appAccess is present, then all apps are granted
+            if (user.has('appAccess')) {
+                const appAccess = user.get('appAccess')?.value;
+                const apps = appAccess?.split(',');
+                return apps?.includes(appId) ?? false;
+            }
+            else {
+                return true;
+            }
+        }
+        return false;
     };
     hasSidebar() {
         return false;

package/dist_es/react/app/Fin5AppRootStore.js.map

@@ -1 +1 @@
-{"version":3,"file":"Fin5AppRootStore.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppRootStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAYH,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAErD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC5B,OAAO,GAAG,EAAE,CAAA;IACZ,WAAW,GAAG,KAAK,CAAA;IACnB,MAAM,GAAG,EAAE,CAAA;IACX,UAAU,GAAa,EAAE,CAAA;IACzB,MAAM,GAAG,EAAE,CAAA;IACX,aAAa,GAAG,EAAE,CAAA;IAClB,WAAW,CAAmB;IAC9B,IAAI,GAAG;QAGN,OAAO,SAAS,CAAA;IACjB,CAAC;IACD,IAAI,OAAO;QAGV,OAAO,SAAS,CAAA;IACjB,CAAC;IACQ,IAAI,GAAU,EAAE,CAAA;IAChB,OAAO,GAAkB;QACjC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;KACD,CAAA;IACQ,cAAc,GAAkB;QACxC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;KACD,CAAA;IAED;QACC,kBAAkB,CAAC,IAAI,EAAE;YACxB,WAAW,EAAE,UAAU,CAAC,GAAG;YAC3B,IAAI,EAAE,UAAU,CAAC,GAAG;SACpB,CAAC,CAAA;IACH,CAAC;IAED,kBAAkB,KAAU,CAAC;IAC7B,IAAI,KAAU,CAAC;IACf,WAAW,KAAU,CAAC;IACtB,cAAc,KAAU,CAAC;IACzB,gBAAgB,KAAU,CAAC;IAC3B,kBAAkB,KAAU,CAAC;IAC7B,kBAAkB,KAAU,CAAC;IAC7B,oBAAoB,KAAU,CAAC;IAC/B,YAAY,GAAG,CAAC,CAAS,EAAE,MAAsB,EAAW,EAAE;QAC7D,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAA;QAE7B,OAAO,IAAI,EAAE,GAAG,CAAO,UAAU,CAAC,EAAE,KAAK,KAAK,IAAI;YACjD,CAAC,CAAC,MAAM,KAAK,MAAM;YACnB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACV,CAAC,CAAA;IACD,UAAU;QACT,OAAO,KAAK,CAAA;IACb,CAAC;CACD"}
+{"version":3,"file":"Fin5AppRootStore.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppRootStore.ts"],"names":[],"mappings":"AAAA;;GAEG;AAMH,OAAO,EAAE,kBAAkB,EAAE,UAAU,EAAE,MAAM,MAAM,CAAA;AAErD;;GAEG;AACH,MAAM,OAAO,gBAAgB;IAC5B,OAAO,GAAG,EAAE,CAAA;IACZ,WAAW,GAAG,KAAK,CAAA;IACnB,MAAM,GAAG,EAAE,CAAA;IACX,UAAU,GAAa,EAAE,CAAA;IACzB,MAAM,GAAG,EAAE,CAAA;IACX,aAAa,GAAG,EAAE,CAAA;IAClB,WAAW,CAAmB;IAC9B,IAAI,GAAG;QAGN,OAAO,SAAS,CAAA;IACjB,CAAC;IACD,IAAI,OAAO;QAGV,OAAO,SAAS,CAAA;IACjB,CAAC;IACQ,IAAI,GAAU,EAAE,CAAA;IAChB,OAAO,GAAkB;QACjC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,OAAO,CAAC,KAAK,GAAG,KAAK,CAAA;QAC3B,CAAC;KACD,CAAA;IACQ,cAAc,GAAkB;QACxC,KAAK,EAAE,EAAE;QACT,SAAS,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACnD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;QACD,YAAY,EAAE,CAAC,KAA8B,EAAQ,EAAE;YACtD,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG,KAAK,CAAA;QAClC,CAAC;KACD,CAAA;IAED;QACC,kBAAkB,CAAC,IAAI,EAAE;YACxB,WAAW,EAAE,UAAU,CAAC,GAAG;YAC3B,IAAI,EAAE,UAAU,CAAC,GAAG;SACpB,CAAC,CAAA;IACH,CAAC;IAED,kBAAkB,KAAU,CAAC;IAC7B,IAAI,CAAC,KAAa,EAAE,KAA+B;QAClD,IAAI,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE;YAC7B,IAAI,KAAK,EAAE;gBACV,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,KAAK,CAAC,CAAA;aAC7B;SACD;IACF,CAAC;IACD,WAAW,KAAU,CAAC;IACtB,cAAc,KAAU,CAAC;IACzB,gBAAgB,KAAU,CAAC;IAC3B,kBAAkB,KAAU,CAAC;IAC7B,kBAAkB,KAAU,CAAC;IAC7B,oBAAoB,KAAU,CAAC;IAC/B,YAAY,GAAG,CAAC,KAAa,EAAW,EAAE;QACzC,4DAA4D;QAC5D,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,CAAA;QAC7B,IAAI,IAAI,EAAE;YACT,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,EAAE;gBAC1B,OAAO,KAAK,CAAA;aACZ;YAED,IAAI,IAAI,CAAC,GAAG,CAAO,UAAU,CAAC,EAAE,KAAK,KAAK,IAAI,EAAE;gBAC/C,OAAO,IAAI,CAAA;aACX;YAED,wDAAwD;YACxD,IAAI,IAAI,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE;gBAC1B,MAAM,SAAS,GAAG,IAAI,CAAC,GAAG,CAAO,WAAW,CAAC,EAAE,KAAK,CAAA;gBACpD,MAAM,IAAI,GAAG,SAAS,EAAE,KAAK,CAAC,GAAG,CAAC,CAAA;gBAClC,OAAO,IAAI,EAAE,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAA;aACrC;iBAAM;gBACN,OAAO,IAAI,CAAA;aACX;SACD;QAED,OAAO,KAAK,CAAA;IACb,CAAC,CAAA;IACD,UAAU;QACT,OAAO,KAAK,CAAA;IACb,CAAC;CACD"}

package/dist_es/react/hooks/useFin5ColorScheme.js

@@ -7,7 +7,20 @@ import { getFin5top } from '../../fin5Top/fin5Top';
 import { useMemo } from 'react';
 export function useFin5ColorScheme() {
     const theme = useTheme();
-    const colorScheme = getFin5top()?.app.GetColorScheme?.();
+    const fin5 = getFin5top();
+    const colorScheme = fin5?.app.GetColorScheme?.();
+    const currentTheme = fin5?.app.get('currentTheme');
+    const isDarkMode = currentTheme === 'dark';
+    if (isDarkMode && colorScheme) {
+        const primaryColor = fin5?.document
+            ?.querySelector('html.theme-dark .app-launcher .app-item.selected')
+            ?.computedStyleMap()
+            ?.get('background-color')
+            ?.toString();
+        if (primaryColor) {
+            colorScheme.primary = primaryColor;
+        }
+    }
     const brandedTheme = useMemo(() => {
         if (!colorScheme) {
             return undefined;
@@ -20,6 +33,8 @@ export function useFin5ColorScheme() {
             },
             dark: {
                 ...DEFAULT_THEME.dark,
+                textColor: tint(colorScheme.bodyBackground, 100),
+                popupBgColor: colorScheme.bodyBackground,
                 bodyBg: colorScheme.bodyBackground,
                 bgColor: lighten(colorScheme.bodyBackground, 5),
             },
@@ -35,12 +50,14 @@ export function useFin5ColorScheme() {
         colorScheme?.bodyBackground,
         colorScheme?.sidebarBackground,
     ]);
-    if (brandedTheme && theme.type === 'light') {
-        return brandedTheme.light;
+    if (!brandedTheme) {
+        return theme;
     }
-    if (brandedTheme && theme.type === 'dark') {
+    if (isDarkMode) {
         return brandedTheme.dark;
     }
-    return theme;
+    else {
+        return brandedTheme.light;
+    }
 }
 //# sourceMappingURL=useFin5ColorScheme.js.map

package/dist_es/react/hooks/useFin5ColorScheme.js.map

@@ -1 +1 @@
-{"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACN,aAAa,EACb,aAAa,EACb,OAAO,EACP,KAAK,EAEL,IAAI,GACJ,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,QAAQ,EAAY,CAAA;IAClC,MAAM,WAAW,GAAG,UAAU,EAAE,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IACxD,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,aAAa,CAAC;YACpB,KAAK,EAAE;gBACN,GAAG,aAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,aAAa,CAAC,IAAI;gBACrB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,OAAO,EAAE;QAC3C,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;IAED,IAAI,YAAY,IAAI,KAAK,CAAC,IAAI,KAAK,MAAM,EAAE;QAC1C,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;IAED,OAAO,KAAK,CAAA;AACb,CAAC"}
+{"version":3,"file":"useFin5ColorScheme.js","sourceRoot":"","sources":["../../../src/react/hooks/useFin5ColorScheme.ts"],"names":[],"mappings":"AAAA;;GAEG;AAEH,OAAO,EACN,aAAa,EACb,aAAa,EACb,OAAO,EACP,KAAK,EAEL,IAAI,GACJ,MAAM,WAAW,CAAA;AAClB,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAA;AACpC,OAAO,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AAClD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAA;AAE/B,MAAM,UAAU,kBAAkB;IACjC,MAAM,KAAK,GAAG,QAAQ,EAAY,CAAA;IAClC,MAAM,IAAI,GAAG,UAAU,EAAE,CAAA;IACzB,MAAM,WAAW,GAAG,IAAI,EAAE,GAAG,CAAC,cAAc,EAAE,EAAE,CAAA;IAChD,MAAM,YAAY,GAAG,IAAI,EAAE,GAAG,CAAC,GAAG,CAAC,cAAc,CAAsB,CAAA;IACvE,MAAM,UAAU,GAAG,YAAY,KAAK,MAAM,CAAA;IAC1C,IAAI,UAAU,IAAI,WAAW,EAAE;QAC9B,MAAM,YAAY,GAAG,IAAI,EAAE,QAAQ;YAClC,EAAE,aAAa,CAAC,kDAAkD,CAAC;YACnE,EAAE,gBAAgB,EAAE;YACpB,EAAE,GAAG,CAAC,kBAAkB,CAAC;YACzB,EAAE,QAAQ,EAAE,CAAA;QAEb,IAAI,YAAY,EAAE;YACjB,WAAW,CAAC,OAAO,GAAG,YAAY,CAAA;SAClC;KACD;IAED,MAAM,YAAY,GAAG,OAAO,CAAC,GAAG,EAAE;QACjC,IAAI,CAAC,WAAW,EAAE;YACjB,OAAO,SAAS,CAAA;SAChB;QAED,OAAO,aAAa,CAAC;YACpB,KAAK,EAAE;gBACN,GAAG,aAAa,CAAC,KAAK;gBACtB,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,IAAI,EAAE;gBACL,GAAG,aAAa,CAAC,IAAI;gBACrB,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,cAAc,EAAE,GAAG,CAAC;gBAChD,YAAY,EAAE,WAAW,CAAC,cAAc;gBACxC,MAAM,EAAE,WAAW,CAAC,cAAc;gBAClC,OAAO,EAAE,OAAO,CAAC,WAAW,CAAC,cAAc,EAAE,CAAC,CAAC;aAC/C;YACD,OAAO,EAAE;gBACR,GAAG,aAAa,CAAC,OAAO;gBACxB,OAAO,EAAE,WAAW,CAAC,OAAO;gBAC5B,SAAS,EAAE,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;gBACxC,MAAM,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,CAAC;aACtC;SACD,CAAC,CAAA;IACH,CAAC,EAAE;QACF,WAAW,EAAE,OAAO;QACpB,WAAW,EAAE,cAAc;QAC3B,WAAW,EAAE,iBAAiB;KAC9B,CAAC,CAAA;IAEF,IAAI,CAAC,YAAY,EAAE;QAClB,OAAO,KAAK,CAAA;KACZ;IAED,IAAI,UAAU,EAAE;QACf,OAAO,YAAY,CAAC,IAAI,CAAA;KACxB;SAAM;QACN,OAAO,YAAY,CAAC,KAAK,CAAA;KACzB;AACF,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@j2inn/fin5-ui-utils",
-	"version": "6.0.5",
+	"version": "7.0.0",
 	"description": "A set of useful client-side utilities useful for creating UI applications on top of FIN 5",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",