@admin-layout/gluestack-ui-mobile 9.0.4-alpha.43 → 9.0.4-alpha.46
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.
- package/CHANGELOG.md +4 -0
- package/lib/components/NavigationComponent.js +8 -3
- package/lib/components/NavigationComponent.js.map +1 -1
- package/lib/components/WithPermission.js +1 -5
- package/lib/components/WithPermission.js.map +1 -1
- package/lib/components/usePermissionAutoFetch.js +20 -3
- package/lib/components/usePermissionAutoFetch.js.map +1 -1
- package/lib/components/useSetting.js +1 -7
- package/lib/components/useSetting.js.map +1 -1
- package/lib/components/with-interactions-lifecycle-managed.js +5 -11
- package/lib/components/with-interactions-lifecycle-managed.js.map +1 -1
- package/package.json +2 -2
- package/src/components/NavigationComponent.tsx +8 -3
- package/src/components/WithPermission.tsx +1 -4
- package/src/components/usePermissionAutoFetch.tsx +20 -3
- package/src/components/useSetting.tsx +1 -8
- package/src/components/with-interactions-lifecycle-managed.tsx +18 -29
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,10 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [9.0.4-alpha.46](https://github.com/CDEBase/admin-layout/compare/v9.0.4-alpha.45...v9.0.4-alpha.46) (2024-10-25)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
|
|
9
|
+
|
|
6
10
|
## [9.0.4-alpha.43](https://github.com/CDEBase/admin-layout/compare/v9.0.4-alpha.42...v9.0.4-alpha.43) (2024-10-17)
|
|
7
11
|
|
|
8
12
|
**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
|
|
@@ -4,6 +4,7 @@ import { cloneDeep } from 'lodash-es';
|
|
|
4
4
|
import React, { useRef } from 'react';
|
|
5
5
|
import { useDispatch, useSelector } from 'react-redux';
|
|
6
6
|
import { navigationRef } from '@common-stack/client-react';
|
|
7
|
+
import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
|
|
7
8
|
export const getPath = (routeName, configurableRoutes) => {
|
|
8
9
|
let resultantPath = '';
|
|
9
10
|
configurableRoutes.forEach((item) => {
|
|
@@ -32,6 +33,7 @@ export const configurableRoutesWithNavigationRouteName = (configurableRoutes, pa
|
|
|
32
33
|
};
|
|
33
34
|
export const useLocationChange = () => {
|
|
34
35
|
const dispatch = useDispatch();
|
|
36
|
+
const { authenticated } = isUserAuthenticated();
|
|
35
37
|
const [locationChange, setLocationChange] = React.useState(null);
|
|
36
38
|
const platformState = useSelector((state) => state.platform);
|
|
37
39
|
React.useEffect(() => {
|
|
@@ -44,11 +46,14 @@ export const useLocationChange = () => {
|
|
|
44
46
|
const configuredRoutes = configurableRoutesWithNavigationRouteName(configurableRoutes);
|
|
45
47
|
const currentPath = currentRouteName ? getPath(currentRouteName, configuredRoutes) : null;
|
|
46
48
|
const previousPath = previousRoute ? getPath(previousRoute?.current.name, configuredRoutes) : null;
|
|
49
|
+
const currentOrgName = authenticated
|
|
50
|
+
? orgName
|
|
51
|
+
? orgName
|
|
52
|
+
: currentRoute.params?.orgName || platformState?.orgName || previousRoute?.current?.params?.orgName
|
|
53
|
+
: null;
|
|
47
54
|
const currParams = {
|
|
48
55
|
...(currentRoute.params || {}),
|
|
49
|
-
orgName:
|
|
50
|
-
? orgName
|
|
51
|
-
: currentRoute.params?.orgName || platformState?.orgName || previousRoute?.current?.params?.orgName,
|
|
56
|
+
orgName: currentOrgName,
|
|
52
57
|
};
|
|
53
58
|
navigationRef?.setParams(currParams);
|
|
54
59
|
dispatch({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"NavigationComponent.js","sourceRoot":"","sources":["../../src/components/NavigationComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAS,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAkC,MAAM,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"NavigationComponent.js","sourceRoot":"","sources":["../../src/components/NavigationComponent.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,IAAI,uBAAuB,EAAE,MAAM,kCAAkC,CAAC;AAC9F,OAAO,EAAE,mBAAmB,EAAkB,MAAM,0BAA0B,CAAC;AAC/E,OAAO,EAAE,SAAS,EAAS,MAAM,WAAW,CAAC;AAC7C,OAAO,KAAK,EAAE,EAAkC,MAAM,EAAE,MAAM,OAAO,CAAC;AACtE,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AACvD,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,mBAAmB,EAAE,MAAM,mCAAmC,CAAC;AAexE,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,SAAiB,EAAE,kBAAyC,EAAE,EAAE;IACpF,IAAI,aAAa,GAAG,EAAE,CAAC;IACvB,kBAAkB,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAChC,IAAI,IAAI,CAAC,QAAQ,EAAE,MAAM,EAAE,CAAC;YACxB,MAAM,KAAK,GAAG,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAChD,IAAI,KAAK,EAAE,CAAC;gBACR,aAAa,GAAG,KAAK,CAAC;YAC1B,CAAC;QACL,CAAC;QACD,IAAI,IAAI,CAAC,mBAAmB,KAAK,SAAS,EAAE,CAAC;YACzC,aAAa,GAAG,IAAI,CAAC,IAAI,CAAC;QAC9B,CAAC;IACL,CAAC,CAAC,CAAC;IACH,OAAO,aAAa,CAAC;AACzB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,yCAAyC,GAAG,CACrD,kBAAyC,EACzC,aAAqB,EAAE,EACzB,EAAE;IACA,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;QACnC,MAAM,aAAa,GAAG,UAAU,CAAC;QACjC,MAAM,mBAAmB,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,aAAa,IAAI,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC;QAC/F,IAAI,CAAC,mBAAmB,GAAG,mBAAmB,CAAC;QAC/C,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;YAChB,IAAI,CAAC,QAAQ,GAAG,yCAAyC,CAAC,IAAI,CAAC,QAAQ,EAAE,mBAAmB,CAAC,CAAC;QAClG,CAAC;QACD,OAAO,IAAI,CAAC;IAChB,CAAC,CAAC,CAAC;AACP,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IAClC,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,EAAE,aAAa,EAAE,GAAG,mBAAmB,EAAE,CAAC;IAChD,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAM,IAAI,CAAC,CAAC;IACtE,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE,CAAE,KAAa,CAAC,QAAQ,CAAC,CAAC;IAEtE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,cAAc;YAAE,WAAW,CAAC,cAAc,CAAC,CAAC;IACpD,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IAErB,MAAM,WAAW,GAAG,CAAC,EAAE,kBAAkB,EAAE,aAAa,GAAG,IAAI,EAAE,OAAO,GAAG,IAAI,EAAO,EAAE,EAAE;QACtF,MAAM,YAAY,GAAQ,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;QAC5F,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,YAAa,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;QACnE,MAAM,gBAAgB,GAAG,yCAAyC,CAAC,kBAAkB,CAAC,CAAC;QACvF,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAA0B,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpG,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,OAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;QACpG,MAAM,cAAc,GAAG,aAAa;YAChC,CAAC,CAAC,OAAO;gBACL,CAAC,CAAC,OAAO;gBACT,CAAC,CAAC,YAAa,CAAC,MAAM,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;YACxG,CAAC,CAAC,IAAI,CAAC;QACX,MAAM,UAAU,GAAG;YACf,GAAG,CAAC,YAAa,CAAC,MAAM,IAAI,EAAE,CAAC;YAC/B,OAAO,EAAE,cAAc;SAC1B,CAAC;QAEF,aAAa,EAAE,SAAS,CAAC,UAAU,CAAC,CAAC;QAErC,QAAQ,CAAC;YACL,IAAI,EAAE,uBAAuB;YAC7B,OAAO,EAAE;gBACL,YAAY,EAAE;oBACV,IAAI,EAAE,WAAW;oBACjB,MAAM,EAAE,UAAU;iBACrB;gBACD,aAAa,EAAE;oBACX,IAAI,EAAE,YAAY;oBAClB,MAAM,EAAE,aAAa,EAAE,OAAO,EAAE,MAAM,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE;iBAC5D;aACJ;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO,EAAE,iBAAiB,EAAE,CAAC;AACjC,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,4BAA4B,GAAG,CAAC,EACzC,QAAQ,EACR,kBAAkB,EAClB,WAAW,EACX,OAAO,GAC0B,EAAgB,EAAE;IACnD,MAAM,YAAY,GAAG,MAAM,EAA2D,CAAC;IACvF,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE,CAAE,KAAa,CAAC,QAAQ,CAAC,CAAC;IACtE,MAAM,EAAE,iBAAiB,EAAE,GAAG,iBAAiB,EAAE,CAAC;IAClD,uDAAuD;IACvD,OAAO,CACH,oBAAC,mBAAmB,IAChB,GAAG,EAAE,aAAa,EAClB,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,OAAO,EAAE,GAAG,EAAE;YACV,YAAY,CAAC,OAAO,GAAG,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YACzF,MAAM,YAAY,GAAQ,YAAY,EAAE,OAAO,CAAC;YAChD,iBAAiB,CAAC;gBACd,kBAAkB;gBAClB,OAAO,EAAE,aAAa,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,EAAE,OAAO,IAAI,EAAE;aACzE,CAAC,CAAC;QACP,CAAC,EACD,aAAa,EAAE,KAAK,IAAI,EAAE;YACtB,MAAM,aAAa,GAAQ,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YAClF,MAAM,YAAY,GAAQ,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;YAC5F,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,EAAE,OAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAC9E,MAAM,gBAAgB,GAAG,YAAY,CAAC,CAAC,CAAC,YAAa,EAAE,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;YAEnE,MAAM,gBAAgB,GAAG,yCAAyC,CAAC,kBAAkB,CAAC,CAAC;YACvF,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,OAAO,CAAC,gBAA0B,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACpG,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,EAAE,OAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACpG,MAAM,UAAU,GAAG;gBACf,GAAG,CAAC,YAAa,CAAC,MAAM,IAAI,EAAE,CAAC;gBAC/B,OAAO,EAAE,YAAa,CAAC,MAAM,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO;aACnE,CAAC;YACF,wFAAwF;YACxF,IAAI,YAAY,KAAK,WAAW,EAAE,CAAC;gBAC/B,YAAY,CAAC,OAAO,GAAG,YAAY,CAAC;gBAEpC,iBAAiB,CAAC,EAAE,kBAAkB,EAAE,aAAa,EAAE,CAAC,CAAC;gBAEzD,aAAa;gBACb,qCAAqC;gBACrC,iBAAiB;gBACjB,0BAA0B;gBAC1B,iCAAiC;gBACjC,kCAAkC;gBAClC,aAAa;gBACb,2BAA2B;gBAC3B,kCAAkC;gBAClC,yEAAyE;gBACzE,aAAa;gBACb,SAAS;gBACT,MAAM;YACV,CAAC;QACL,CAAC,IAEA,QAAQ,CACS,CACzB,CAAC;AACN,CAAC,CAAC"}
|
|
@@ -3,7 +3,6 @@ import { Spinner, Box, Text, Heading } from '@gluestack-ui/themed';
|
|
|
3
3
|
import { IPermissionType } from '@adminide-stack/core';
|
|
4
4
|
import { get } from 'lodash-es';
|
|
5
5
|
import { usePermissionAutoFetch } from './usePermissionAutoFetch';
|
|
6
|
-
import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
|
|
7
6
|
export var WithPermissionBehaviour;
|
|
8
7
|
(function (WithPermissionBehaviour) {
|
|
9
8
|
WithPermissionBehaviour[WithPermissionBehaviour["hide"] = 0] = "hide";
|
|
@@ -11,14 +10,11 @@ export var WithPermissionBehaviour;
|
|
|
11
10
|
WithPermissionBehaviour[WithPermissionBehaviour["showAlternative"] = 2] = "showAlternative";
|
|
12
11
|
})(WithPermissionBehaviour || (WithPermissionBehaviour = {}));
|
|
13
12
|
export const WithPermission = ({ permissionKeys, children, permissionTypes = [IPermissionType.Allow], behaviour = WithPermissionBehaviour.hide, message = "You don't have permission to access this resource, contact owner", alternative, render, }) => {
|
|
14
|
-
const { data: permissions, loading: permissionLoading
|
|
15
|
-
const { authenticated } = isUserAuthenticated();
|
|
13
|
+
const { data: permissions, loading: permissionLoading } = usePermissionAutoFetch();
|
|
16
14
|
const hasPermission = React.useMemo(() => {
|
|
17
|
-
// const permissionData = {...permissions?.resolveConfiguration,account:{...permissions?.resolveConfiguration?.account,user:{...permissions?.resolveConfiguration?.account?.user,secure:authenticated ? 'Allow' : 'Deny'}}};
|
|
18
15
|
return permissionKeys.some((key) => permissionTypes.includes(get(permissions?.resolveConfiguration, key)));
|
|
19
16
|
}, [permissions, permissionTypes, permissionKeys]);
|
|
20
17
|
console.log('hasPermission', hasPermission);
|
|
21
|
-
console.log('permissionKeys', permissionKeys);
|
|
22
18
|
console.log('permissions', JSON.stringify(permissions));
|
|
23
19
|
if (permissionLoading) {
|
|
24
20
|
return React.createElement(Spinner, null);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WithPermission.js","sourceRoot":"","sources":["../../src/components/WithPermission.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,eAAe,EAA0B,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"WithPermission.js","sourceRoot":"","sources":["../../src/components/WithPermission.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AACnE,OAAO,EAAE,eAAe,EAA0B,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,GAAG,EAAE,MAAM,WAAW,CAAC;AAChC,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,MAAM,CAAN,IAAY,uBAIX;AAJD,WAAY,uBAAuB;IAC/B,qEAAI,CAAA;IACJ,6FAAgB,CAAA;IAChB,2FAAe,CAAA;AACnB,CAAC,EAJW,uBAAuB,KAAvB,uBAAuB,QAIlC;AAYD,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAC3B,cAAc,EACd,QAAQ,EACR,eAAe,GAAG,CAAC,eAAe,CAAC,KAAK,CAAC,EACzC,SAAS,GAAG,uBAAuB,CAAC,IAAI,EACxC,OAAO,GAAG,kEAAkE,EAC5E,WAAW,EACX,MAAM,GACa,EAAE,EAAE;IACvB,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,EAAE,GAAG,sBAAsB,EAAE,CAAC;IAEnF,MAAM,aAAa,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE;QACrC,OAAO,cAAc,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,EAAE,oBAAoB,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;IAC/G,CAAC,EAAE,CAAC,WAAW,EAAE,eAAe,EAAE,cAAc,CAAC,CAAC,CAAC;IAEnD,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,aAAa,CAAC,CAAC;IAC5C,OAAO,CAAC,GAAG,CAAC,aAAa,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC,CAAC;IAExD,IAAI,iBAAiB,EAAE,CAAC;QACpB,OAAO,oBAAC,OAAO,OAAG,CAAC;IACvB,CAAC;IAED,IAAI,OAAO,MAAM,KAAK,UAAU,EAAE,CAAC;QAC/B,OAAO,MAAM,CAAC,EAAE,aAAa,EAAE,CAAC,CAAC;IACrC,CAAC;IAED,IAAI,aAAa,EAAE,CAAC;QAChB,OAAO,QAAQ,CAAC;IACpB,CAAC;IAED,IAAI,SAAS,KAAK,uBAAuB,CAAC,eAAe,EAAE,CAAC;QACxD,OAAO,WAAW,CAAC;IACvB,CAAC;IACD,IAAI,SAAS,KAAK,uBAAuB,CAAC,gBAAgB,EAAE,CAAC;QACzD,IAAI,iBAAiB,EAAE,CAAC;YACpB,OAAO,oBAAC,OAAO,OAAG,CAAC;QACvB,CAAC;QACD,OAAO,CACH,oBAAC,GAAG;YACA,oBAAC,OAAO,6BAA6B;YACrC,oBAAC,IAAI,QAAE,OAAO,CAAQ,CACpB,CACT,CAAC;IACN,CAAC;IACD,OAAO,IAAI,CAAC;AAChB,CAAC,CAAC;AAEF,cAAc,CAAC,YAAY,GAAG;IAC1B,eAAe,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC;IACxC,SAAS,EAAE,uBAAuB,CAAC,IAAI;IACvC,OAAO,EAAE,kEAAkE;IAC3E,aAAa,EAAE;QACX,QAAQ,EAAE,IAAI;KACjB;CACJ,CAAC;AAEF,MAAM,CAAC,MAAM,uBAAuB,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,KAA2B,EAAE,EAAE,CAAC,oBAAC,cAAc,OAAK,KAAK,GAAI,CAAC,CAAC;AAClH,eAAe,uBAAuB,CAAC;AACvC,yGAAyG"}
|
|
@@ -1,15 +1,33 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { IResourceAuthority, IConfigFragmentName } from '@adminide-stack/core';
|
|
3
3
|
import { useGetTeamContextQuery } from '@adminide-stack/platform-client';
|
|
4
|
+
import { generateOrgUri } from '@adminide-stack/core/lib/utils/generate-uri.js';
|
|
5
|
+
import { useSelector } from 'react-redux';
|
|
6
|
+
import { navigationRef } from '@common-stack/client-react';
|
|
4
7
|
import { useSetting } from './useSetting';
|
|
5
8
|
export const usePermissionAutoFetch = (options) => {
|
|
9
|
+
const [orgName, setOrgName] = React.useState(null);
|
|
10
|
+
const [orgUri, setOrgUri] = React.useState(null);
|
|
11
|
+
const platformState = useSelector((state) => state.platform);
|
|
12
|
+
const currentRoute = navigationRef.isReady() ? navigationRef?.getCurrentRoute() : null;
|
|
6
13
|
const { data, loading } = useGetTeamContextQuery();
|
|
7
14
|
const teamData = React.useMemo(() => data?.getTeamContext, [data]);
|
|
8
|
-
|
|
15
|
+
React.useEffect(() => {
|
|
16
|
+
if (currentRoute?.params?.orgName || platformState?.orgName) {
|
|
17
|
+
const org = currentRoute?.params?.orgName || platformState?.orgName;
|
|
18
|
+
if (org !== orgName) {
|
|
19
|
+
setOrgName(org);
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
if (orgName) {
|
|
23
|
+
const orgUri = generateOrgUri(orgName, IConfigFragmentName.Settings);
|
|
24
|
+
setOrgUri(orgUri);
|
|
25
|
+
}
|
|
26
|
+
}, [currentRoute, platformState, orgName]);
|
|
9
27
|
const { loading: settingLoading, ...remaining } = useSetting({
|
|
10
28
|
configKey: options?.configKey || '',
|
|
11
29
|
overrides: {
|
|
12
|
-
resource: teamData?.teamUri ??
|
|
30
|
+
resource: teamData?.teamUri ?? orgUri,
|
|
13
31
|
},
|
|
14
32
|
options: {
|
|
15
33
|
forceExist: false,
|
|
@@ -17,7 +35,6 @@ export const usePermissionAutoFetch = (options) => {
|
|
|
17
35
|
fragment: IConfigFragmentName.Roles,
|
|
18
36
|
},
|
|
19
37
|
});
|
|
20
|
-
console.log('---remaining', JSON.stringify(remaining?.data));
|
|
21
38
|
return { ...remaining, loading: loading || settingLoading };
|
|
22
39
|
};
|
|
23
40
|
//# sourceMappingURL=usePermissionAutoFetch.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usePermissionAutoFetch.js","sourceRoot":"","sources":["../../src/components/usePermissionAutoFetch.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsC,EAAE,EAAE;IAC7E,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,sBAAsB,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,
|
|
1
|
+
{"version":3,"file":"usePermissionAutoFetch.js","sourceRoot":"","sources":["../../src/components/usePermissionAutoFetch.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iCAAiC,CAAC;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAC3D,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAK1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsC,EAAE,EAAE;IAC7E,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAM,IAAI,CAAC,CAAC;IACxD,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,KAAK,CAAC,QAAQ,CAAM,IAAI,CAAC,CAAC;IACtD,MAAM,aAAa,GAAG,WAAW,CAAC,CAAC,KAAK,EAAE,EAAE,CAAE,KAAa,CAAC,QAAQ,CAAC,CAAC;IACtE,MAAM,YAAY,GAAQ,aAAa,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,aAAa,EAAE,eAAe,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAC5F,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,sBAAsB,EAAE,CAAC;IACnD,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,cAAc,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IACnE,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,IAAI,YAAY,EAAE,MAAM,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,EAAE,CAAC;YAC1D,MAAM,GAAG,GAAG,YAAY,EAAE,MAAM,EAAE,OAAO,IAAI,aAAa,EAAE,OAAO,CAAC;YACpE,IAAI,GAAG,KAAK,OAAO,EAAE,CAAC;gBAClB,UAAU,CAAC,GAAG,CAAC,CAAC;YACpB,CAAC;QACL,CAAC;QACD,IAAI,OAAO,EAAE,CAAC;YACV,MAAM,MAAM,GAAG,cAAc,CAAC,OAAO,EAAE,mBAAmB,CAAC,QAAQ,CAAC,CAAC;YACrE,SAAS,CAAC,MAAM,CAAC,CAAC;QACtB,CAAC;IACL,CAAC,EAAE,CAAC,YAAY,EAAE,aAAa,EAAE,OAAO,CAAC,CAAC,CAAC;IAE3C,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,SAAS,EAAE,GAAG,UAAU,CAAC;QACzD,SAAS,EAAE,OAAO,EAAE,SAAS,IAAI,EAAE;QACnC,SAAS,EAAE;YACP,QAAQ,EAAE,QAAQ,EAAE,OAAO,IAAI,MAAM;SACxC;QACD,OAAO,EAAE;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,kBAAkB,CAAC,kBAAkB;YAChD,QAAQ,EAAE,mBAAmB,CAAC,KAAK;SACtC;KACJ,CAAC,CAAC;IACH,OAAO,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,CAAC;AAChE,CAAC,CAAC"}
|
|
@@ -9,18 +9,16 @@ import { useResolveConfigurationQuery, useOpenPreferencesSettingsQuery, useUpdat
|
|
|
9
9
|
export const useSetting = (settingsVariable) => {
|
|
10
10
|
const { overrides, configKey, options, skip = false } = settingsVariable;
|
|
11
11
|
const targetResource = overrides?.resource ?? null;
|
|
12
|
-
console.log('---targetResource', targetResource);
|
|
13
12
|
let prefLoaded = false;
|
|
14
13
|
const { data: prefData, error: prefError, loading: perfLoading, refetch: refetchPrefData, } = useOpenPreferencesSettingsQuery({
|
|
15
14
|
variables: { resource: targetResource, options },
|
|
16
|
-
fetchPolicy: 'cache-
|
|
15
|
+
fetchPolicy: 'cache-first', // to make `{always: true}` to work
|
|
17
16
|
skip: prefLoaded,
|
|
18
17
|
});
|
|
19
18
|
React.useEffect(() => {
|
|
20
19
|
refetchPrefData({ resource: targetResource, options });
|
|
21
20
|
}, [targetResource]);
|
|
22
21
|
prefLoaded = perfLoading || skip;
|
|
23
|
-
console.log('---prefData', prefData);
|
|
24
22
|
const [updateConfigurationMutation] = useUpdateConfigurationMutation();
|
|
25
23
|
const modifiedOverrides = {
|
|
26
24
|
...overrides,
|
|
@@ -48,9 +46,6 @@ export const useSetting = (settingsVariable) => {
|
|
|
48
46
|
loading = false;
|
|
49
47
|
}
|
|
50
48
|
const error = settingError || prefError;
|
|
51
|
-
console.log('---error', error);
|
|
52
|
-
console.log('---settingError', settingError);
|
|
53
|
-
console.log('---prefError', prefError);
|
|
54
49
|
if (error) {
|
|
55
50
|
return {
|
|
56
51
|
error,
|
|
@@ -78,7 +73,6 @@ export const useSetting = (settingsVariable) => {
|
|
|
78
73
|
},
|
|
79
74
|
});
|
|
80
75
|
};
|
|
81
|
-
console.log('--USESetting ', JSON.stringify(settingsData?.resolveConfiguration));
|
|
82
76
|
return {
|
|
83
77
|
data: settingsData,
|
|
84
78
|
loading,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useSetting.js","sourceRoot":"","sources":["../../src/components/useSetting.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAW1B,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAE1C,OAAO,EACH,4BAA4B,EAC5B,+BAA+B,EAC/B,8BAA8B,GACjC,MAAM,iCAAiC,CAAC;AAwBzC;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,gBAAmC,EAAa,EAAE;IACzE,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,GAAG,KAAK,EAAE,GAAG,gBAAgB,CAAC;IACzE,MAAM,cAAc,GAAG,SAAS,EAAE,QAAQ,IAAI,IAAI,CAAC;IACnD,
|
|
1
|
+
{"version":3,"file":"useSetting.js","sourceRoot":"","sources":["../../src/components/useSetting.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,16 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
// import { Transition, Transitioning } from 'react-native-reanimated';
|
|
3
2
|
import { Lifecycle } from '../containers/layout/Lifecycle';
|
|
4
3
|
import Animated from 'react-native-reanimated';
|
|
5
4
|
import { useAfterInteractions } from '../hooks/use-after-interactions';
|
|
6
5
|
import { Spinner, Center } from '@gluestack-ui/themed';
|
|
7
6
|
import { Platform } from 'react-native';
|
|
7
|
+
import { WithPermissionContainer } from './WithPermission';
|
|
8
8
|
import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
|
|
9
|
-
const LoadingComponent = () => (
|
|
10
|
-
// <SafeAreaView flex={1}>
|
|
11
|
-
React.createElement(Center, { flex: 1, justifyContent: 'center', alignItems: 'center' }, React.createElement(Spinner, { color: '$blue500' }))
|
|
12
|
-
// </SafeAreaView>
|
|
13
|
-
);
|
|
9
|
+
const LoadingComponent = () => (React.createElement(Center, { flex: 1, justifyContent: 'center', alignItems: 'center' }, React.createElement(Spinner, { color: '$blue500' })));
|
|
14
10
|
const LifecycleComponent = ({ children }) => {
|
|
15
11
|
const { authenticated } = isUserAuthenticated();
|
|
16
12
|
if (authenticated) {
|
|
@@ -26,7 +22,6 @@ const IntractionComponent = ({ children, interationTime }) => {
|
|
|
26
22
|
if (interationTime)
|
|
27
23
|
setInteractionsTimeOut(interationTime);
|
|
28
24
|
}, [interationTime]);
|
|
29
|
-
// console.log('interactionsComplete', interactionsComplete);
|
|
30
25
|
return (React.createElement(React.Fragment, null, interactionsComplete ? ({ children }) : (React.createElement(Animated.View, { style: {
|
|
31
26
|
flex: 1,
|
|
32
27
|
opacity: opacity.value,
|
|
@@ -40,7 +35,6 @@ const IntractionWithLifeCycleComponent = ({ children, interationTime }) => {
|
|
|
40
35
|
if (interationTime)
|
|
41
36
|
setInteractionsTimeOut(interationTime);
|
|
42
37
|
}, [interationTime]);
|
|
43
|
-
// console.log('interactionsComplete', interactionsComplete);
|
|
44
38
|
return (React.createElement(React.Fragment, null, interactionsComplete ? (React.createElement(LifecycleComponent, null, children)) : (React.createElement(Animated.View, { style: {
|
|
45
39
|
flex: 1,
|
|
46
40
|
opacity: opacity.value,
|
|
@@ -49,12 +43,12 @@ const IntractionWithLifeCycleComponent = ({ children, interationTime }) => {
|
|
|
49
43
|
React.createElement(LoadingComponent, null)))));
|
|
50
44
|
};
|
|
51
45
|
export function withInteractionsManaged(component, interationTime, permissionKeys = null) {
|
|
52
|
-
return (React.createElement(React.Fragment, null, Platform.OS === 'ios' ? (React.createElement(React.Fragment, null, component)) : (React.createElement(IntractionComponent, { interationTime: interationTime }, component))));
|
|
46
|
+
return (React.createElement(React.Fragment, null, Platform.OS === 'ios' ? (React.createElement(React.Fragment, null, permissionKeys ? (React.createElement(WithPermissionContainer, { permissionKeys: permissionKeys }, component)) : (React.createElement(React.Fragment, null, component)))) : (React.createElement(IntractionComponent, { interationTime: interationTime }, permissionKeys ? (React.createElement(WithPermissionContainer, { permissionKeys: permissionKeys }, component)) : (React.createElement(React.Fragment, null, component))))));
|
|
53
47
|
}
|
|
54
48
|
export function withLifeCycleInteractionsManaged(component, interationTime, permissionKeys = null) {
|
|
55
|
-
return (React.createElement(React.Fragment, null, Platform.OS === 'ios' ? (React.createElement(LifecycleComponent, null, component)) : (React.createElement(IntractionWithLifeCycleComponent, { interationTime: interationTime }, component))));
|
|
49
|
+
return (React.createElement(React.Fragment, null, Platform.OS === 'ios' ? (React.createElement(LifecycleComponent, null, permissionKeys ? (React.createElement(WithPermissionContainer, { permissionKeys: permissionKeys }, component)) : (React.createElement(React.Fragment, null, component)))) : (React.createElement(IntractionWithLifeCycleComponent, { interationTime: interationTime }, permissionKeys ? (React.createElement(WithPermissionContainer, { permissionKeys: permissionKeys }, component)) : (React.createElement(React.Fragment, null, component))))));
|
|
56
50
|
}
|
|
57
51
|
export function withLifeCycleManaged(component, permissionKeys = null) {
|
|
58
|
-
return (React.createElement(LifecycleComponent, null, component));
|
|
52
|
+
return (React.createElement(LifecycleComponent, null, permissionKeys ? (React.createElement(WithPermissionContainer, { permissionKeys: permissionKeys }, component)) : (React.createElement(React.Fragment, null, component))));
|
|
59
53
|
}
|
|
60
54
|
//# sourceMappingURL=with-interactions-lifecycle-managed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"with-interactions-lifecycle-managed.js","sourceRoot":"","sources":["../../src/components/with-interactions-lifecycle-managed.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"with-interactions-lifecycle-managed.js","sourceRoot":"","sources":["../../src/components/with-interactions-lifecycle-managed.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@admin-layout/gluestack-ui-mobile",
|
|
3
|
-
"version": "9.0.4-alpha.
|
|
3
|
+
"version": "9.0.4-alpha.46",
|
|
4
4
|
"description": "Glustack-ui for mobile component layout",
|
|
5
5
|
"license": "ISC",
|
|
6
6
|
"author": "CDMBase LLC",
|
|
@@ -42,5 +42,5 @@
|
|
|
42
42
|
"typescript": {
|
|
43
43
|
"definition": "lib/index.d.ts"
|
|
44
44
|
},
|
|
45
|
-
"gitHead": "
|
|
45
|
+
"gitHead": "5664de090cbe6a61d88a1b72c820061e8fb79033"
|
|
46
46
|
}
|
|
@@ -4,6 +4,7 @@ import { cloneDeep, merge } from 'lodash-es';
|
|
|
4
4
|
import React, { MutableRefObject, ReactElement, useRef } from 'react';
|
|
5
5
|
import { useDispatch, useSelector } from 'react-redux';
|
|
6
6
|
import { navigationRef } from '@common-stack/client-react';
|
|
7
|
+
import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
|
|
7
8
|
|
|
8
9
|
interface INavigationContainerComponentProps {
|
|
9
10
|
children: ReactElement[];
|
|
@@ -51,6 +52,7 @@ export const configurableRoutesWithNavigationRouteName = (
|
|
|
51
52
|
|
|
52
53
|
export const useLocationChange = () => {
|
|
53
54
|
const dispatch = useDispatch();
|
|
55
|
+
const { authenticated } = isUserAuthenticated();
|
|
54
56
|
const [locationChange, setLocationChange] = React.useState<any>(null);
|
|
55
57
|
const platformState = useSelector((state) => (state as any).platform);
|
|
56
58
|
|
|
@@ -64,11 +66,14 @@ export const useLocationChange = () => {
|
|
|
64
66
|
const configuredRoutes = configurableRoutesWithNavigationRouteName(configurableRoutes);
|
|
65
67
|
const currentPath = currentRouteName ? getPath(currentRouteName as string, configuredRoutes) : null;
|
|
66
68
|
const previousPath = previousRoute ? getPath(previousRoute?.current!.name, configuredRoutes) : null;
|
|
69
|
+
const currentOrgName = authenticated
|
|
70
|
+
? orgName
|
|
71
|
+
? orgName
|
|
72
|
+
: currentRoute!.params?.orgName || platformState?.orgName || previousRoute?.current?.params?.orgName
|
|
73
|
+
: null;
|
|
67
74
|
const currParams = {
|
|
68
75
|
...(currentRoute!.params || {}),
|
|
69
|
-
orgName:
|
|
70
|
-
? orgName
|
|
71
|
-
: currentRoute!.params?.orgName || platformState?.orgName || previousRoute?.current?.params?.orgName,
|
|
76
|
+
orgName: currentOrgName,
|
|
72
77
|
};
|
|
73
78
|
|
|
74
79
|
navigationRef?.setParams(currParams);
|
|
@@ -30,16 +30,13 @@ export const WithPermission = ({
|
|
|
30
30
|
alternative,
|
|
31
31
|
render,
|
|
32
32
|
}: IWithPermissionProps) => {
|
|
33
|
-
const { data: permissions, loading: permissionLoading
|
|
34
|
-
const { authenticated } = isUserAuthenticated();
|
|
33
|
+
const { data: permissions, loading: permissionLoading } = usePermissionAutoFetch();
|
|
35
34
|
|
|
36
35
|
const hasPermission = React.useMemo(() => {
|
|
37
|
-
// const permissionData = {...permissions?.resolveConfiguration,account:{...permissions?.resolveConfiguration?.account,user:{...permissions?.resolveConfiguration?.account?.user,secure:authenticated ? 'Allow' : 'Deny'}}};
|
|
38
36
|
return permissionKeys.some((key) => permissionTypes.includes(get(permissions?.resolveConfiguration, key)));
|
|
39
37
|
}, [permissions, permissionTypes, permissionKeys]);
|
|
40
38
|
|
|
41
39
|
console.log('hasPermission', hasPermission);
|
|
42
|
-
console.log('permissionKeys', permissionKeys);
|
|
43
40
|
console.log('permissions', JSON.stringify(permissions));
|
|
44
41
|
|
|
45
42
|
if (permissionLoading) {
|
|
@@ -1,20 +1,38 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
2
|
import { IResourceAuthority, IConfigFragmentName } from '@adminide-stack/core';
|
|
3
3
|
import { useGetTeamContextQuery } from '@adminide-stack/platform-client';
|
|
4
|
+
import { generateOrgUri } from '@adminide-stack/core/lib/utils/generate-uri.js';
|
|
5
|
+
import { useSelector } from 'react-redux';
|
|
6
|
+
import { navigationRef } from '@common-stack/client-react';
|
|
4
7
|
import { useSetting } from './useSetting';
|
|
5
8
|
|
|
6
9
|
interface userPermissionAutoFetchProps {
|
|
7
10
|
configKey?: string;
|
|
8
11
|
}
|
|
9
12
|
export const usePermissionAutoFetch = (options?: userPermissionAutoFetchProps) => {
|
|
13
|
+
const [orgName, setOrgName] = React.useState<any>(null);
|
|
14
|
+
const [orgUri, setOrgUri] = React.useState<any>(null);
|
|
15
|
+
const platformState = useSelector((state) => (state as any).platform);
|
|
16
|
+
const currentRoute: any = navigationRef.isReady() ? navigationRef?.getCurrentRoute() : null;
|
|
10
17
|
const { data, loading } = useGetTeamContextQuery();
|
|
11
18
|
const teamData = React.useMemo(() => data?.getTeamContext, [data]);
|
|
12
|
-
|
|
19
|
+
React.useEffect(() => {
|
|
20
|
+
if (currentRoute?.params?.orgName || platformState?.orgName) {
|
|
21
|
+
const org = currentRoute?.params?.orgName || platformState?.orgName;
|
|
22
|
+
if (org !== orgName) {
|
|
23
|
+
setOrgName(org);
|
|
24
|
+
}
|
|
25
|
+
}
|
|
26
|
+
if (orgName) {
|
|
27
|
+
const orgUri = generateOrgUri(orgName, IConfigFragmentName.Settings);
|
|
28
|
+
setOrgUri(orgUri);
|
|
29
|
+
}
|
|
30
|
+
}, [currentRoute, platformState, orgName]);
|
|
13
31
|
|
|
14
32
|
const { loading: settingLoading, ...remaining } = useSetting({
|
|
15
33
|
configKey: options?.configKey || '',
|
|
16
34
|
overrides: {
|
|
17
|
-
resource: teamData?.teamUri ??
|
|
35
|
+
resource: teamData?.teamUri ?? orgUri,
|
|
18
36
|
},
|
|
19
37
|
options: {
|
|
20
38
|
forceExist: false,
|
|
@@ -22,6 +40,5 @@ export const usePermissionAutoFetch = (options?: userPermissionAutoFetchProps) =
|
|
|
22
40
|
fragment: IConfigFragmentName.Roles,
|
|
23
41
|
},
|
|
24
42
|
});
|
|
25
|
-
console.log('---remaining', JSON.stringify(remaining?.data));
|
|
26
43
|
return { ...remaining, loading: loading || settingLoading };
|
|
27
44
|
};
|
|
@@ -47,7 +47,6 @@ interface IResponse extends QueryResult<IResolveConfigurationQuery, IResolveConf
|
|
|
47
47
|
export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
|
|
48
48
|
const { overrides, configKey, options, skip = false } = settingsVariable;
|
|
49
49
|
const targetResource = overrides?.resource ?? null;
|
|
50
|
-
console.log('---targetResource', targetResource);
|
|
51
50
|
let prefLoaded = false;
|
|
52
51
|
const {
|
|
53
52
|
data: prefData,
|
|
@@ -56,14 +55,13 @@ export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
|
|
|
56
55
|
refetch: refetchPrefData,
|
|
57
56
|
} = useOpenPreferencesSettingsQuery({
|
|
58
57
|
variables: { resource: targetResource, options },
|
|
59
|
-
fetchPolicy: 'cache-
|
|
58
|
+
fetchPolicy: 'cache-first', // to make `{always: true}` to work
|
|
60
59
|
skip: prefLoaded,
|
|
61
60
|
});
|
|
62
61
|
React.useEffect(() => {
|
|
63
62
|
refetchPrefData({ resource: targetResource, options });
|
|
64
63
|
}, [targetResource]);
|
|
65
64
|
prefLoaded = perfLoading || skip;
|
|
66
|
-
console.log('---prefData', prefData);
|
|
67
65
|
const [updateConfigurationMutation] = useUpdateConfigurationMutation();
|
|
68
66
|
const modifiedOverrides = {
|
|
69
67
|
...overrides,
|
|
@@ -84,7 +82,6 @@ export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
|
|
|
84
82
|
fetchPolicy: 'cache-and-network', // to make `{always: true}` to work
|
|
85
83
|
skip: prefLoaded || !!prefError || !prefData?.openPreferencesSettings?.editableSettingsInput,
|
|
86
84
|
});
|
|
87
|
-
|
|
88
85
|
React.useEffect(() => {
|
|
89
86
|
remaining?.refetch({
|
|
90
87
|
input: prefData?.openPreferencesSettings ?? null,
|
|
@@ -98,9 +95,6 @@ export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
|
|
|
98
95
|
loading = false;
|
|
99
96
|
}
|
|
100
97
|
const error = settingError || prefError;
|
|
101
|
-
console.log('---error', error);
|
|
102
|
-
console.log('---settingError', settingError);
|
|
103
|
-
console.log('---prefError', prefError);
|
|
104
98
|
if (error) {
|
|
105
99
|
return {
|
|
106
100
|
error,
|
|
@@ -130,7 +124,6 @@ export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
|
|
|
130
124
|
});
|
|
131
125
|
};
|
|
132
126
|
|
|
133
|
-
console.log('--USESetting ', JSON.stringify(settingsData?.resolveConfiguration));
|
|
134
127
|
return {
|
|
135
128
|
data: settingsData,
|
|
136
129
|
loading,
|
|
@@ -1,21 +1,17 @@
|
|
|
1
|
-
import React
|
|
2
|
-
// import { Transition, Transitioning } from 'react-native-reanimated';
|
|
1
|
+
import React from 'react';
|
|
3
2
|
import { Lifecycle } from '../containers/layout/Lifecycle';
|
|
4
3
|
import { LifecyclePhase } from '@workbench-stack/core';
|
|
5
|
-
import Animated
|
|
4
|
+
import Animated from 'react-native-reanimated';
|
|
6
5
|
import { useAfterInteractions } from '../hooks/use-after-interactions';
|
|
7
|
-
import {
|
|
8
|
-
import hoistNonReactStatics from 'hoist-non-react-statics';
|
|
6
|
+
import { Spinner, Center } from '@gluestack-ui/themed';
|
|
9
7
|
import { Platform } from 'react-native';
|
|
10
8
|
import { WithPermissionContainer } from './WithPermission';
|
|
11
9
|
import { isUserAuthenticated } from '@adminide-stack/user-auth0-client';
|
|
12
10
|
|
|
13
11
|
const LoadingComponent = () => (
|
|
14
|
-
// <SafeAreaView flex={1}>
|
|
15
12
|
<Center flex={1} justifyContent={'center'} alignItems={'center'}>
|
|
16
13
|
{<Spinner color={'$blue500'} />}
|
|
17
14
|
</Center>
|
|
18
|
-
// </SafeAreaView>
|
|
19
15
|
);
|
|
20
16
|
|
|
21
17
|
const LifecycleComponent = ({ children }) => {
|
|
@@ -36,7 +32,6 @@ const IntractionComponent = ({ children, interationTime }) => {
|
|
|
36
32
|
React.useEffect(() => {
|
|
37
33
|
if (interationTime) setInteractionsTimeOut(interationTime);
|
|
38
34
|
}, [interationTime]);
|
|
39
|
-
// console.log('interactionsComplete', interactionsComplete);
|
|
40
35
|
return (
|
|
41
36
|
<>
|
|
42
37
|
{interactionsComplete ? (
|
|
@@ -61,7 +56,6 @@ const IntractionWithLifeCycleComponent = ({ children, interationTime }) => {
|
|
|
61
56
|
React.useEffect(() => {
|
|
62
57
|
if (interationTime) setInteractionsTimeOut(interationTime);
|
|
63
58
|
}, [interationTime]);
|
|
64
|
-
// console.log('interactionsComplete', interactionsComplete);
|
|
65
59
|
return (
|
|
66
60
|
<>
|
|
67
61
|
{interactionsComplete ? (
|
|
@@ -86,21 +80,19 @@ export function withInteractionsManaged(component: any, interationTime?: number,
|
|
|
86
80
|
<>
|
|
87
81
|
{Platform.OS === 'ios' ? (
|
|
88
82
|
<>
|
|
89
|
-
{
|
|
90
|
-
{/* {permissionKeys ? (
|
|
83
|
+
{permissionKeys ? (
|
|
91
84
|
<WithPermissionContainer permissionKeys={permissionKeys}>{component}</WithPermissionContainer>
|
|
92
85
|
) : (
|
|
93
|
-
component
|
|
94
|
-
)}
|
|
86
|
+
<>{component}</>
|
|
87
|
+
)}
|
|
95
88
|
</>
|
|
96
89
|
) : (
|
|
97
90
|
<IntractionComponent interationTime={interationTime}>
|
|
98
|
-
{
|
|
99
|
-
{/* {permissionKeys ? (
|
|
91
|
+
{permissionKeys ? (
|
|
100
92
|
<WithPermissionContainer permissionKeys={permissionKeys}>{component}</WithPermissionContainer>
|
|
101
93
|
) : (
|
|
102
|
-
component
|
|
103
|
-
)}
|
|
94
|
+
<>{component}</>
|
|
95
|
+
)}
|
|
104
96
|
</IntractionComponent>
|
|
105
97
|
)}
|
|
106
98
|
</>
|
|
@@ -112,21 +104,19 @@ export function withLifeCycleInteractionsManaged(component: any, interationTime?
|
|
|
112
104
|
<>
|
|
113
105
|
{Platform.OS === 'ios' ? (
|
|
114
106
|
<LifecycleComponent>
|
|
115
|
-
{
|
|
116
|
-
{/* {permissionKeys ? (
|
|
107
|
+
{permissionKeys ? (
|
|
117
108
|
<WithPermissionContainer permissionKeys={permissionKeys}>{component}</WithPermissionContainer>
|
|
118
109
|
) : (
|
|
119
|
-
component
|
|
120
|
-
)}
|
|
110
|
+
<>{component}</>
|
|
111
|
+
)}
|
|
121
112
|
</LifecycleComponent>
|
|
122
113
|
) : (
|
|
123
114
|
<IntractionWithLifeCycleComponent interationTime={interationTime}>
|
|
124
|
-
{
|
|
125
|
-
{/* {permissionKeys ? (
|
|
115
|
+
{permissionKeys ? (
|
|
126
116
|
<WithPermissionContainer permissionKeys={permissionKeys}>{component}</WithPermissionContainer>
|
|
127
117
|
) : (
|
|
128
|
-
component
|
|
129
|
-
)}
|
|
118
|
+
<>{component}</>
|
|
119
|
+
)}
|
|
130
120
|
</IntractionWithLifeCycleComponent>
|
|
131
121
|
)}
|
|
132
122
|
</>
|
|
@@ -136,12 +126,11 @@ export function withLifeCycleInteractionsManaged(component: any, interationTime?
|
|
|
136
126
|
export function withLifeCycleManaged(component: any, permissionKeys = null) {
|
|
137
127
|
return (
|
|
138
128
|
<LifecycleComponent>
|
|
139
|
-
{
|
|
140
|
-
{/* {permissionKeys ? (
|
|
129
|
+
{permissionKeys ? (
|
|
141
130
|
<WithPermissionContainer permissionKeys={permissionKeys}>{component}</WithPermissionContainer>
|
|
142
131
|
) : (
|
|
143
|
-
component
|
|
144
|
-
)}
|
|
132
|
+
<>{component}</>
|
|
133
|
+
)}
|
|
145
134
|
</LifecycleComponent>
|
|
146
135
|
);
|
|
147
136
|
}
|