@admin-layout/gluestack-ui-mobile 12.2.4-alpha.81 → 12.2.4-alpha.86

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [12.2.4-alpha.86](https://github.com/CDEBase/admin-layout/compare/v12.2.4-alpha.85...v12.2.4-alpha.86) (2026-07-10)
+
+**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
+
+## [12.2.4-alpha.85](https://github.com/CDEBase/admin-layout/compare/v12.2.4-alpha.84...v12.2.4-alpha.85) (2026-07-01)
+
+**Note:** Version bump only for package @admin-layout/gluestack-ui-mobile
+
 ## [12.2.4-alpha.81](https://github.com/CDEBase/admin-layout/compare/v12.2.4-alpha.80...v12.2.4-alpha.81) (2026-06-29)
 
 **Note:** Version bump only for package @admin-layout/gluestack-ui-mobile

package/lib/components/usePermissionAutoFetch.d.ts

@@ -2,62 +2,10 @@ interface userPermissionAutoFetchProps {
     configKey?: string;
 }
 export declare const usePermissionAutoFetch: (options?: userPermissionAutoFetchProps) => {
+    permissions: any;
+    data: {
+        resolveConfiguration: any;
+    };
     loading: boolean;
-    preferencesInput?: import("common").IPreferencesInput;
-    updateConfiguration?: ({ updateKey, value, updateOverrides, target, }: {
-        updateKey?: string;
-        value: string | boolean | number;
-        updateOverrides?: import("common").IConfigurationOverridesInput;
-        target?: import("common").ConfigurationTarget;
-    }) => Promise<import("graphql").ExecutionResult<import("common").IUpdateConfigurationMutation>>;
-    client: import("@apollo/client").ApolloClient<any>;
-    observable: import("@apollo/client").ObservableQuery<import("common").IResolveConfigurationQuery, import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>>;
-    data: import("common").IResolveConfigurationQuery;
-    previousData?: import("common").IResolveConfigurationQuery;
-    error?: import("@apollo/client").ApolloError;
-    errors?: ReadonlyArray<import("graphql").GraphQLFormattedError>;
-    networkStatus: import("@apollo/client").NetworkStatus;
-    called: boolean;
-    startPolling: (pollInterval: number) => void;
-    stopPolling: () => void;
-    subscribeToMore: import("@apollo/client").SubscribeToMoreFunction<import("common").IResolveConfigurationQuery, import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>>;
-    updateQuery: (mapFn: import("@apollo/client").UpdateQueryMapFn<import("common").IResolveConfigurationQuery, import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>>) => void;
-    refetch: (variables?: Partial<import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>>) => Promise<import("@apollo/client").ApolloQueryResult<import("common").IResolveConfigurationQuery>>;
-    reobserve: (newOptions?: Partial<import("@apollo/client").WatchQueryOptions<import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>, import("common").IResolveConfigurationQuery>>, newNetworkStatus?: import("@apollo/client").NetworkStatus) => Promise<import("@apollo/client").ApolloQueryResult<import("common").IResolveConfigurationQuery>>;
-    variables: import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>;
-    fetchMore: <TFetchData = import("common").IResolveConfigurationQuery, TFetchVars extends import("@apollo/client").OperationVariables = import("common").Exact<{
-        input: import("common").IPreferencesInputInput;
-        key?: import("common").InputMaybe<import("common").Scalars["String"]["input"]>;
-        overrides?: import("common").InputMaybe<import("common").IConfigurationOverridesInput>;
-    }>>(fetchMoreOptions: import("@apollo/client").FetchMoreQueryOptions<TFetchVars, TFetchData> & {
-        updateQuery?: (previousQueryResult: import("common").IResolveConfigurationQuery, options: {
-            fetchMoreResult: import("@apollo/client").Unmasked<TFetchData>;
-            variables: TFetchVars;
-        }) => import("common").IResolveConfigurationQuery;
-    }) => Promise<import("@apollo/client").ApolloQueryResult<TFetchData>>;
 };
 export {};

package/lib/components/usePermissionAutoFetch.js

@@ -1,23 +1,11 @@
-import { ResourceAuthority, ConfigFragmentName } from 'common';
-import { generateUserUri } from '@adminide-stack/core';
-import { useGetContextDataQuery } from 'common/lib/generated/generated.js';
-import { useSetting } from './useSetting';
+import { usePermissionAutoFetch as usePlatformPermissionAutoFetch } from '@adminide-stack/platform-client';
 export const usePermissionAutoFetch = (options) => {
-    const { data, loading } = useGetContextDataQuery();
-    const { orgResource, userId } = data?.getContextData || {};
-    let resource = orgResource || (userId ? generateUserUri({ _id: userId }) : generateUserUri({ _id: 'guest' }));
-    const { loading: settingLoading, ...remaining } = useSetting({
-        configKey: options?.configKey || '',
-        overrides: {
-            resource: resource,
-        },
-        options: {
-            forceExist: false,
-            authority: ResourceAuthority.Defaultpermissions,
-            fragment: ConfigFragmentName.Roles,
-        },
-    });
-    return { ...remaining, loading: loading || settingLoading };
+    const { permissions, loading } = usePlatformPermissionAutoFetch(options);
+    return {
+        permissions,
+        data: permissions === undefined ? undefined : { resolveConfiguration: permissions },
+        loading,
+    };
 };
 // import React from 'react';
 // import { ResourceAuthority, ConfigFragmentName } from '@adminide-stack/core';

package/lib/components/usePermissionAutoFetch.js.map

@@ -1 +1 @@
-{"version":3,"file":"usePermissionAutoFetch.js","sourceRoot":"","sources":["../../src/components/usePermissionAutoFetch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAY,MAAM,QAAQ,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,sBAAsB,EAAE,MAAM,mCAAmC,CAAC;AAC3E,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAM1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsC,EAAE,EAAE;IAC7E,MAAM,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,sBAAsB,EAAE,CAAC;IACnD,MAAM,EAAE,WAAW,EAAE,MAAM,EAAE,GAAI,IAAI,EAAE,cAA2B,IAAI,EAAE,CAAC;IAEzE,IAAI,QAAQ,GAAG,WAAW,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC;IAE9G,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,QAA0B;SACvC;QACD,OAAO,EAAE;YACL,UAAU,EAAE,KAAK;YACjB,SAAS,EAAE,iBAAiB,CAAC,kBAAkB;YAC/C,QAAQ,EAAE,kBAAkB,CAAC,KAAK;SACrC;KACJ,CAAC,CAAC;IAEH,OAAO,EAAE,GAAG,SAAS,EAAE,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,CAAC;AAChE,CAAC,CAAC;AAEF,6BAA6B;AAC7B,gFAAgF;AAChF,4EAA4E;AAC5E,mFAAmF;AACnF,6CAA6C;AAC7C,8DAA8D;AAC9D,6CAA6C;AAE7C,2CAA2C;AAC3C,0BAA0B;AAC1B,IAAI;AACJ,sFAAsF;AACtF,+DAA+D;AAC/D,6DAA6D;AAC7D,6EAA6E;AAC7E,mGAAmG;AACnG,0DAA0D;AAC1D,0EAA0E;AAC1E,8BAA8B;AAC9B,yEAAyE;AACzE,mFAAmF;AACnF,qCAAqC;AACrC,mCAAmC;AACnC,gBAAgB;AAChB,YAAY;AACZ,yBAAyB;AACzB,mFAAmF;AACnF,iCAAiC;AACjC,YAAY;AACZ,kDAAkD;AAElD,qEAAqE;AACrE,+CAA+C;AAC/C,uBAAuB;AACvB,qDAAqD;AACrD,aAAa;AACb,qBAAqB;AACrB,iCAAiC;AACjC,+DAA+D;AAC/D,kDAAkD;AAClD,aAAa;AACb,UAAU;AACV,mEAAmE;AACnE,KAAK"}
+{"version":3,"file":"usePermissionAutoFetch.js","sourceRoot":"","sources":["../../src/components/usePermissionAutoFetch.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,IAAI,8BAA8B,EAAE,MAAM,iCAAiC,CAAC;AAK3G,MAAM,CAAC,MAAM,sBAAsB,GAAG,CAAC,OAAsC,EAAE,EAAE;IAC7E,MAAM,EAAE,WAAW,EAAE,OAAO,EAAE,GAAG,8BAA8B,CAAC,OAAO,CAAC,CAAC;IAEzE,OAAO;QACH,WAAW;QACX,IAAI,EAAE,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,WAAW,EAAE;QACnF,OAAO;KACV,CAAC;AACN,CAAC,CAAC;AAEF,6BAA6B;AAC7B,gFAAgF;AAChF,4EAA4E;AAC5E,mFAAmF;AACnF,6CAA6C;AAC7C,8DAA8D;AAC9D,6CAA6C;AAE7C,2CAA2C;AAC3C,0BAA0B;AAC1B,IAAI;AACJ,sFAAsF;AACtF,+DAA+D;AAC/D,6DAA6D;AAC7D,6EAA6E;AAC7E,mGAAmG;AACnG,0DAA0D;AAC1D,0EAA0E;AAC1E,8BAA8B;AAC9B,yEAAyE;AACzE,mFAAmF;AACnF,qCAAqC;AACrC,mCAAmC;AACnC,gBAAgB;AAChB,YAAY;AACZ,yBAAyB;AACzB,mFAAmF;AACnF,iCAAiC;AACjC,YAAY;AACZ,kDAAkD;AAElD,qEAAqE;AACrE,+CAA+C;AAC/C,uBAAuB;AACvB,qDAAqD;AACrD,aAAa;AACb,qBAAqB;AACrB,iCAAiC;AACjC,+DAA+D;AAC/D,kDAAkD;AAClD,aAAa;AACb,UAAU;AACV,mEAAmE;AACnE,KAAK"}

package/lib/components/useSetting.d.ts

@@ -1,21 +1,26 @@
-import type { IResolveConfigurationQuery, IResolveConfigurationQueryVariables, IPreferencesInput, IPreferencesOpenOptionsInput, IUpdateConfigurationMutation, IConfigurationOverridesInput } from 'common';
+import type { IConfigurationsFlattenedKeys, IPreferencesInput, IPreferencesOpenOptionsInput, IConfigurationOverridesInput } from 'common';
 import { ConfigurationTarget } from 'common';
-import { QueryResult } from '@apollo/client/react';
-import { ExecutionResult } from 'graphql';
 export interface ISettingsVariable {
     overrides?: IConfigurationOverridesInput;
-    configKey: string;
+    configKey: IConfigurationsFlattenedKeys;
     options?: IPreferencesOpenOptionsInput;
     skip?: boolean;
 }
-interface IResponse extends QueryResult<IResolveConfigurationQuery, IResolveConfigurationQueryVariables> {
+interface IResponse {
+    data?: {
+        resolveConfiguration?: unknown;
+    };
+    loading: boolean;
+    error?: unknown;
     preferencesInput?: IPreferencesInput;
     updateConfiguration?: ({ updateKey, value, updateOverrides, target, }: {
         updateKey?: string;
         value: string | boolean | number;
         updateOverrides?: IConfigurationOverridesInput;
         target?: ConfigurationTarget;
-    }) => Promise<ExecutionResult<IUpdateConfigurationMutation>>;
+    }) => Promise<unknown>;
+    refetch?: Function;
+    [key: string]: unknown;
 }
 /**
  * Provides configuration for Organization and OrganizationResources. By default, it provides Organization configuration.

package/lib/components/useSetting.js

@@ -1,87 +1,22 @@
-import React from 'react';
-import { omitBy, isNil } from 'lodash-es';
-import { useResolveConfigurationQuery, useOpenPreferencesSettingsQuery, useUpdateConfigurationMutation, } from 'common/lib/generated/generated.js';
+import { useSetting as usePlatformSetting } from '@adminide-stack/platform-client';
 /**
  * Provides configuration for Organization and OrganizationResources. By default, it provides Organization configuration.
  * If you need `resource` level configuration then, you need to provide resource URI in `overrides`.
  * @param baseOptions
  */
 export const useSetting = (settingsVariable) => {
-    const { overrides, configKey, options, skip = false } = settingsVariable;
-    const targetResource = overrides?.resource ?? null;
-    let prefLoaded = false;
-    const { data: prefData, error: prefError, loading: perfLoading, refetch: refetchPrefData, } = useOpenPreferencesSettingsQuery({
-        variables: { resource: targetResource, options },
-        fetchPolicy: 'cache-first', // to make `{always: true}` to work
-        skip: prefLoaded,
-    });
-    React.useEffect(() => {
-        refetchPrefData({ resource: targetResource, options });
-    }, [targetResource]);
-    prefLoaded = perfLoading || skip;
-    const [updateConfigurationMutation] = useUpdateConfigurationMutation();
-    const modifiedOverrides = {
-        ...overrides,
-        resource: targetResource ? prefData?.openPreferencesSettings?.editableSettingsInput ?? null : null,
-    };
-    const defaultOverrides = omitBy(modifiedOverrides, isNil);
-    let { data: settingsData, error: settingError, loading: settingLoading, ...remaining } = useResolveConfigurationQuery({
-        variables: {
-            input: prefData?.openPreferencesSettings ?? null,
-            key: configKey,
-            overrides: defaultOverrides,
-        },
-        fetchPolicy: 'cache-and-network', // to make `{always: true}` to work
-        skip: prefLoaded || !!prefError || !prefData?.openPreferencesSettings?.editableSettingsInput,
-    });
-    React.useEffect(() => {
-        remaining?.refetch({
-            input: prefData?.openPreferencesSettings ?? null,
-            key: configKey,
-            overrides: defaultOverrides,
-        });
-    }, [prefData]);
-    let loading = true;
-    if (!settingLoading && !prefLoaded) {
-        loading = false;
-    }
-    const error = settingError || prefError;
-    if (error) {
-        return {
-            error,
-            data: undefined,
-            loading: false,
-            ...remaining,
-        };
-    }
-    if (loading) {
-        return {
-            error,
-            data: undefined,
-            loading,
-            ...remaining,
-        };
-    }
-    const updateConfiguration = ({ value, updateKey, updateOverrides, target }) => {
-        return updateConfigurationMutation({
-            variables: {
-                key: updateKey || configKey,
-                value,
-                target,
-                overrides: updateOverrides || defaultOverrides,
-                input: prefData?.openPreferencesSettings,
-            },
-        });
-    };
+    const { data, updateConfiguration, ...remaining } = usePlatformSetting(settingsVariable);
     return {
-        data: settingsData,
-        loading,
-        error,
+        data: data === undefined ? undefined : { resolveConfiguration: data },
         ...remaining,
-        preferencesInput: {
-            ...prefData?.openPreferencesSettings,
+        updateConfiguration: ({ value, updateKey, updateOverrides, target }) => {
+            return updateConfiguration?.({
+                value,
+                updateKey,
+                updateOverrides,
+                target,
+            });
         },
-        updateConfiguration,
     };
 };
 //# sourceMappingURL=useSetting.js.map

package/lib/components/useSetting.js.map

@@ -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,mCAAmC,CAAC;AAwB3C;;;;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,IAAI,UAAU,GAAG,KAAK,CAAC;IACvB,MAAM,EACF,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,SAAS,EAChB,OAAO,EAAE,WAAW,EACpB,OAAO,EAAE,eAAe,GAC3B,GAAG,+BAA+B,CAAC;QAChC,SAAS,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE;QAChD,WAAW,EAAE,aAAa,EAAE,mCAAmC;QAC/D,IAAI,EAAE,UAAU;KACnB,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,eAAe,CAAC,EAAE,QAAQ,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC;IAC3D,CAAC,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;IACrB,UAAU,GAAG,WAAW,IAAI,IAAI,CAAC;IACjC,MAAM,CAAC,2BAA2B,CAAC,GAAG,8BAA8B,EAAE,CAAC;IACvE,MAAM,iBAAiB,GAAG;QACtB,GAAG,SAAS;QACZ,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,EAAE,uBAAuB,EAAE,qBAAqB,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI;KACrG,CAAC;IACF,MAAM,gBAAgB,GAAG,MAAM,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;IAC1D,IAAI,EACA,IAAI,EAAE,YAAY,EAClB,KAAK,EAAE,YAAY,EACnB,OAAO,EAAE,cAAc,EACvB,GAAG,SAAS,EACf,GAAG,4BAA4B,CAAC;QAC7B,SAAS,EAAE;YACP,KAAK,EAAE,QAAQ,EAAE,uBAAuB,IAAI,IAAI;YAChD,GAAG,EAAE,SAAS;YACd,SAAS,EAAE,gBAAgB;SAC9B;QACD,WAAW,EAAE,mBAAmB,EAAE,mCAAmC;QACrE,IAAI,EAAE,UAAU,IAAI,CAAC,CAAC,SAAS,IAAI,CAAC,QAAQ,EAAE,uBAAuB,EAAE,qBAAqB;KAC/F,CAAC,CAAC;IACH,KAAK,CAAC,SAAS,CAAC,GAAG,EAAE;QACjB,SAAS,EAAE,OAAO,CAAC;YACf,KAAK,EAAE,QAAQ,EAAE,uBAAuB,IAAI,IAAI;YAChD,GAAG,EAAE,SAAS;YACd,SAAS,EAAE,gBAAgB;SAC9B,CAAC,CAAC;IACP,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,IAAI,OAAO,GAAG,IAAI,CAAC;IACnB,IAAI,CAAC,cAAc,IAAI,CAAC,UAAU,EAAE,CAAC;QACjC,OAAO,GAAG,KAAK,CAAC;IACpB,CAAC;IACD,MAAM,KAAK,GAAG,YAAY,IAAI,SAAS,CAAC;IACxC,IAAI,KAAK,EAAE,CAAC;QACR,OAAO;YACH,KAAK;YACL,IAAI,EAAE,SAAS;YACf,OAAO,EAAE,KAAK;YACd,GAAG,SAAS;SACf,CAAC;IACN,CAAC;IACD,IAAI,OAAO,EAAE,CAAC;QACV,OAAO;YACH,KAAK;YACL,IAAI,EAAE,SAAS;YACf,OAAO;YACP,GAAG,SAAS;SACf,CAAC;IACN,CAAC;IAED,MAAM,mBAAmB,GAAG,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,EAAE;QAC1E,OAAO,2BAA2B,CAAC;YAC/B,SAAS,EAAE;gBACP,GAAG,EAAE,SAAS,IAAI,SAAS;gBAC3B,KAAK;gBACL,MAAM;gBACN,SAAS,EAAE,eAAe,IAAI,gBAAgB;gBAC9C,KAAK,EAAE,QAAQ,EAAE,uBAAuB;aAC3C;SACJ,CAAC,CAAC;IACP,CAAC,CAAC;IAEF,OAAO;QACH,IAAI,EAAE,YAAY;QAClB,OAAO;QACP,KAAK;QACL,GAAG,SAAS;QACZ,gBAAgB,EAAE;YACd,GAAG,QAAQ,EAAE,uBAAuB;SACvC;QACD,mBAAmB;KACf,CAAC;AACb,CAAC,CAAC"}
+{"version":3,"file":"useSetting.js","sourceRoot":"","sources":["../../src/components/useSetting.tsx"],"names":[],"mappings":"AAOA,OAAO,EAAE,UAAU,IAAI,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AA+BnF;;;;GAIG;AACH,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,gBAAmC,EAAa,EAAE;IACzE,MAAM,EAAE,IAAI,EAAE,mBAAmB,EAAE,GAAG,SAAS,EAAE,GAAG,kBAAkB,CAAC,gBAAuB,CAAC,CAAC;IAEhG,OAAO;QACH,IAAI,EAAE,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,oBAAoB,EAAE,IAAI,EAAE;QACrE,GAAG,SAAS;QACZ,mBAAmB,EAAE,CAAC,EAAE,KAAK,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,EAAE,EAAE,EAAE;YACnE,OAAO,mBAAmB,EAAE,CAAC;gBACzB,KAAK;gBACL,SAAS;gBACT,eAAe;gBACf,MAAM;aACT,CAAC,CAAC;QACP,CAAC;KACJ,CAAC;AACN,CAAC,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@admin-layout/gluestack-ui-mobile",
-    "version": "12.2.4-alpha.81",
+    "version": "12.2.4-alpha.86",
     "description": "Glustack-ui for mobile component layout",
     "license": "ISC",
     "author": "CDMBase LLC",
@@ -23,7 +23,7 @@
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@admin-layout/client": "12.2.4-alpha.81",
+        "@admin-layout/client": "12.2.4-alpha.85",
         "@gluestack-style/react": "^1.0.53",
         "@gluestack-ui/config": "^1.1.18",
         "@gluestack-ui/nativewind-utils": "^1.0.26",
@@ -36,7 +36,7 @@
     },
     "devDependencies": {
         "@types/react-window": "^1.8.8",
-        "common": "12.2.4-alpha.81"
+        "common": "12.2.4-alpha.85"
     },
     "peerDependencies": {
         "@common-stack/remix-router-redux": "^6.0.2-alpha.2",
@@ -47,7 +47,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "f4dafe8fbfb7cfc04d38694d2158b9826fd50d5c",
+    "gitHead": "353b0d63c41114c730dd0d71276341dcff4f0c7c",
     "typescript": {
         "definition": "lib/index.d.ts"
     }

package/src/components/usePermissionAutoFetch.tsx

@@ -1,31 +1,16 @@
-import { ResourceAuthority, ConfigFragmentName, IContext } from 'common';
-import { generateUserUri } from '@adminide-stack/core';
-import { useGetContextDataQuery } from 'common/lib/generated/generated.js';
-import { useSetting } from './useSetting';
-import type { URI } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';
+import { usePermissionAutoFetch as usePlatformPermissionAutoFetch } from '@adminide-stack/platform-client';
 
 interface userPermissionAutoFetchProps {
     configKey?: string;
 }
 export const usePermissionAutoFetch = (options?: userPermissionAutoFetchProps) => {
-    const { data, loading } = useGetContextDataQuery();
-    const { orgResource, userId } = (data?.getContextData as IContext) || {};
+    const { permissions, loading } = usePlatformPermissionAutoFetch(options);
 
-    let resource = orgResource || (userId ? generateUserUri({ _id: userId }) : generateUserUri({ _id: 'guest' }));
-
-    const { loading: settingLoading, ...remaining } = useSetting({
-        configKey: options?.configKey || '',
-        overrides: {
-            resource: resource as unknown as URI,
-        },
-        options: {
-            forceExist: false,
-            authority: ResourceAuthority.Defaultpermissions,
-            fragment: ConfigFragmentName.Roles,
-        },
-    });
-
-    return { ...remaining, loading: loading || settingLoading };
+    return {
+        permissions,
+        data: permissions === undefined ? undefined : { resolveConfiguration: permissions },
+        loading,
+    };
 };
 
 // import React from 'react';

package/src/components/useSetting.tsx

@@ -1,30 +1,25 @@
-import React from 'react';
 import type {
-    IResolveConfigurationQuery,
-    IResolveConfigurationQueryVariables,
+    IConfigurationsFlattenedKeys,
     IPreferencesInput,
     IPreferencesOpenOptionsInput,
-    IUpdateConfigurationMutation,
     IConfigurationOverridesInput,
 } from 'common';
 import { ConfigurationTarget } from 'common';
-import { QueryResult } from '@apollo/client/react';
-import { omitBy, isNil } from 'lodash-es';
-import { ExecutionResult } from 'graphql';
-import {
-    useResolveConfigurationQuery,
-    useOpenPreferencesSettingsQuery,
-    useUpdateConfigurationMutation,
-} from 'common/lib/generated/generated.js';
+import { useSetting as usePlatformSetting } from '@adminide-stack/platform-client';
 
 export interface ISettingsVariable {
     overrides?: IConfigurationOverridesInput;
-    configKey: string;
+    configKey: IConfigurationsFlattenedKeys;
     options?: IPreferencesOpenOptionsInput;
     skip?: boolean;
 }
 
-interface IResponse extends QueryResult<IResolveConfigurationQuery, IResolveConfigurationQueryVariables> {
+interface IResponse {
+    data?: {
+        resolveConfiguration?: unknown;
+    };
+    loading: boolean;
+    error?: unknown;
     preferencesInput?: IPreferencesInput;
     updateConfiguration?: ({
         updateKey,
@@ -36,7 +31,9 @@ interface IResponse extends QueryResult<IResolveConfigurationQuery, IResolveConf
         value: string | boolean | number;
         updateOverrides?: IConfigurationOverridesInput;
         target?: ConfigurationTarget;
-    }) => Promise<ExecutionResult<IUpdateConfigurationMutation>>;
+    }) => Promise<unknown>;
+    refetch?: Function;
+    [key: string]: unknown;
 }
 
 /**
@@ -45,93 +42,18 @@ interface IResponse extends QueryResult<IResolveConfigurationQuery, IResolveConf
  * @param baseOptions
  */
 export const useSetting = (settingsVariable: ISettingsVariable): IResponse => {
-    const { overrides, configKey, options, skip = false } = settingsVariable;
-    const targetResource = overrides?.resource ?? null;
-    let prefLoaded = false;
-    const {
-        data: prefData,
-        error: prefError,
-        loading: perfLoading,
-        refetch: refetchPrefData,
-    } = useOpenPreferencesSettingsQuery({
-        variables: { resource: targetResource, options },
-        fetchPolicy: 'cache-first', // to make `{always: true}` to work
-        skip: prefLoaded,
-    });
-    React.useEffect(() => {
-        refetchPrefData({ resource: targetResource, options });
-    }, [targetResource]);
-    prefLoaded = perfLoading || skip;
-    const [updateConfigurationMutation] = useUpdateConfigurationMutation();
-    const modifiedOverrides = {
-        ...overrides,
-        resource: targetResource ? prefData?.openPreferencesSettings?.editableSettingsInput ?? null : null,
-    };
-    const defaultOverrides = omitBy(modifiedOverrides, isNil);
-    let {
-        data: settingsData,
-        error: settingError,
-        loading: settingLoading,
-        ...remaining
-    } = useResolveConfigurationQuery({
-        variables: {
-            input: prefData?.openPreferencesSettings ?? null,
-            key: configKey,
-            overrides: defaultOverrides,
-        },
-        fetchPolicy: 'cache-and-network', // to make `{always: true}` to work
-        skip: prefLoaded || !!prefError || !prefData?.openPreferencesSettings?.editableSettingsInput,
-    });
-    React.useEffect(() => {
-        remaining?.refetch({
-            input: prefData?.openPreferencesSettings ?? null,
-            key: configKey,
-            overrides: defaultOverrides,
-        });
-    }, [prefData]);
-
-    let loading = true;
-    if (!settingLoading && !prefLoaded) {
-        loading = false;
-    }
-    const error = settingError || prefError;
-    if (error) {
-        return {
-            error,
-            data: undefined,
-            loading: false,
-            ...remaining,
-        };
-    }
-    if (loading) {
-        return {
-            error,
-            data: undefined,
-            loading,
-            ...remaining,
-        };
-    }
-
-    const updateConfiguration = ({ value, updateKey, updateOverrides, target }) => {
-        return updateConfigurationMutation({
-            variables: {
-                key: updateKey || configKey,
-                value,
-                target,
-                overrides: updateOverrides || defaultOverrides,
-                input: prefData?.openPreferencesSettings,
-            },
-        });
-    };
+    const { data, updateConfiguration, ...remaining } = usePlatformSetting(settingsVariable as any);
 
     return {
-        data: settingsData,
-        loading,
-        error,
+        data: data === undefined ? undefined : { resolveConfiguration: data },
         ...remaining,
-        preferencesInput: {
-            ...prefData?.openPreferencesSettings,
+        updateConfiguration: ({ value, updateKey, updateOverrides, target }) => {
+            return updateConfiguration?.({
+                value,
+                updateKey,
+                updateOverrides,
+                target,
+            });
         },
-        updateConfiguration,
-    } as any;
+    };
 };