@j2inn/fin5-ui-utils 6.0.5 → 6.1.0

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.
Files changed (13) hide show
  1. package/dist/fin5Top/fin5Top.d.ts +1 -1
  2. package/dist/react/app/Fin5AppContainer.js +43 -0
  3. package/dist/react/app/Fin5AppContainer.js.map +1 -1
  4. package/dist/react/app/Fin5AppRootStore.d.ts +3 -3
  5. package/dist/react/app/Fin5AppRootStore.js +26 -5
  6. package/dist/react/app/Fin5AppRootStore.js.map +1 -1
  7. package/dist_es/fin5Top/fin5Top.d.ts +1 -1
  8. package/dist_es/react/app/Fin5AppContainer.js +43 -0
  9. package/dist_es/react/app/Fin5AppContainer.js.map +1 -1
  10. package/dist_es/react/app/Fin5AppRootStore.d.ts +3 -3
  11. package/dist_es/react/app/Fin5AppRootStore.js +26 -5
  12. package/dist_es/react/app/Fin5AppRootStore.js.map +1 -1
  13. package/package.json +1 -1
package/dist/fin5Top/fin5Top.d.ts CHANGED
@@ -3,7 +3,7 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
3
3
  export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
4
4
  export declare const fin5Top: Fin5Top | null;
5
5
  export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
