@axelor/aos-mobile-core 8.3.7 → 8.3.9
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/lib/app/ContextedApplication.js +6 -1
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/app/context.helper.js +20 -1
- package/lib/app/context.helper.js.map +1 -1
- package/lib/components/templates/PeriodInput/PeriodInput.d.ts +2 -1
- package/lib/components/templates/PeriodInput/PeriodInput.js +3 -2
- package/lib/components/templates/PeriodInput/PeriodInput.js.map +1 -1
- package/lib/features/appConfigSlice.d.ts +3 -2
- package/lib/features/appConfigSlice.js +13 -2
- package/lib/features/appConfigSlice.js.map +1 -1
- package/lib/features/authSlice.js +5 -4
- package/lib/features/authSlice.js.map +1 -1
- package/lib/hooks/index.d.ts +1 -1
- package/lib/hooks/index.js +1 -1
- package/lib/hooks/index.js.map +1 -1
- package/lib/hooks/use-navigation.d.ts +1 -0
- package/lib/hooks/use-navigation.js +4 -0
- package/lib/hooks/use-navigation.js.map +1 -1
- package/lib/navigator/ActiveScreenProvider.js +21 -15
- package/lib/navigator/ActiveScreenProvider.js.map +1 -1
- package/lib/navigator/Navigator.js +11 -6
- package/lib/navigator/Navigator.js.map +1 -1
- package/package.json +3 -3
|
@@ -28,6 +28,7 @@ import { Camera, GlobalToolBox, HeaderBandList, Scanner, Toast, } from '../compo
|
|
|
28
28
|
import { RouterProvider } from '../config';
|
|
29
29
|
import { useDispatch } from '../redux/hooks';
|
|
30
30
|
import { setAppVersion } from '../features/authSlice';
|
|
31
|
+
import { resetConfigs } from '../features/appConfigSlice';
|
|
31
32
|
const ContextedApplication = ({ modules, mainMenu, version, configuration, customLoginPage, }) => {
|
|
32
33
|
const dispatch = useDispatch();
|
|
33
34
|
const [, setRefresh] = useState(false);
|
|
@@ -42,6 +43,10 @@ const ContextedApplication = ({ modules, mainMenu, version, configuration, custo
|
|
|
42
43
|
dispatch(setAppVersion({ appVersion: version }));
|
|
43
44
|
}, [dispatch, version]);
|
|
44
45
|
const getActiveUserId = useCallback(() => getActiveUserInfo().then(({ userId }) => userId), []);
|
|
46
|
+
const handleAppRefresh = useCallback(() => {
|
|
47
|
+
dispatch(resetConfigs());
|
|
48
|
+
setRefresh(_current => !_current);
|
|
49
|
+
}, [dispatch]);
|
|
45
50
|
return (<>
|
|
46
51
|
<Camera />
|
|
47
52
|
<Scanner />
|
|
@@ -52,7 +57,7 @@ const ContextedApplication = ({ modules, mainMenu, version, configuration, custo
|
|
|
52
57
|
<LoadingIndicator />
|
|
53
58
|
<BlockInteractionMessage />
|
|
54
59
|
<GlobalToolBox />
|
|
55
|
-
<RootNavigator modules={modules} mainMenu={mainMenu} onRefresh={
|
|
60
|
+
<RootNavigator modules={modules} mainMenu={mainMenu} onRefresh={handleAppRefresh} configuration={configuration} customLoginPage={customLoginPage}/>
|
|
56
61
|
</NavigationContainer>
|
|
57
62
|
</ErrorBoundary>
|
|
58
63
|
<Toast />
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC9D,OAAO,EAAC,mBAAmB,EAAC,MAAM,0BAA0B,CAAC;AAC7D,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,uBAAuB,EAAE,gBAAgB,EAAC,MAAM,uBAAuB,CAAC;AAChF,OAAO,EAAC,aAAa,EAAC,MAAM,0BAA0B,CAAC;AACvD,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,UAAU,MAAM,8BAA8B,CAAC;AACtD,OAAO,EAAC,iBAAiB,EAAC,MAAM,kBAAkB,CAAC;AACnD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,EACL,MAAM,EACN,aAAa,EACb,cAAc,EACd,OAAO,EACP,KAAK,GACN,MAAM,eAAe,CAAC;AACvB,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,OAAO,EAAC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -16,13 +16,32 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { mixed, number, object } from 'yup';
|
|
19
|
+
function deepMergeSchemas(schemaA, schemaB) {
|
|
20
|
+
if (!object().isType(schemaA) || !object().isType(schemaB)) {
|
|
21
|
+
return schemaB ?? schemaA;
|
|
22
|
+
}
|
|
23
|
+
const fieldsA = schemaA.fields;
|
|
24
|
+
const fieldsB = schemaB.fields;
|
|
25
|
+
const mergedFields = { ...fieldsA };
|
|
26
|
+
for (const key in fieldsB) {
|
|
27
|
+
if (fieldsA[key] &&
|
|
28
|
+
object().isType(fieldsA[key]) &&
|
|
29
|
+
object().isType(fieldsB[key])) {
|
|
30
|
+
mergedFields[key] = deepMergeSchemas(fieldsA[key], fieldsB[key]);
|
|
31
|
+
}
|
|
32
|
+
else {
|
|
33
|
+
mergedFields[key] = fieldsB[key];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return object().shape(mergedFields);
|
|
37
|
+
}
|
|
19
38
|
export const addModuleObjectFields = (objectFields, moduleObjects) => {
|
|
20
39
|
const result = { ...objectFields };
|
|
21
40
|
const currentObjects = Object.keys(result);
|
|
22
41
|
const newObjects = Object.keys(moduleObjects);
|
|
23
42
|
newObjects.forEach(_objectKey => {
|
|
24
43
|
if (currentObjects.includes(_objectKey)) {
|
|
25
|
-
result[_objectKey] = result[_objectKey]
|
|
44
|
+
result[_objectKey] = deepMergeSchemas(result[_objectKey], moduleObjects[_objectKey]);
|
|
26
45
|
}
|
|
27
46
|
else {
|
|
28
47
|
result[_objectKey] = object({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../src/app/context.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAS,KAAK,EAAE,MAAM,EAAE,MAAM,EAAC,MAAM,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"context.helper.js","sourceRoot":"","sources":["../../src/app/context.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -11,10 +11,11 @@ interface PeriodInputProps {
|
|
|
11
11
|
style?: any;
|
|
12
12
|
horizontal?: boolean;
|
|
13
13
|
showTitle?: boolean;
|
|
14
|
+
usePopup?: boolean;
|
|
14
15
|
startDateConfig: dateInputConfig;
|
|
15
16
|
endDateConfig: dateInputConfig;
|
|
16
17
|
defaultIntervalHours?: number;
|
|
17
18
|
onPeriodErrorChange?: (isPeriodError: boolean) => void;
|
|
18
19
|
}
|
|
19
|
-
declare const PeriodInput: ({ style, horizontal, showTitle, startDateConfig, endDateConfig, defaultIntervalHours, onPeriodErrorChange, }: PeriodInputProps) => React.JSX.Element;
|
|
20
|
+
declare const PeriodInput: ({ style, horizontal, showTitle, usePopup, startDateConfig, endDateConfig, defaultIntervalHours, onPeriodErrorChange, }: PeriodInputProps) => React.JSX.Element;
|
|
20
21
|
export default PeriodInput;
|
|
@@ -25,7 +25,7 @@ const DATE_INPUT_MODE = {
|
|
|
25
25
|
startDate: 0,
|
|
26
26
|
endDate: 1,
|
|
27
27
|
};
|
|
28
|
-
const PeriodInput = ({ style, horizontal = true, showTitle = true, startDateConfig, endDateConfig, defaultIntervalHours = null, onPeriodErrorChange, }) => {
|
|
28
|
+
const PeriodInput = ({ style, horizontal = true, showTitle = true, usePopup = false, startDateConfig, endDateConfig, defaultIntervalHours = null, onPeriodErrorChange, }) => {
|
|
29
29
|
const I18n = useTranslator();
|
|
30
30
|
const [startDate, setStartDate] = useState(startDateConfig.date);
|
|
31
31
|
const [endDate, setEndDate] = useState(endDateConfig.date);
|
|
@@ -113,7 +113,7 @@ const PeriodInput = ({ style, horizontal = true, showTitle = true, startDateConf
|
|
|
113
113
|
const date = isStartDate ? startDate : endDate;
|
|
114
114
|
const dateConfig = isStartDate ? startDateConfig : endDateConfig;
|
|
115
115
|
const nullable = dateConfig.nullable || dateConfig.nullable == null ? true : false;
|
|
116
|
-
return (<DateInput style={styles.dateInput} title={showTitle && I18n.t(translationKey)} mode={dateConfig.dateInputMode ?? 'date'} nullable={nullable} popup={horizontal} defaultDate={date} onDateChange={_date => handleDateChange(isStartDate, _date)} readonly={dateConfig.readonly} required={dateConfig.required}/>);
|
|
116
|
+
return (<DateInput style={styles.dateInput} title={showTitle && I18n.t(translationKey)} mode={dateConfig.dateInputMode ?? 'date'} nullable={nullable} popup={usePopup || horizontal} defaultDate={date} onDateChange={_date => handleDateChange(isStartDate, _date)} readonly={dateConfig.readonly} required={dateConfig.required}/>);
|
|
117
117
|
}, [
|
|
118
118
|
startDate,
|
|
119
119
|
endDate,
|
|
@@ -122,6 +122,7 @@ const PeriodInput = ({ style, horizontal = true, showTitle = true, startDateConf
|
|
|
122
122
|
styles.dateInput,
|
|
123
123
|
showTitle,
|
|
124
124
|
I18n,
|
|
125
|
+
usePopup,
|
|
125
126
|
horizontal,
|
|
126
127
|
handleDateChange,
|
|
127
128
|
]);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeriodInput.js","sourceRoot":"","sources":["../../../../src/components/templates/PeriodInput/PeriodInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAC,SAAS,EAAC,MAAM,iBAAiB,CAAC;AAC1C,OAAO,EAAC,WAAW,EAAE,aAAa,EAAE,mBAAmB,EAAC,MAAM,gBAAgB,CAAC;AAC/E,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAE5C,MAAM,eAAe,GAAG;IACtB,SAAS,EAAE,CAAC;IACZ,OAAO,EAAE,CAAC;CACX,CAAC;
|
|
1
|
+
{"version":3,"file":"PeriodInput.js","sourceRoot":"","sources":["../../../../src/components/templates/PeriodInput/PeriodInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -8,6 +8,7 @@ export const fetchRequiredConfig: import("@reduxjs/toolkit").AsyncThunk<any[], v
|
|
|
8
8
|
fulfilledMeta?: unknown;
|
|
9
9
|
rejectedMeta?: unknown;
|
|
10
10
|
}>;
|
|
11
|
-
export const
|
|
11
|
+
export const resetConfigs: import("@reduxjs/toolkit").ActionCreatorWithoutPayload<"appConfig/resetConfigs">;
|
|
12
|
+
export const appConfigReducer: import("redux").Reducer<import("immer").WritableDraft<{
|
|
12
13
|
loadingConfig: boolean;
|
|
13
|
-
}
|
|
14
|
+
}>>;
|
|
@@ -40,6 +40,13 @@ const initialState = {
|
|
|
40
40
|
const appConfigSlice = createSlice({
|
|
41
41
|
name: 'appConfig',
|
|
42
42
|
initialState,
|
|
43
|
+
reducers: {
|
|
44
|
+
resetConfigs: state => {
|
|
45
|
+
state.loadingConfig = false;
|
|
46
|
+
state.mobileConfigured = false;
|
|
47
|
+
state.numberConfig = 0;
|
|
48
|
+
},
|
|
49
|
+
},
|
|
43
50
|
extraReducers: builder => {
|
|
44
51
|
builder.addCase(fetchRequiredConfig.pending, state => {
|
|
45
52
|
state.loadingConfig = true;
|
|
@@ -48,10 +55,13 @@ const appConfigSlice = createSlice({
|
|
|
48
55
|
state.loadingConfig = false;
|
|
49
56
|
});
|
|
50
57
|
builder.addCase(fetchRequiredConfig.fulfilled, (state, action) => {
|
|
58
|
+
const configs = action.meta.arg ?? [];
|
|
51
59
|
state.loadingConfig = false;
|
|
52
|
-
|
|
53
|
-
state[formatAppName(
|
|
60
|
+
configs.forEach((name, idx) => {
|
|
61
|
+
state[formatAppName(name)] = action.payload[idx];
|
|
54
62
|
});
|
|
63
|
+
state.mobileConfigured = configs.find(_i => _i === 'AppMobileSettings');
|
|
64
|
+
state.numberConfig = configs.length;
|
|
55
65
|
});
|
|
56
66
|
},
|
|
57
67
|
});
|
|
@@ -59,5 +69,6 @@ const formatAppName = appName => {
|
|
|
59
69
|
const configName = appName.replace('App', '');
|
|
60
70
|
return configName.charAt(0).toLowerCase() + configName.substr(1);
|
|
61
71
|
};
|
|
72
|
+
export const { resetConfigs } = appConfigSlice.actions;
|
|
62
73
|
export const appConfigReducer = appConfigSlice.reducer;
|
|
63
74
|
//# sourceMappingURL=appConfigSlice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"appConfigSlice.js","sourceRoot":"","sources":["../../src/features/appConfigSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,uBAAuB,CAAC;AACrD,OAAO,EAAC,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAEnD,MAAM,WAAW,GAAG,KAAK,EAAE,IAAI,EAAE,EAAC,QAAQ,EAAC,EAAE,EAAE;IAC7C,OAAO,MAAM,cAAc,CAAC;QAC1B,aAAa,EAAE,YAAY;QAC3B,IAAI;QACJ,MAAM,EAAE,oCAAoC;QAC5C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,gBAAgB,CACjD,+BAA+B,EAC/B,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,EAAC,UAAU,EAAC,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,OAAO,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,aAAa,EAAE,KAAK;CACrB,CAAC;AAEF,MAAM,cAAc,GAAG,WAAW,CAAC;IACjC,IAAI,EAAE,WAAW;IACjB,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACnD,KAAK,CAAC,aAAa,GAAG,IAAI,CAAC;QAC7B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YACpD,KAAK,CAAC,aAAa,GAAG,KAAK,CAAC;QAC9B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,mBAAmB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC/D,
|
|
1
|
+
{"version":3,"file":"appConfigSlice.js","sourceRoot":"","sources":["../../src/features/appConfigSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -19,10 +19,10 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
|
19
19
|
import { ejectAxios, getActiveUserInfo, loginApi, logoutApi, } from '../api/login-api';
|
|
20
20
|
import { apiProviderConfig } from '../apiProviders/config';
|
|
21
21
|
import { saveUrlInStorage } from '../sessions';
|
|
22
|
-
import { checkNullString } from '../utils';
|
|
23
|
-
import { testUrl } from '../utils/api';
|
|
22
|
+
import { checkNullString, testUrl } from '../utils';
|
|
24
23
|
import { modulesProvider } from '../app';
|
|
25
|
-
|
|
24
|
+
import { resetConfigs } from './appConfigSlice';
|
|
25
|
+
export const login = createAsyncThunk('auth/login', async ({ url, username, password, closePopup }, { dispatch }) => {
|
|
26
26
|
const urlWithProtocol = await testUrl(url);
|
|
27
27
|
const { token, jsessionId, requestInterceptorId, responseInterceptorId } = await loginApi(urlWithProtocol, username, password);
|
|
28
28
|
const { userId, applicationMode } = await getActiveUserInfo();
|
|
@@ -30,6 +30,7 @@ export const login = createAsyncThunk('auth/login', async ({ url, username, pass
|
|
|
30
30
|
apiProviderConfig.setSessionExpired(false);
|
|
31
31
|
closePopup?.();
|
|
32
32
|
modulesProvider.getModuleRegisters().forEach(_f => _f(userId));
|
|
33
|
+
dispatch(resetConfigs());
|
|
33
34
|
return {
|
|
34
35
|
url: urlWithProtocol,
|
|
35
36
|
token,
|
|
@@ -47,7 +48,7 @@ export const isUrlValid = createAsyncThunk('auth/isUrlValid', async ({ url }) =>
|
|
|
47
48
|
}
|
|
48
49
|
return url;
|
|
49
50
|
});
|
|
50
|
-
export const logout = createAsyncThunk('auth/logout', async function (
|
|
51
|
+
export const logout = createAsyncThunk('auth/logout', async function (_, { getState }) {
|
|
51
52
|
await logoutApi();
|
|
52
53
|
const { requestInterceptorId, responseInterceptorId } = getState()?.auth;
|
|
53
54
|
ejectAxios({ requestInterceptorId, responseInterceptorId });
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,QAAQ,EACR,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
|
package/lib/hooks/index.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export * from './use-effect-debugger';
|
|
2
|
-
export { useIsFocused, useNavigation, useNavigationRoutes, useStackChecker, } from './use-navigation';
|
|
2
|
+
export { useIsFocused, useIsNavigationRoot, useNavigation, useNavigationRoutes, useStackChecker, } from './use-navigation';
|
|
3
3
|
export { useScanActivator, useScannerDeviceActivator, useCameraScannerActivator, } from './use-scan-activator';
|
|
4
4
|
export { useConfigUpdater, useStorageUpdater } from './use-storage-config';
|
package/lib/hooks/index.js
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
export * from './use-effect-debugger';
|
|
19
|
-
export { useIsFocused, useNavigation, useNavigationRoutes, useStackChecker, } from './use-navigation';
|
|
19
|
+
export { useIsFocused, useIsNavigationRoot, useNavigation, useNavigationRoutes, useStackChecker, } from './use-navigation';
|
|
20
20
|
export { useScanActivator, useScannerDeviceActivator, useCameraScannerActivator, } from './use-scan-activator';
|
|
21
21
|
export { useConfigUpdater, useStorageUpdater } from './use-storage-config';
|
|
22
22
|
//# sourceMappingURL=index.js.map
|
package/lib/hooks/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,uBAAuB,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,aAAa,EACb,mBAAmB,EACnB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,sBAAsB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,uBAAuB,CAAC;AACtC,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,aAAa,EACb,mBAAmB,EACnB,eAAe,GAChB,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EACL,gBAAgB,EAChB,yBAAyB,EACzB,yBAAyB,GAC1B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAC,gBAAgB,EAAE,iBAAiB,EAAC,MAAM,sBAAsB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
export declare const useNavigation: () => any;
|
|
2
2
|
export declare const useIsFocused: () => boolean;
|
|
3
3
|
export declare const useNavigationRoutes: () => any;
|
|
4
|
+
export declare const useIsNavigationRoot: () => any;
|
|
4
5
|
export declare const useStackChecker: () => (name: string) => boolean;
|
|
@@ -26,6 +26,10 @@ export const useIsFocused = () => {
|
|
|
26
26
|
export const useNavigationRoutes = () => {
|
|
27
27
|
return useReactNavigationState(state => state.routes);
|
|
28
28
|
};
|
|
29
|
+
export const useIsNavigationRoot = () => {
|
|
30
|
+
const routes = useNavigationRoutes();
|
|
31
|
+
return useMemo(() => routes?.length <= 1, [routes?.length]);
|
|
32
|
+
};
|
|
29
33
|
export const useStackChecker = () => {
|
|
30
34
|
const routes = useNavigationRoutes();
|
|
31
35
|
const checkScreenMounted = useCallback((name) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"use-navigation.js","sourceRoot":"","sources":["../../src/hooks/use-navigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC3C,OAAO,EACL,aAAa,IAAI,kBAAkB,EACnC,YAAY,IAAI,iBAAiB,EACjC,kBAAkB,IAAI,uBAAuB,GAC9C,MAAM,0BAA0B,CAAC;AAElC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAQ,EAAE;IACrC,OAAO,kBAAkB,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAY,EAAE;IACxC,OAAO,iBAAiB,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAQ,EAAE;IAC3C,OAAO,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,GAAgC,EAAE;IAC/D,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,IAAY,EAAE,EAAE;QACf,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC1D,CAAC,EACD,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"use-navigation.js","sourceRoot":"","sources":["../../src/hooks/use-navigation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC3C,OAAO,EACL,aAAa,IAAI,kBAAkB,EACnC,YAAY,IAAI,iBAAiB,EACjC,kBAAkB,IAAI,uBAAuB,GAC9C,MAAM,0BAA0B,CAAC;AAElC,MAAM,CAAC,MAAM,aAAa,GAAG,GAAQ,EAAE;IACrC,OAAO,kBAAkB,EAAE,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,YAAY,GAAG,GAAY,EAAE;IACxC,OAAO,iBAAiB,EAAE,CAAC;AAC7B,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAQ,EAAE;IAC3C,OAAO,uBAAuB,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;AACxD,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAQ,EAAE;IAC3C,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IACrC,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAC9D,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,eAAe,GAAG,GAAgC,EAAE;IAC/D,MAAM,MAAM,GAAG,mBAAmB,EAAE,CAAC;IAErC,MAAM,kBAAkB,GAAG,WAAW,CACpC,CAAC,IAAY,EAAE,EAAE;QACf,OAAO,MAAM,CAAC,IAAI,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;IAC1D,CAAC,EACD,CAAC,MAAM,CAAC,CACT,CAAC;IAEF,OAAO,OAAO,CAAC,GAAG,EAAE,CAAC,kBAAkB,EAAE,CAAC,kBAAkB,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC"}
|
|
@@ -85,12 +85,27 @@ export const useContextRegister = (data) => {
|
|
|
85
85
|
}
|
|
86
86
|
}, [data, isFocused]);
|
|
87
87
|
};
|
|
88
|
-
const
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
88
|
+
const computeModelIds = (model) => {
|
|
89
|
+
if (!model) {
|
|
90
|
+
return undefined;
|
|
91
|
+
}
|
|
92
|
+
const { id, ids } = model;
|
|
93
|
+
if (Array.isArray(ids) && ids.length > 0) {
|
|
94
|
+
const filteredIds = ids.filter((item, idx, self) => item != null && self.findIndex(_i => _i === item) === idx);
|
|
95
|
+
if (filteredIds.length > 0)
|
|
96
|
+
return filteredIds;
|
|
92
97
|
}
|
|
93
|
-
|
|
98
|
+
if (id)
|
|
99
|
+
return id;
|
|
100
|
+
return undefined;
|
|
101
|
+
};
|
|
102
|
+
const isModelMatch = (model, modelName, key) => {
|
|
103
|
+
const isBaseMatch = model.model === modelName && computeModelIds(model) != null;
|
|
104
|
+
if (!isBaseMatch)
|
|
105
|
+
return false;
|
|
106
|
+
if (key)
|
|
107
|
+
return model.key === key;
|
|
108
|
+
return true;
|
|
94
109
|
};
|
|
95
110
|
export const isModel = (context, model, key) => {
|
|
96
111
|
if (!Array.isArray(context?.models) || context?.models.length === 0) {
|
|
@@ -103,15 +118,6 @@ export const getModelId = (context, model, key) => {
|
|
|
103
118
|
return undefined;
|
|
104
119
|
}
|
|
105
120
|
const foundModel = context?.models.find(m => isModelMatch(m, model, key));
|
|
106
|
-
|
|
107
|
-
return undefined;
|
|
108
|
-
}
|
|
109
|
-
if (Array.isArray(foundModel.ids) && foundModel.ids.length > 0) {
|
|
110
|
-
return foundModel.ids;
|
|
111
|
-
}
|
|
112
|
-
else if (foundModel.id) {
|
|
113
|
-
return foundModel.id;
|
|
114
|
-
}
|
|
115
|
-
return undefined;
|
|
121
|
+
return computeModelIds(foundModel);
|
|
116
122
|
};
|
|
117
123
|
//# sourceMappingURL=ActiveScreenProvider.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ActiveScreenProvider.js","sourceRoot":"","sources":["../../src/navigator/ActiveScreenProvider.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ActiveScreenProvider.js","sourceRoot":"","sources":["../../src/navigator/ActiveScreenProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -44,7 +44,7 @@ const Navigator = ({ mainMenu, onRefresh, versionCheckConfig }) => {
|
|
|
44
44
|
const fetchAllPermission = usePermissionsFetcher();
|
|
45
45
|
const { modules } = useModulesInitialisation();
|
|
46
46
|
const storeState = useSelector(state => state.appConfig);
|
|
47
|
-
const { mobileSettings } = useSelector(state => state.appConfig);
|
|
47
|
+
const { loadingConfig, mobileSettings, mobileConfigured, numberConfig } = useSelector(state => state.appConfig);
|
|
48
48
|
const { metaModules } = useSelector(state => state.metaModule);
|
|
49
49
|
const enabledModule = useMemo(() => manageWebCompatibility(manageWebConfig(checkModulesMenusAccessibility(manageOverridingMenus(manageSubMenusOverriding(modules)), mobileSettings?.apps), storeState), metaModules), [metaModules, mobileSettings?.apps, modules, storeState]);
|
|
50
50
|
useEffect(() => {
|
|
@@ -58,11 +58,16 @@ const Navigator = ({ mainMenu, onRefresh, versionCheckConfig }) => {
|
|
|
58
58
|
.filter((_configName, _index, _self) => _self.indexOf(_configName) === _index);
|
|
59
59
|
}, [enabledModule]);
|
|
60
60
|
useEffect(() => {
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
61
|
+
if (!loadingConfig) {
|
|
62
|
+
if (!mobileConfigured) {
|
|
63
|
+
dispatch(fetchRequiredConfig(['AppMobileSettings']));
|
|
64
|
+
}
|
|
65
|
+
else if (numberConfig === 1 && requiredConfig.length > 0) {
|
|
66
|
+
dispatch(fetchRequiredConfig(requiredConfig));
|
|
67
|
+
registerTypes();
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
}, [dispatch, loadingConfig, mobileConfigured, numberConfig, requiredConfig]);
|
|
66
71
|
useEffect(() => {
|
|
67
72
|
dispatch(fetchMetaModules());
|
|
68
73
|
fetchAllPermission();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EACZ,aAAa,EACb,WAAW,EACX,SAAS,EACT,OAAO,EACP,QAAQ,GACT,MAAM,OAAO,CAAC;AACf,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,cAAc,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAC,oBAAoB,EAAC,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,aAAa,MAAM,wBAAwB,CAAC;AACnD,OAAO,EACL,8BAA8B,EAC9B,gBAAgB,EAChB,qBAAqB,EACrB,sBAAsB,EACtB,eAAe,EACf,cAAc,GACf,MAAM,iBAAiB,CAAC;AACzB,OAAO,EACL,wBAAwB,EACxB,YAAY,EACZ,WAAW,EACX,WAAW,GACZ,MAAM,eAAe,CAAC;AACvB,OAAO,aAAa,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,UAAU,MAAM,YAAY,CAAC;AACpC,OAAO,MAAM,MAAM,iBAAiB,CAAC;AACrC,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAC7D,OAAO,EAAC,mBAAmB,EAAC,MAAM,4BAA4B,CAAC;AAC/D,OAAO,EAAC,qBAAqB,EAAC,MAAM,gBAAgB,CAAC;AACrD,OAAO,EAAC,sBAAsB,EAAC,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,wBAAwB,EAAC,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAC,oBAAoB,EAAC,MAAM,wBAAwB,CAAC;AAE5D,MAAM,MAAM,GAAG,qBAAqB,EAAE,CAAC;AACvC,MAAM,KAAK,GAAG,oBAAoB,EAAE,CAAC;AAErC,MAAM,CAAC,MAAM,sBAAsB,GAAG,aAAa,CAAC,EAAC,YAAY,EAAE,IAAI,EAAC,CAAC,CAAC;AAE1E,MAAM,SAAS,GAAG,CAAC,EAAC,QAAQ,EAAE,SAAS,EAAE,kBAAkB,EAAC,EAAE,EAAE;IAC9D,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,kBAAkB,GAAG,qBAAqB,EAAE,CAAC;IACnD,MAAM,EAAC,OAAO,EAAC,GAAG,wBAAwB,EAAE,CAAC;IAE7C,MAAM,UAAU,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;IACzD,MAAM,EAAC,cAAc,EAAC,
|
|
1
|
+
{"version":3,"file":"Navigator.js","sourceRoot":"","sources":["../../src/navigator/Navigator.js"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.3.
|
|
3
|
+
"version": "8.3.9",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -24,8 +24,8 @@
|
|
|
24
24
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@axelor/aos-mobile-error": "8.3.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.3.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.3.9",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.3.9",
|
|
29
29
|
"@react-navigation/drawer": "6.7.2",
|
|
30
30
|
"@react-navigation/native": "6.1.18",
|
|
31
31
|
"@react-navigation/native-stack": "6.11.0",
|