6
- export interface Fin5Top {
6
+ export interface Fin5Top extends Window {
7
7
  app: Fin5App;
8
8
  languageManager: LanguageManager;
9
9
  finstack?: {
package/dist/react/app/Fin5AppContainer.js CHANGED
@@ -49,6 +49,22 @@ const getServiceUrl = ({ origin, path }) => `${origin}/${PATH_PREFIX}/api/${path
49
49
  const getOpUrl = ({ origin, project, op }) => `${origin}/api/${project}/${op}`;
50
50
  const getHaystackServiceUrl = ({ origin, project, path, }) => `${origin}/${PATH_PREFIX}/api/haystack${project ? `/${project}` : ''}/${path}`;
51
51
  const getHostServiceUrl = ({ origin, path, }) => `${origin}/${PATH_PREFIX}/api/host/${path}`;
52
+ /**
53
+ * Runtime type guard that checks whether a store instance
54
+ * exposes a boolean `initialized` flag.
55
+ *
56
+ * @param {AppStore | null | undefined} appStore - The store instance to test
57
+ * @returns {appStore is AppStore & { initialized: boolean }} True if `appStore` has a boolean `initialized` property
58
+ *
59
+ * @remarks
60
+ * To use the FINX onMessage feature, ensure the concrete store declares `initialized` ahead of time,
61
+ * and set to true when children components have fully rendered.
62
+ */
63
+ function hasInitialized(appStore) {
64
+ return (!!appStore &&
65
+ 'initialized' in appStore &&
66
+ typeof appStore.initialized === 'boolean');
67
+ }
52
68
  /**
53
69
  * Creates a basic application container environment to run a view in FIN5.
54
70
  */
@@ -67,6 +83,9 @@ exports.Fin5AppContainer = (0, mobx_react_lite_1.observer)(({ children, appStore
67
83
  }
68
84
  const target = fin5Top_1.fin5Top?.app?.TargetRef?.() || '';
69
85
  rootStore.target = target ? haystack_core_1.HRef.make(target).value : '';
86
+ const initialized = hasInitialized(appStore)
87
+ ? appStore.initialized
88
+ : false;
70
89
  const getClient = () => client ??
71
90
  new haystack_nclient_1.Client({
72
91
  base: new URL(window.location.href),
@@ -92,6 +111,30 @@ exports.Fin5AppContainer = (0, mobx_react_lite_1.observer)(({ children, appStore
92
111
  setLoading(false);
93
112
  });
94
113
  }, [client, containerProject]);
114
+ (0, react_1.useEffect)(() => {
115
+ const onMessage = (event) => {
116
+ if (fin5Top_1.fin5Top?.location.origin === event.origin &&
117
+ appStore?.onMessage) {
118
+ appStore.onMessage({
119
+ message: event.data.message,
120
+ params: event.data,
121
+ client: getClient(),
122
+ appRootStore: rootStore,
123
+ });
124
+ }
125
+ };
126
+ window.addEventListener('message', onMessage);
127
+ return () => window.removeEventListener('message', onMessage);
128
+ }, []);
129
+ (0, react_1.useEffect)(() => {
130
+ // tell the top level app its ready
131
+ if (initialized) {
132
+ fin5Top_1.fin5Top?.postMessage({
133
+ kind: 'iframeApp',
134
+ loading: false,
135
+ });
136
+ }
137
+ }, [initialized]);
95
138
  return (react_1.default.createElement(app_react_1.AppRootStoreContext.Provider, { value: rootStore },
96
139
  react_1.default.createElement(app_react_1.AppStoreContext.Provider, { value: appStore },
97
140
  react_1.default.createElement(haystack_react_1.ClientContext.Provider, { value: containerClient },
package/dist/react/app/Fin5AppContainer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -1,4 +1,4 @@
1
- import { App, AppAccessLevel, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
1
+ import { App, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
2
2
  import { HDict } from 'haystack-core';
3
3
  /**
4
4
  * An application root store for use with FIN5.
@@ -28,13 +28,13 @@ export declare class Fin5AppRootStore implements AppRootStore {
28
28
  readonly historySidebar: CustomHistory;
29
29
  constructor();
30
30
  openAppInNewWindow(): void;
31
- open(): void;
31
+ open(appId: string, state?: Record<string, unknown>): void;
32
32
  openSidebar(): void;
33
33
  postAppMessage(): void;
34
34
  registerSidebars(): void;
35
35
  unregisterSidebars(): void;
36
36
  registerQuicklinks(): void;
37
37
  unregisterQuicklinks(): void;
38
- hasAppAccess: (_: string, access: AppAccessLevel) => boolean;
38
+ hasAppAccess: (appId: string) => boolean;
39
39
  hasSidebar(): boolean;
40
40
  }
package/dist/react/app/Fin5AppRootStore.js CHANGED
@@ -48,19 +48,40 @@ class Fin5AppRootStore {
48
48
  });
49
49
  }
50
50
  openAppInNewWindow() { }
51
- open() { }
51
+ open(appId, state) {
52
+ if (this.hasAppAccess(appId)) {
53
+ if (state) {
54
+ this.history.pushState(state);
55
+ }
56
+ }
57
+ }
52
58
  openSidebar() { }
53
59
  postAppMessage() { }
54
60
  registerSidebars() { }
55
61
  unregisterSidebars() { }
56
62
  registerQuicklinks() { }
57
63
  unregisterQuicklinks() { }
58
- hasAppAccess = (_, access) => {
64
+ hasAppAccess = (appId) => {
59
65
  // For FIN5, an operator only has readonly app level access.
60
66
  const user = this.currentUser;
61
- return user?.get('userRole')?.value === 'op'
62
- ? access === 'read'
63
- : !!user;
67
+ if (user) {
68
+ if (!user.has('userRole')) {
69
+ return false;
70
+ }
71
+ if (user.get('userRole')?.value === 'su') {
72
+ return true;
73
+ }
74
+ // if no appAccess is present, then all apps are granted
75
+ if (user.has('appAccess')) {
76
+ const appAccess = user.get('appAccess')?.value;
77
+ const apps = appAccess?.split(',');
78
+ return apps?.includes(appId) ?? false;
79
+ }
80
+ else {
81
+ return true;
82
+ }
83
+ }
84
+ return false;
64
85
  };
65
86
  hasSidebar() {
66
87
  return false;
package/dist/react/app/Fin5AppRootStore.js.map CHANGED
@@ -1 +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"}
1
+ {"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_es/fin5Top/fin5Top.d.ts CHANGED
@@ -3,7 +3,7 @@ import { HistorianArgs, HistorianType } from './openFin5Historian';
3
3
  export declare const getFin5top: (notifyFailure?: () => void) => Fin5Top | null;
4
4
  export declare const fin5Top: Fin5Top | null;
5
5
  export declare function isWindowTopFin5(notifyFailure?: () => void): boolean;
6
- export interface Fin5Top {
6
+ export interface Fin5Top extends Window {
7
7
  app: Fin5App;
8
8
  languageManager: LanguageManager;
9
9
  finstack?: {
package/dist_es/react/app/Fin5AppContainer.js CHANGED
@@ -20,6 +20,22 @@ const getServiceUrl = ({ origin, path }) => `${origin}/${PATH_PREFIX}/api/${path
20
20
  const getOpUrl = ({ origin, project, op }) => `${origin}/api/${project}/${op}`;
21
21
  const getHaystackServiceUrl = ({ origin, project, path, }) => `${origin}/${PATH_PREFIX}/api/haystack${project ? `/${project}` : ''}/${path}`;
22
22
  const getHostServiceUrl = ({ origin, path, }) => `${origin}/${PATH_PREFIX}/api/host/${path}`;
23
+ /**
24
+ * Runtime type guard that checks whether a store instance
25
+ * exposes a boolean `initialized` flag.
26
+ *
27
+ * @param {AppStore | null | undefined} appStore - The store instance to test
28
+ * @returns {appStore is AppStore & { initialized: boolean }} True if `appStore` has a boolean `initialized` property
29
+ *
30
+ * @remarks
31
+ * To use the FINX onMessage feature, ensure the concrete store declares `initialized` ahead of time,
32
+ * and set to true when children components have fully rendered.
33
+ */
34
+ function hasInitialized(appStore) {
35
+ return (!!appStore &&
36
+ 'initialized' in appStore &&
37
+ typeof appStore.initialized === 'boolean');
38
+ }
23
39
  /**
24
40
  * Creates a basic application container environment to run a view in FIN5.
25
41
  */
@@ -38,6 +54,9 @@ export const Fin5AppContainer = observer(({ children, appStore, client, project,
38
54
  }
39
55
  const target = fin5Top?.app?.TargetRef?.() || '';
40
56
  rootStore.target = target ? HRef.make(target).value : '';
57
+ const initialized = hasInitialized(appStore)
58
+ ? appStore.initialized
59
+ : false;
41
60
  const getClient = () => client ??
42
61
  new Client({
43
62
  base: new URL(window.location.href),
@@ -63,6 +82,30 @@ export const Fin5AppContainer = observer(({ children, appStore, client, project,
63
82
  setLoading(false);
64
83
  });
65
84
  }, [client, containerProject]);
85
+ useEffect(() => {
86
+ const onMessage = (event) => {
87
+ if (fin5Top?.location.origin === event.origin &&
88
+ appStore?.onMessage) {
89
+ appStore.onMessage({
90
+ message: event.data.message,
91
+ params: event.data,
92
+ client: getClient(),
93
+ appRootStore: rootStore,
94
+ });
95
+ }
96
+ };
97
+ window.addEventListener('message', onMessage);
98
+ return () => window.removeEventListener('message', onMessage);
99
+ }, []);
100
+ useEffect(() => {
101
+ // tell the top level app its ready
102
+ if (initialized) {
103
+ fin5Top?.postMessage({
104
+ kind: 'iframeApp',
105
+ loading: false,
106
+ });
107
+ }
108
+ }, [initialized]);
66
109
  return (React.createElement(AppRootStoreContext.Provider, { value: rootStore },
67
110
  React.createElement(AppStoreContext.Provider, { value: appStore },
68
111
  React.createElement(ClientContext.Provider, { value: containerClient },
package/dist_es/react/app/Fin5AppContainer.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Fin5AppContainer.js","sourceRoot":"","sources":["../../../src/react/app/Fin5AppContainer.tsx"],"names":[],"mappings":"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"}
1
+ {"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 CHANGED
@@ -1,4 +1,4 @@
1
- import { App, AppAccessLevel, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
1
+ import { App, AppRootStore, AppView, CustomHistory } from '@j2inn/app';
2
2
  import { HDict } from 'haystack-core';
3
3
  /**
4
4
  * An application root store for use with FIN5.
@@ -28,13 +28,13 @@ export declare class Fin5AppRootStore implements AppRootStore {
28
28
  readonly historySidebar: CustomHistory;
29
29
  constructor();
30
30
  openAppInNewWindow(): void;
31
- open(): void;
31
+ open(appId: string, state?: Record<string, unknown>): void;
32
32
  openSidebar(): void;
33
33
  postAppMessage(): void;
34
34
  registerSidebars(): void;
35
35
  unregisterSidebars(): void;
36
36
  registerQuicklinks(): void;
37
37
  unregisterQuicklinks(): void;
38
- hasAppAccess: (_: string, access: AppAccessLevel) => boolean;
38
+ hasAppAccess: (appId: string) => boolean;
39
39
  hasSidebar(): boolean;
40
40
  }
package/dist_es/react/app/Fin5AppRootStore.js CHANGED
@@ -45,19 +45,40 @@ export class Fin5AppRootStore {
45
45
  });
46
46
  }
47
47
  openAppInNewWindow() { }
48
- open() { }
48
+ open(appId, state) {
49
+ if (this.hasAppAccess(appId)) {
50
+ if (state) {
51
+ this.history.pushState(state);
52
+ }
53
+ }
54
+ }
49
55
  openSidebar() { }
50
56
  postAppMessage() { }
51
57
  registerSidebars() { }
52
58
  unregisterSidebars() { }
53
59
  registerQuicklinks() { }
54
60
  unregisterQuicklinks() { }
55
- hasAppAccess = (_, access) => {
61
+ hasAppAccess = (appId) => {
56
62
  // For FIN5, an operator only has readonly app level access.
57
63
  const user = this.currentUser;
58
- return user?.get('userRole')?.value === 'op'
59
- ? access === 'read'
60
- : !!user;
64
+ if (user) {
65
+ if (!user.has('userRole')) {
66
+ return false;
67
+ }
68
+ if (user.get('userRole')?.value === 'su') {
69
+ return true;
70
+ }
71
+ // if no appAccess is present, then all apps are granted
72
+ if (user.has('appAccess')) {
73
+ const appAccess = user.get('appAccess')?.value;
74
+ const apps = appAccess?.split(',');
75
+ return apps?.includes(appId) ?? false;
76
+ }
77
+ else {
78
+ return true;
79
+ }
80
+ }
81
+ return false;
61
82
  };
62
83
  hasSidebar() {
63
84
  return false;
package/dist_es/react/app/Fin5AppRootStore.js.map CHANGED
@@ -1 +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"}
1
+ {"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/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@j2inn/fin5-ui-utils",
3
- "version": "6.0.5",
3
+ "version": "6.1.0",
4
4
  "description": "A set of useful client-side utilities useful for creating UI applications on top of FIN 5",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",