@axelor/aos-mobile-core 8.2.7 → 8.2.8
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/apiProviders/utils.js +8 -2
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js +5 -11
- package/lib/auth/components/molecules/TranslationsButton/TranslationsButton.js.map +1 -1
- package/lib/auth/features/configSlice.d.ts +3 -4
- package/lib/auth/features/configSlice.js +14 -12
- package/lib/auth/features/configSlice.js.map +1 -1
- package/lib/auth/i18n/en.json +2 -1
- package/lib/auth/i18n/fr.json +2 -1
- package/lib/auth/index.js +1 -1
- package/lib/auth/index.js.map +1 -1
- package/lib/components/external/Camera/Camera.js +15 -1
- package/lib/components/external/Camera/Camera.js.map +1 -1
- package/lib/components/templates/PeriodInput/PeriodInput.js +2 -2
- package/lib/components/templates/PeriodInput/PeriodInput.js.map +1 -1
- package/lib/dashboards/menu.helpers.d.ts +1 -3
- package/lib/dashboards/menu.helpers.js +4 -2
- package/lib/dashboards/menu.helpers.js.map +1 -1
- package/lib/forms/studio/permission.helpers.js +2 -5
- package/lib/forms/studio/permission.helpers.js.map +1 -1
- package/lib/i18n/api/translation.d.ts +4 -1
- package/lib/i18n/api/translation.js +2 -6
- package/lib/i18n/api/translation.js.map +1 -1
- package/lib/i18n/component/Translator.js +5 -1
- package/lib/i18n/component/Translator.js.map +1 -1
- package/lib/i18n/translations/en.json +1 -0
- package/lib/i18n/translations/fr.json +1 -0
- package/lib/utils/index.d.ts +1 -0
- package/lib/utils/index.js +1 -0
- package/lib/utils/index.js.map +1 -1
- package/lib/utils/role.d.ts +1 -0
- package/lib/utils/role.js +23 -0
- package/lib/utils/role.js.map +1 -0
- package/lib/webViews/menu.helper.d.ts +1 -3
- package/lib/webViews/menu.helper.js +4 -2
- package/lib/webViews/menu.helper.js.map +1 -1
- package/package.json +3 -3
|
@@ -55,7 +55,10 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
55
55
|
if (errorTracing) {
|
|
56
56
|
traceError({
|
|
57
57
|
message: 'API request',
|
|
58
|
-
cause:
|
|
58
|
+
cause: {
|
|
59
|
+
path: error?.response?.request?.responseURL,
|
|
60
|
+
...(error.response.data ? error.response.data : error),
|
|
61
|
+
},
|
|
59
62
|
userId,
|
|
60
63
|
});
|
|
61
64
|
}
|
|
@@ -65,7 +68,7 @@ const manageError = (error, action, userId, { showErrorToast = true, errorTracin
|
|
|
65
68
|
position: 'bottom',
|
|
66
69
|
bottomOffset: 20,
|
|
67
70
|
text1: `${i18nProvider.i18n.t('Auth_Error')} ${code}`,
|
|
68
|
-
text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${message}.`,
|
|
71
|
+
text2: `${i18nProvider.i18n.t('Base_Failed_To')} ${i18nProvider.i18n.t(action)}: ${i18nProvider.i18n.t(message)}.`,
|
|
69
72
|
});
|
|
70
73
|
}
|
|
71
74
|
return null;
|
|
@@ -113,6 +116,9 @@ export const handlerApiCall = ({ fetchFunction, data, action, getState, response
|
|
|
113
116
|
response: {
|
|
114
117
|
status: 403,
|
|
115
118
|
statusText: `${res.data.data?.title}: ${res.data.data?.message}`,
|
|
119
|
+
request: {
|
|
120
|
+
responseURL: res.request.responseURL,
|
|
121
|
+
},
|
|
116
122
|
},
|
|
117
123
|
};
|
|
118
124
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AACtD,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AAErC,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,cAAc,EAAC,MAAM,4BAA4B,CAAC;AAE1D,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAQ,EAAE,EAAC,eAAe,GAAG,IAAI,EAAC,EAAE,EAAE;IACvE,IAAI,QAAQ,CAAC,IAAI,IAAI,QAAQ,CAAC,IAAI,CAAC,MAAM,IAAI,IAAI,EAAE;QACjD,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC;KAC7B;IAED,MAAM,MAAM,GAAG,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC;IAEpC,OAAO,eAAe;QACpB,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC;YACrB,CAAC,CAAC,MAAM;YACR,CAAC,CAAC,EAAE;QACN,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,qBAAqB,GAAG,QAAQ,CAAC,EAAE,CACvC,QAAQ,EAAE,IAAI,EAAE,aAAa,IAAI,QAAQ,EAAE,SAAS,CAAC;AAEvD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,EAAE,CACpC,QAAQ,EAAE,IAAI,EAAE,UAAU,IAAI,QAAQ,EAAE,MAAM,CAAC;AAEjD,MAAM,mBAAmB,GAAG,QAAQ,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,IAAI,CAAC,CAAC;AAEnE,MAAM,CAAC,MAAM,YAAY,GAAG,IAAI,CAAC,EAAE;IACjC,IAAI,IAAI,YAAY,KAAK,EAAE;QACzB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC;KAChB;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,OAAO,GAAG,CAAC,EAAC,QAAQ,EAAwB,EAAE,EAAE;IACpD,OAAO,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC;AAClC,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAClB,KAAK,EACL,MAAM,EACN,MAAM,EACN,EAAC,cAAc,GAAG,IAAI,EAAE,YAAY,GAAG,IAAI,EAAC,EAC5C,EAAE;IACF,IAAI,KAAK,CAAC,QAAQ,EAAE;QAClB,MAAM,OAAO,GACX,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,aAAa,IAAI,KAAK,EAAE,QAAQ,EAAE,UAAU,CAAC;QACtE,MAAM,IAAI,GAAG,KAAK,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,IAAI,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC;QAEzE,IAAI,IAAI,KAAK,GAAG,EAAE;YAChB,iBAAiB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;YAC1C,OAAO;SACR;QAED,IAAI,YAAY,EAAE;YAChB,UAAU,CAAC;gBACT,OAAO,EAAE,aAAa;gBACtB,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -20,8 +20,7 @@ import { Dimensions, StyleSheet } from 'react-native';
|
|
|
20
20
|
import { useDispatch, useSelector } from 'react-redux';
|
|
21
21
|
import { useThemeColor, useConfig, RightIconButton, Icon, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { getTranslations, selectLanguage, useTranslator } from '../../../../i18n';
|
|
23
|
-
import {
|
|
24
|
-
import { clearMessage, uploadTranslations } from '../../../features/configSlice';
|
|
23
|
+
import { uploadTranslations } from '../../../features/configSlice';
|
|
25
24
|
import { useIsAdmin } from '../../../../permissions';
|
|
26
25
|
const TranslationsButton = ({}) => {
|
|
27
26
|
const I18n = useTranslator();
|
|
@@ -30,22 +29,17 @@ const TranslationsButton = ({}) => {
|
|
|
30
29
|
const isAdmin = useIsAdmin();
|
|
31
30
|
const { setActivityIndicator } = useConfig();
|
|
32
31
|
const { localization, language } = useSelector(selectLanguage);
|
|
33
|
-
const {
|
|
32
|
+
const { loadingTranslations } = useSelector((state) => state.config);
|
|
34
33
|
const styles = useMemo(() => getStyles(Colors), [Colors]);
|
|
35
34
|
useEffect(() => {
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
setActivityIndicator(false);
|
|
39
|
-
dispatch(clearMessage());
|
|
40
|
-
}
|
|
41
|
-
}, [message, dispatch, setActivityIndicator]);
|
|
35
|
+
setActivityIndicator(loadingTranslations);
|
|
36
|
+
}, [loadingTranslations, setActivityIndicator]);
|
|
42
37
|
const handleSendTranslations = useCallback(() => {
|
|
43
|
-
setActivityIndicator(true);
|
|
44
38
|
dispatch(uploadTranslations({
|
|
45
39
|
language,
|
|
46
40
|
translations: getTranslations(localization),
|
|
47
41
|
}));
|
|
48
|
-
}, [dispatch, language, localization
|
|
42
|
+
}, [dispatch, language, localization]);
|
|
49
43
|
if (!isAdmin) {
|
|
50
44
|
return null;
|
|
51
45
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TranslationsButton.js","sourceRoot":"","sources":["../../../../../src/auth/components/molecules/TranslationsButton/TranslationsButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,aAAa,EAEb,SAAS,EACT,eAAe,EACf,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"TranslationsButton.js","sourceRoot":"","sources":["../../../../../src/auth/components/molecules/TranslationsButton/TranslationsButton.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC7D,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AACpD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,aAAa,EAEb,SAAS,EACT,eAAe,EACf,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,eAAe,EAAE,cAAc,EAAE,aAAa,EAAC,MAAM,kBAAkB,CAAC;AAChF,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAC,UAAU,EAAC,MAAM,yBAAyB,CAAC;AAEnD,MAAM,kBAAkB,GAAG,CAAC,EAAE,EAAE,EAAE;IAChC,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAC/B,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAE7B,MAAM,EAAC,oBAAoB,EAAC,GAAG,SAAS,EAAE,CAAC;IAE3C,MAAM,EAAC,YAAY,EAAE,QAAQ,EAAC,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;IAE7D,MAAM,EAAC,mBAAmB,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAExE,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,SAAS,CAAC,GAAG,EAAE;QACb,oBAAoB,CAAC,mBAAmB,CAAC,CAAC;IAC5C,CAAC,EAAE,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC,CAAC;IAEhD,MAAM,sBAAsB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC9C,QAAQ,CACL,kBAA0B,CAAC;YAC1B,QAAQ;YACR,YAAY,EAAE,eAAe,CAAC,YAAY,CAAC;SAC5C,CAAC,CACH,CAAC;IACJ,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;IAEvC,IAAI,CAAC,OAAO,EAAE;QACZ,OAAO,IAAI,CAAC;KACb;IAED,OAAO,CACL,CAAC,eAAe,CACd,IAAI,CAAC,CACH,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,EAAG,CACrE,CACD,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CACtB,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CACvC,OAAO,CAAC,CAAC,sBAAsB,CAAC,EAChC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,SAAS,GAAG,CAAC,MAAmB,EAAE,EAAE,CACxC,UAAU,CAAC,MAAM,CAAC;IAChB,OAAO,EAAE;QACP,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,GAAG;QAC3C,MAAM,EAAE,EAAE;QACV,SAAS,EAAE,QAAQ;QACnB,WAAW,EAAE,MAAM,CAAC,cAAc,CAAC,UAAU;QAC7C,WAAW,EAAE,CAAC;QACd,WAAW,EAAE,EAAE;QACf,YAAY,EAAE,EAAE;QAChB,WAAW,EAAE,CAAC;KACf;CACF,CAAC,CAAC;AAEL,eAAe,kBAAkB,CAAC"}
|
|
@@ -18,8 +18,7 @@ export const uploadNavigationTools: import("@reduxjs/toolkit").AsyncThunk<any, v
|
|
|
18
18
|
fulfilledMeta?: unknown;
|
|
19
19
|
rejectedMeta?: unknown;
|
|
20
20
|
}>;
|
|
21
|
-
export const
|
|
22
|
-
|
|
21
|
+
export const configReducer: import("redux").Reducer<{
|
|
22
|
+
loadingTranslations: boolean;
|
|
23
23
|
loading: boolean;
|
|
24
|
-
|
|
25
|
-
}>>;
|
|
24
|
+
}>;
|
|
@@ -19,8 +19,14 @@ import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
|
19
19
|
import { handlerApiCall } from '../../apiProviders';
|
|
20
20
|
import { postTranslations } from '../../i18n';
|
|
21
21
|
import { uploadNavigationTools as _uploadNavigationTools } from '../api/config-api';
|
|
22
|
-
export const uploadTranslations = createAsyncThunk('base/uploadTranslations', async function ({
|
|
23
|
-
return
|
|
22
|
+
export const uploadTranslations = createAsyncThunk('base/uploadTranslations', async function (data, { getState }) {
|
|
23
|
+
return handlerApiCall({
|
|
24
|
+
fetchFunction: postTranslations,
|
|
25
|
+
data,
|
|
26
|
+
action: 'Auth_SliceAction_UploadTranslations',
|
|
27
|
+
getState,
|
|
28
|
+
responseOptions: { isArrayResponse: false, showToast: true },
|
|
29
|
+
});
|
|
24
30
|
});
|
|
25
31
|
export const uploadNavigationTools = createAsyncThunk('base/uploadNavigationTools', async function (data = {}, { getState }) {
|
|
26
32
|
return handlerApiCall({
|
|
@@ -32,24 +38,21 @@ export const uploadNavigationTools = createAsyncThunk('base/uploadNavigationTool
|
|
|
32
38
|
});
|
|
33
39
|
});
|
|
34
40
|
const initialState = {
|
|
41
|
+
loadingTranslations: false,
|
|
35
42
|
loading: false,
|
|
36
|
-
message: null,
|
|
37
43
|
};
|
|
38
44
|
const configSlice = createSlice({
|
|
39
45
|
name: 'config',
|
|
40
46
|
initialState,
|
|
41
|
-
reducers: {
|
|
42
|
-
clearMessage: state => {
|
|
43
|
-
state.message = null;
|
|
44
|
-
},
|
|
45
|
-
},
|
|
46
47
|
extraReducers: builder => {
|
|
47
48
|
builder.addCase(uploadTranslations.pending, state => {
|
|
48
|
-
state.
|
|
49
|
+
state.loadingTranslations = true;
|
|
49
50
|
});
|
|
50
51
|
builder.addCase(uploadTranslations.fulfilled, (state, action) => {
|
|
51
|
-
state.
|
|
52
|
-
|
|
52
|
+
state.loadingTranslations = false;
|
|
53
|
+
});
|
|
54
|
+
builder.addCase(uploadTranslations.rejected, state => {
|
|
55
|
+
state.loadingTranslations = false;
|
|
53
56
|
});
|
|
54
57
|
builder.addCase(uploadNavigationTools.pending, state => {
|
|
55
58
|
state.loading = true;
|
|
@@ -62,6 +65,5 @@ const configSlice = createSlice({
|
|
|
62
65
|
});
|
|
63
66
|
},
|
|
64
67
|
});
|
|
65
|
-
export const { clearMessage } = configSlice.actions;
|
|
66
68
|
export const configReducer = configSlice.reducer;
|
|
67
69
|
//# sourceMappingURL=configSlice.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configSlice.js","sourceRoot":"","sources":["../../../src/auth/features/configSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,qBAAqB,IAAI,sBAAsB,EAAC,MAAM,mBAAmB,CAAC;AAElF,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAChD,yBAAyB,EACzB,KAAK,WAAW,EAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"configSlice.js","sourceRoot":"","sources":["../../../src/auth/features/configSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAC,gBAAgB,EAAC,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAC,qBAAqB,IAAI,sBAAsB,EAAC,MAAM,mBAAmB,CAAC;AAElF,MAAM,CAAC,MAAM,kBAAkB,GAAG,gBAAgB,CAChD,yBAAyB,EACzB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,gBAAgB;QAC/B,IAAI;QACJ,MAAM,EAAE,qCAAqC;QAC7C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,gBAAgB,CACnD,4BAA4B,EAC5B,KAAK,WAAW,IAAI,GAAG,EAAE,EAAE,EAAC,QAAQ,EAAC;IACnC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,sBAAsB;QACrC,IAAI;QACJ,MAAM,EAAE,wCAAwC;QAChD,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAE,SAAS,EAAE,IAAI,EAAC;KAC3D,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,mBAAmB,EAAE,KAAK;IAC1B,OAAO,EAAE,KAAK;CACf,CAAC;AAEF,MAAM,WAAW,GAAG,WAAW,CAAC;IAC9B,IAAI,EAAE,QAAQ;IACd,YAAY;IACZ,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAClD,KAAK,CAAC,mBAAmB,GAAG,IAAI,CAAC;QACnC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC9D,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YACnD,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC;QACpC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YACrD,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;QACvB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,QAAQ,EAAE,KAAK,CAAC,EAAE;YACtD,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,qBAAqB,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YACjE,KAAK,CAAC,OAAO,GAAG,KAAK,CAAC;QACxB,CAAC,CAAC,CAAC;IACL,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,WAAW,CAAC,OAAO,CAAC"}
|
package/lib/auth/i18n/en.json
CHANGED
|
@@ -26,5 +26,6 @@
|
|
|
26
26
|
"Auth_SliceAction_FetchCompanies": "fetch companies",
|
|
27
27
|
"Auth_SliceAction_FetchActiveUser": "fetch active user",
|
|
28
28
|
"Auth_SliceAction_UpdateActiveUser": "update active user",
|
|
29
|
-
"Auth_SliceAction_UploadNavigationTools": "upload navigation tools"
|
|
29
|
+
"Auth_SliceAction_UploadNavigationTools": "upload navigation tools",
|
|
30
|
+
"Auth_SliceAction_UploadTranslations": "upload translations"
|
|
30
31
|
}
|
package/lib/auth/i18n/fr.json
CHANGED
|
@@ -26,5 +26,6 @@
|
|
|
26
26
|
"Auth_SliceAction_FetchCompanies": "récupération des sociétés",
|
|
27
27
|
"Auth_SliceAction_FetchActiveUser": "récupération de l'utilisateur actif",
|
|
28
28
|
"Auth_SliceAction_UpdateActiveUser": "mise à jour de l'utilisateur actif",
|
|
29
|
-
"Auth_SliceAction_UploadNavigationTools": "envoie des informations de navigation"
|
|
29
|
+
"Auth_SliceAction_UploadNavigationTools": "envoie des informations de navigation",
|
|
30
|
+
"Auth_SliceAction_UploadTranslations": "envoie des traductions"
|
|
30
31
|
}
|
package/lib/auth/index.js
CHANGED
|
@@ -62,7 +62,7 @@ export const authModule = {
|
|
|
62
62
|
requiredConfig: ['AppBase', 'AppMobileSettings'],
|
|
63
63
|
moduleRegister: async (userId) => {
|
|
64
64
|
const user = await getLoggedUser(userId)
|
|
65
|
-
.then(res => res?.data?.data)
|
|
65
|
+
.then(res => res?.data?.data?.[0])
|
|
66
66
|
.catch(() => ({}));
|
|
67
67
|
await registerDashboardModule(user);
|
|
68
68
|
await registerWebViewModule(user);
|
package/lib/auth/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AACpC,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;IACD,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC;IAChD,cAAc,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;aACrC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/auth/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAC,uBAAuB,EAAC,MAAM,4BAA4B,CAAC;AACnE,OAAO,EAAC,qBAAqB,EAAC,MAAM,yBAAyB,CAAC;AAC9D,OAAO,EAAC,aAAa,EAAC,MAAM,OAAO,CAAC;AACpC,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,cAAc,MAAM,gBAAgB,CAAC;AAC5C,OAAO,KAAK,YAAY,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAC,cAAc,EAAE,UAAU,EAAC,MAAM,WAAW,CAAC;AACrD,OAAO,EAAC,aAAa,EAAC,MAAM,UAAU,CAAC;AACvC,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AAExD,MAAM,CAAC,MAAM,UAAU,GAAW;IAChC,IAAI,EAAE,MAAM;IACZ,KAAK,EAAE,WAAW;IAClB,QAAQ,EAAE,WAAW;IACrB,IAAI,EAAE,aAAa;IACnB,KAAK,EAAE;QACL,cAAc,EAAE;YACd,KAAK,EAAE,kBAAkB;YACzB,IAAI,EAAE,aAAa;YACnB,MAAM,EAAE,YAAY;YACpB,SAAS,EAAE,IAAI;SAChB;KACF;IACD,OAAO,EAAE;QACP,UAAU,EAAE;YACV,KAAK,EAAE,kBAAkB;YACzB,SAAS,EAAE,UAAU;YACrB,QAAQ,EAAE,mBAAmB;SAC9B;QACD,cAAc,EAAE;YACd,KAAK,EAAE,eAAe;YACtB,SAAS,EAAE,cAAc;SAC1B;KACF;IACD,YAAY,EAAE;QACZ,EAAE,EAAE,cAAc;QAClB,EAAE,EAAE,cAAc;KACnB;IACD,QAAQ,EAAE;QACR,GAAG,YAAY;KAChB;IACD,MAAM,EAAE;QACN,YAAY,EAAE,EAAC,GAAG,aAAa,EAAC;QAChC,eAAe,EAAE,cAAc;KAChC;IACD,cAAc,EAAE,CAAC,SAAS,EAAE,mBAAmB,CAAC;IAChD,cAAc,EAAE,KAAK,EAAE,MAAc,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,MAAM,aAAa,CAAC,MAAM,CAAC;aACrC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;aACjC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAErB,MAAM,uBAAuB,CAAC,IAAI,CAAC,CAAC;QACpC,MAAM,qBAAqB,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;CACF,CAAC;AAEF,cAAc,WAAW,CAAC;AAC1B,cAAc,OAAO,CAAC;AACtB,cAAc,gCAAgC,CAAC"}
|
|
@@ -61,7 +61,21 @@ const Camera = () => {
|
|
|
61
61
|
setFlash(f => (f === 'off' ? 'on' : 'off'));
|
|
62
62
|
}, []);
|
|
63
63
|
const codeScanner = useCodeScanner({
|
|
64
|
-
codeTypes: [
|
|
64
|
+
codeTypes: [
|
|
65
|
+
'aztec',
|
|
66
|
+
'codabar',
|
|
67
|
+
'code-39',
|
|
68
|
+
'code-93',
|
|
69
|
+
'code-128',
|
|
70
|
+
'data-matrix',
|
|
71
|
+
'ean-8',
|
|
72
|
+
'ean-13',
|
|
73
|
+
'itf',
|
|
74
|
+
'pdf-417',
|
|
75
|
+
'qr',
|
|
76
|
+
'upc-a',
|
|
77
|
+
'upc-e',
|
|
78
|
+
],
|
|
65
79
|
onCodeScanned: barcode => {
|
|
66
80
|
if (isScanActive && Array.isArray(barcode) && barcode[0] != null) {
|
|
67
81
|
dispatch(scanBarcode({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"Camera.js","sourceRoot":"","sources":["../../../../src/components/external/Camera/Camera.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,QAAQ,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EACL,UAAU,EACV,QAAQ,EACR,YAAY,EACZ,UAAU,EACV,IAAI,GACL,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EACL,MAAM,IAAI,aAAa,EACvB,eAAe,EACf,mBAAmB,EACnB,cAAc,GACf,MAAM,4BAA4B,CAAC;AACpC,OAAO,oBAAoB,MAAM,sCAAsC,CAAC;AACxE,OAAO,IAAI,MAAM,iBAAiB,CAAC;AACnC,OAAO,EAAC,IAAI,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EACL,aAAa,EACb,SAAS,EACT,iBAAiB,GAClB,MAAM,+BAA+B,CAAC;AACvC,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EACL,oBAAoB,EACpB,WAAW,EACX,wBAAwB,GACzB,MAAM,sCAAsC,CAAC;AAC9C,OAAO,EAAC,UAAU,EAAC,MAAM,2BAA2B,CAAC;AAErD,MAAM,eAAe,GAAG,EAAE,CAAC;AAC3B,MAAM,UAAU,GAAG,MAAM,CAAC;AAE1B,MAAM,WAAW,GACf,QAAQ,CAAC,MAAM,CAAC;IACd,GAAG,EAAE,oBAAoB,CAAC,oBAAoB;CAC/C,CAAC,IAAI,CAAC,CAAC;AAEV,MAAM,iBAAiB,GAAG;IACxB,WAAW,EAAE,oBAAoB,CAAC,kBAAkB,GAAG,eAAe;IACtE,UAAU,EAAE,oBAAoB,CAAC,iBAAiB,GAAG,eAAe,GAAG,GAAG;IAC1E,YAAY,EAAE,oBAAoB,CAAC,mBAAmB,GAAG,eAAe,GAAG,CAAC;IAC5E,aAAa,EAAE,WAAW,GAAG,eAAe;CAC7C,CAAC;AAEF,MAAM,WAAW,GAAG,EAAE,CAAC;AAEvB,MAAM,MAAM,GAAG,GAAG,EAAE;IAClB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,EAAC,SAAS,EAAE,YAAY,EAAC,GAAG,wBAAwB,EAAE,CAAC;IAC7D,MAAM,EAAC,SAAS,EAAE,cAAc,EAAC,GAAG,iBAAiB,EAAE,CAAC;IACxD,MAAM,EAAC,aAAa,EAAE,iBAAiB,EAAC,GAAG,mBAAmB,EAAE,CAAC;IACjE,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAC5B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAClD,MAAM,CACP,CAAC;IAEF,MAAM,CAAC,KAAK,EAAE,QAAQ,CAAC,GAAG,QAAQ,CAAe,KAAK,CAAC,CAAC;IAExD,MAAM,UAAU,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC;IAE3C,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAE7C,MAAM,MAAM,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1B,OAAO,cAAc,KAAK,MAAM,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC;IAC9D,CAAC,EAAE,CAAC,cAAc,EAAE,UAAU,EAAE,WAAW,CAAC,CAAC,CAAC;IAE9C,MAAM,sBAAsB,GAAG,OAAO,CACpC,GAAG,EAAE,CAAC,UAAU,IAAI,IAAI,IAAI,WAAW,IAAI,IAAI,EAC/C,CAAC,UAAU,EAAE,WAAW,CAAC,CAC1B,CAAC;IAEF,MAAM,aAAa,GAAG,MAAM,EAAE,QAAQ,IAAI,KAAK,CAAC;IAEhD,MAAM,mBAAmB,GAAG,WAAW,CAAC,GAAG,EAAE;QAC3C,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,EAAE;QACtC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC;IAC9C,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,MAAM,WAAW,GAAG,cAAc,CAAC;QACjC,SAAS,EAAE;YACT,OAAO;YACP,SAAS;YACT,SAAS;YACT,SAAS;YACT,UAAU;YACV,aAAa;YACb,OAAO;YACP,QAAQ;YACR,KAAK;YACL,SAAS;YACT,IAAI;YACJ,OAAO;YACP,OAAO;SACR;QACD,aAAa,EAAE,OAAO,CAAC,EAAE;YACvB,IAAI,YAAY,IAAI,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE;gBAChE,QAAQ,CACN,WAAW,CAAC;oBACV,KAAK,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;oBACpD,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,IAAI;iBACtB,CAAC,CACH,CAAC;aACH;QACH,CAAC;KACF,CAAC,CAAC;IAEH,MAAM,cAAc,GAAG,WAAW,CAChC,KAAK,EAAC,KAAK,EAAC,EAAE;QACZ,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC5D,MAAM,EAAC,IAAI,EAAC,GAAG,MAAM,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAE3C,QAAQ,CACN,SAAS,CAAC;YACR,IAAI,EAAE,UAAU,UAAU,EAAE;YAC5B,gBAAgB,EAAE,UAAU;YAC5B,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC,WAAW,EAAE;YAClC,IAAI,EAAE,SAAS,UAAU,EAAE;YAC3B,IAAI,EAAE,IAAI;YACV,MAAM,EAAE,SAAS;YACjB,UAAU,EAAE,cAAc,UAAU,WAAW,SAAS,EAAE;SAC3D,CAAC,CACH,CAAC;QACF,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAC5B,CAAC,EACD,CAAC,QAAQ,CAAC,CACX,CAAC;IAEF,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,cAAc,EAAE;YAClB,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;SAC3B;aAAM;YACL,QAAQ,CAAC,oBAAoB,EAAE,CAAC,CAAC;SAClC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC,CAAC;IAE/B,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,cAAc,IAAI,YAAY,EAAE;YAClC,iBAAiB,EAAE,CAAC;SACrB;IACH,CAAC,EAAE,CAAC,cAAc,EAAE,YAAY,EAAE,iBAAiB,CAAC,CAAC,CAAC;IAEtD,MAAM,aAAa,GAAG,OAAO,CAC3B,GAAG,EAAE,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,cAAc,IAAI,YAAY,CAAC,CAAC,CAAC,KAAK,CAAC,EAC9D,CAAC,aAAa,EAAE,cAAc,EAAE,YAAY,CAAC,CAC9C,CAAC;IAEF,OAAO,CACL,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,EAAC,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAC5D;MAAA,CAAC,MAAM,IAAI,IAAI,IAAI,aAAa,IAAI,CAClC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAC1B;UAAA,CAAC,aAAa,CACZ,GAAG,CAAC,CAAC,MAAM,CAAC,CACZ,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,EAAC,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,EAAC,CAAC,CAAC,CACjE,MAAM,CAAC,CAAC,MAAM,CAAC,CACf,QAAQ,CAAC,CAAC,aAAa,CAAC,CACxB,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CACrB,WAAW,CAAC,CAAC,WAAW,CAAC,EAE7B;QAAA,EAAE,IAAI,CAAC,CACR,CACD;MAAA,CAAC,aAAa,CAAC,CAAC,CAAC,CACf,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,CACjC;UAAA,CAAC,sBAAsB,IAAI,cAAc,IAAI,CAC3C,CAAC,IAAI,CACH,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACrB,IAAI,CAAC,aAAa,CAClB,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAC9B,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,mBAAmB,CAAC,EAC7B,CACH,CACD;UAAA,CAAC,aAAa,IAAI,cAAc,IAAI,CAClC,CAAC,IAAI,CACH,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACrB,IAAI,CAAC,gBAAgB,CACrB,KAAK,CAAC,CACJ,KAAK,KAAK,IAAI;oBACZ,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU;oBAChC,CAAC,CAAC,MAAM,CAAC,eAAe,CAC3B,CACD,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,cAAc,CAAC,EACxB,CACH,CACD;UAAA,CAAC,IAAI,CACH,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CACrB,IAAI,CAAC,MAAM,CACX,KAAK,CAAC,CAAC,MAAM,CAAC,eAAe,CAAC,CAC9B,IAAI,CAAC,CAAC,EAAE,CAAC,CACT,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,WAAW,CAAC,EAEzB;QAAA,EAAE,IAAI,CAAC,CACR,CAAC,CAAC,CAAC,IAAI,CACR;MAAA,CAAC,aAAa,IAAI,cAAc,CAAC,CAAC,CAAC,CACjC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,CAChC;UAAA,CAAC,aAAa,CACZ,MAAM,CAAC,CAAC,MAAM,CAAC,CACf,eAAe,CAAC,CAAC,cAAc,CAAC,CAChC,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,OAAO,CAAC,CAAC,cAAc,CAAC,CACxB,IAAI,CAAC,CAAC,UAAU,CAAC,EAErB;QAAA,EAAE,IAAI,CAAC,CACR,CAAC,CAAC,CAAC,IAAI,CACV;IAAA,EAAE,YAAY,CAAC,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC;IAC/B,aAAa,EAAE;QACb,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,GAAG,iBAAiB,CAAC,aAAa,GAAG,CAAC;QAC1E,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,CAAC,GAAG,iBAAiB,CAAC,WAAW;QACxE,MAAM,EAAE,GAAG;KACZ;IACD,OAAO,EAAE;QACP,IAAI,EAAE,CAAC;KACR;IACD,MAAM,EAAE;QACN,MAAM,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM;QACvC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK;QACrC,QAAQ,EAAE,UAAU;QACpB,GAAG,EAAE,CAAC;KACP;IACD,MAAM,EAAE;QACN,YAAY,EAAE,eAAe;QAC7B,KAAK,EAAE,WAAW;QAClB,MAAM,EAAE,WAAW;QACnB,YAAY,EAAE,WAAW,GAAG,CAAC;QAC7B,eAAe,EAAE,0BAA0B;QAC3C,cAAc,EAAE,QAAQ;QACxB,UAAU,EAAE,QAAQ;KACrB;IACD,cAAc,EAAE;QACd,QAAQ,EAAE,UAAU;QACpB,KAAK,EAAE,iBAAiB,CAAC,YAAY;QACrC,GAAG,EAAE,iBAAiB,CAAC,UAAU;QACjC,MAAM,EAAE,GAAG;KACZ;CACF,CAAC,CAAC;AAEH,eAAe,MAAM,CAAC"}
|
|
@@ -59,8 +59,8 @@ const PeriodInput = ({ style, horizontal = true, showTitle = true, startDateConf
|
|
|
59
59
|
: startDate;
|
|
60
60
|
const _endDate = endDateConfig.dateInputMode === 'date' ? getEndOfDay(endDate) : endDate;
|
|
61
61
|
const isError = startDate && endDate && _startDate > _endDate;
|
|
62
|
-
setIsPeriodError(isError);
|
|
63
|
-
onPeriodErrorChange(isError);
|
|
62
|
+
setIsPeriodError(!!isError);
|
|
63
|
+
onPeriodErrorChange?.(!!isError);
|
|
64
64
|
}, [
|
|
65
65
|
startDate,
|
|
66
66
|
endDate,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PeriodInput.js","sourceRoot":"","sources":["../../../../src/components/templates/PeriodInput/PeriodInput.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"PeriodInput.js","sourceRoot":"","sources":["../../../../src/components/templates/PeriodInput/PeriodInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -23,8 +23,6 @@ export declare const createDashboardScreens: (dashboardConfigs: {
|
|
|
23
23
|
menus: DashboardMenuConfig;
|
|
24
24
|
screens: Screens;
|
|
25
25
|
};
|
|
26
|
-
export declare const filterAuthorizedDashboardMenus: (dashboardConfigs: DashboardMenuConfig,
|
|
27
|
-
roles: any[];
|
|
28
|
-
}) => Menus;
|
|
26
|
+
export declare const filterAuthorizedDashboardMenus: (dashboardConfigs: DashboardMenuConfig, userRoles: any[]) => Menus;
|
|
29
27
|
export declare const registerDashboardModule: (user: any) => Promise<void>;
|
|
30
28
|
export {};
|
|
@@ -19,6 +19,7 @@ import { modulesProvider } from '../app';
|
|
|
19
19
|
import { fetchDashboardConfigs } from './api.helpers';
|
|
20
20
|
import { createDashboardActionID } from './display.helpers';
|
|
21
21
|
import { DashboardScreen } from './view';
|
|
22
|
+
import { getRoles } from '../utils';
|
|
22
23
|
const createScreenComponent = id => {
|
|
23
24
|
return props => DashboardScreen({ ...props, dashboardId: id });
|
|
24
25
|
};
|
|
@@ -60,7 +61,7 @@ export const createDashboardScreens = (dashboardConfigs) => {
|
|
|
60
61
|
}
|
|
61
62
|
return { menus, screens };
|
|
62
63
|
};
|
|
63
|
-
export const filterAuthorizedDashboardMenus = (dashboardConfigs,
|
|
64
|
+
export const filterAuthorizedDashboardMenus = (dashboardConfigs, userRoles) => {
|
|
64
65
|
const menus = {};
|
|
65
66
|
Object.entries(dashboardConfigs)
|
|
66
67
|
.filter(([_, { configRoles: authorizedRoleSet }]) => {
|
|
@@ -84,9 +85,10 @@ export const registerDashboardModule = async (user) => {
|
|
|
84
85
|
.then(res => res?.data?.data)
|
|
85
86
|
.catch(() => []);
|
|
86
87
|
const { screens, menus } = createDashboardScreens(dashboardConfigs);
|
|
88
|
+
const userRoles = getRoles(user);
|
|
87
89
|
modulesProvider.registerModule({
|
|
88
90
|
name: 'app-dashboard',
|
|
89
|
-
menus: filterAuthorizedDashboardMenus(menus,
|
|
91
|
+
menus: filterAuthorizedDashboardMenus(menus, userRoles),
|
|
90
92
|
screens,
|
|
91
93
|
});
|
|
92
94
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.helpers.js","sourceRoot":"","sources":["../../src/dashboards/menu.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAO,eAAe,EAAS,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,eAAe,CAAC;AACpD,OAAO,EAAC,uBAAuB,EAAC,MAAM,mBAAmB,CAAC;AAC1D,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.helpers.js","sourceRoot":"","sources":["../../src/dashboards/menu.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -19,6 +19,7 @@ import { useCallback, useEffect, useMemo } from 'react';
|
|
|
19
19
|
import { useDispatch, useSelector } from 'react-redux';
|
|
20
20
|
import { fetchObjectModelTypes } from '../../features/metaJsonFieldSlice';
|
|
21
21
|
import { useFieldsPermissions, useIsAdmin } from '../../permissions';
|
|
22
|
+
import { getRoles } from '../../utils';
|
|
22
23
|
const isFieldHidden = (authorizedRoles, userRoles) => {
|
|
23
24
|
if (!Array.isArray(authorizedRoles) || authorizedRoles.length === 0) {
|
|
24
25
|
return false;
|
|
@@ -42,11 +43,7 @@ export const useFieldPermitter = ({ modelName }) => {
|
|
|
42
43
|
useEffect(() => {
|
|
43
44
|
dispatch(fetchObjectModelTypes({ modelName }));
|
|
44
45
|
}, [dispatch, modelName]);
|
|
45
|
-
const roles = useMemo(() =>
|
|
46
|
-
const _userRoles = user?.roles ?? [];
|
|
47
|
-
const _groupRoles = user?.group?.roles ?? [];
|
|
48
|
-
return [..._userRoles, ..._groupRoles].filter((item, index, self) => self.findIndex(_i => _i.id === item.id) === index);
|
|
49
|
-
}, [user?.group?.roles, user?.roles]);
|
|
46
|
+
const roles = useMemo(() => getRoles(user), [user]);
|
|
50
47
|
return useCallback(_item => {
|
|
51
48
|
if (isAdmin) {
|
|
52
49
|
return _item;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permission.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/permission.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAC,oBAAoB,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAC;
|
|
1
|
+
{"version":3,"file":"permission.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/permission.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AACtD,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,qBAAqB,EAAC,MAAM,mCAAmC,CAAC;AACxE,OAAO,EAAC,oBAAoB,EAAE,UAAU,EAAC,MAAM,mBAAmB,CAAC;AACnE,OAAO,EAAC,QAAQ,EAAC,MAAM,aAAa,CAAC;AAErC,MAAM,aAAa,GAAG,CAAC,eAAe,EAAE,SAAS,EAAE,EAAE;IACnD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;QACnE,OAAO,KAAK,CAAC;KACd;SAAM,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9D,OAAO,IAAI,CAAC;KACb;SAAM;QACL,OAAO,eAAe,CAAC,KAAK,CAC1B,KAAK,CAAC,EAAE,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,EAAC,EAAE,EAAE,MAAM,EAAC,EAAE,EAAE,CAAC,MAAM,KAAK,KAAK,CAAC,EAAE,CAAC,IAAI,IAAI,CACvE,CAAC;KACH;AACH,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,EAAC,SAAS,EAAsB,EAAE,EAAE;IACpE,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,EAAC,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;IACtE,MAAM,EAAC,IAAI,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAEvD,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,MAAM,WAAW,GAAG,oBAAoB,CAAC;QACvC,SAAS;QACT,UAAU,EAAE,UAAU,IAAI,EAAE;KAC7B,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,QAAQ,CAAE,qBAA6B,CAAC,EAAC,SAAS,EAAC,CAAC,CAAC,CAAC;IACxD,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC;IAE1B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;IAEpD,OAAO,WAAW,CAChB,KAAK,CAAC,EAAE;QACN,IAAI,OAAO,EAAE;YACX,OAAO,KAAK,CAAC;SACd;QAED,MAAM,EAAC,QAAQ,EAAC,GACd,WAAW,CAAC,IAAI,CAAC,CAAC,EAAC,GAAG,EAAC,EAAE,EAAE,CAAC,GAAG,KAAK,KAAK,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;QAC9D,MAAM,QAAQ,GAAG,aAAa,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;QAEnD,OAAO,EAAC,GAAG,KAAK,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAC,CAAC;IAChD,CAAC,EACD,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,CAAC,CAC9B,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -1,2 +1,5 @@
|
|
|
1
1
|
export function fetchTranslation(language: any): Promise<any>;
|
|
2
|
-
export function postTranslations(language
|
|
2
|
+
export function postTranslations({ language, translations }: {
|
|
3
|
+
language: any;
|
|
4
|
+
translations: any;
|
|
5
|
+
}): Promise<import("axios").AxiosResponse<any, any>>;
|
|
@@ -28,11 +28,7 @@ export async function fetchTranslation(language) {
|
|
|
28
28
|
})
|
|
29
29
|
.then(res => res?.data?.translation);
|
|
30
30
|
}
|
|
31
|
-
export async function postTranslations(language, translations) {
|
|
32
|
-
return axios
|
|
33
|
-
.post(`/ws/aos/translation/${language}`, translations)
|
|
34
|
-
.then(res => {
|
|
35
|
-
return res?.data?.messageStatus;
|
|
36
|
-
});
|
|
31
|
+
export async function postTranslations({ language, translations }) {
|
|
32
|
+
return axios.post(`/ws/aos/translation/${language}`, translations);
|
|
37
33
|
}
|
|
38
34
|
//# sourceMappingURL=translation.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"translation.js","sourceRoot":"","sources":["../../../src/i18n/api/translation.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAQ;IAC7C,OAAO,KAAK;SACT,GAAG,CAAC,uBAAuB,QAAQ,EAAE,CAAC;SACtC,KAAK,CAAC,KAAK,CAAC,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QACjE,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC;SACtB;QACD,OAAO;IACT,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAQ,EAAE,YAAY;
|
|
1
|
+
{"version":3,"file":"translation.js","sourceRoot":"","sources":["../../../src/i18n/api/translation.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,QAAQ;IAC7C,OAAO,KAAK;SACT,GAAG,CAAC,uBAAuB,QAAQ,EAAE,CAAC;SACtC,KAAK,CAAC,KAAK,CAAC,EAAE;QACb,OAAO,CAAC,IAAI,CAAC,kDAAkD,CAAC,CAAC;QACjE,IAAI,KAAK,EAAE;YACT,OAAO,CAAC,GAAG,CAAC,EAAC,KAAK,EAAC,CAAC,CAAC;SACtB;QACD,OAAO;IACT,CAAC,CAAC;SACD,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC;AACzC,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,EAAC,QAAQ,EAAE,YAAY,EAAC;IAC7D,OAAO,KAAK,CAAC,IAAI,CAAC,uBAAuB,QAAQ,EAAE,EAAE,YAAY,CAAC,CAAC;AACrE,CAAC"}
|
|
@@ -58,7 +58,11 @@ const Translator = () => {
|
|
|
58
58
|
return null;
|
|
59
59
|
};
|
|
60
60
|
export function getTranslations(localization) {
|
|
61
|
-
|
|
61
|
+
const language = localization?.split('_')?.[0];
|
|
62
|
+
const _getTranslations = lng => i18nProvider.i18n.getResourceBundle(lng, DEFAULT_NAMESPACE);
|
|
63
|
+
const localizationTranslations = _getTranslations(localization);
|
|
64
|
+
const languageTranslations = _getTranslations(language);
|
|
65
|
+
return { ...languageTranslations, ...localizationTranslations };
|
|
62
66
|
}
|
|
63
67
|
function loadTranslationsFromStorage(localization) {
|
|
64
68
|
const translations = storage.getItem(`language.${localization}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Translator.js","sourceRoot":"","sources":["../../../src/i18n/component/Translator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAC,cAAc,EAAC,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AACpD,OAAO,EAAC,iCAAiC,EAAC,MAAM,yBAAyB,CAAC;AAC1E,OAAO,EAAC,OAAO,EAAC,MAAM,uBAAuB,CAAC;AAC9C,OAAO,EAAC,YAAY,EAAC,MAAM,SAAS,CAAC;AACrC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AAExC,MAAM,CAAC,MAAM,cAAc,GAAG,cAAc,CAC1C,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,EACpB,SAAS,CAAC,EAAE,CAAC,CAAC;IACZ,YAAY,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI;IACjD,QAAQ,EAAE,SAAS,EAAE,IAAI,EAAE,YAAY,EAAE,QAAQ,EAAE,IAAI;CACxD,CAAC,CACH,CAAC;AAEF,MAAM,iBAAiB,GAAG,aAAa,CAAC;AAExC,MAAM,iBAAiB,GAAG,QAAQ,CAAC,EAAE;IACnC,MAAM,EAAC,YAAY,EAAC,GAAG,WAAW,CAAC,cAAc,CAAC,CAAC;IAEnD,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,EAAE;YAChB,QAAQ,CAAC,EAAC,YAAY,EAAC,CAAC,CAAC;SAC1B;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,GAAG,EAAE;IACtB,SAAS,CAAC,GAAG,EAAE;QACb,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,aAAa,EAAE;YAClC,2BAA2B,CAAC,YAAY,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,iBAAiB,CACf,WAAW,CAAC,CAAC,EAAC,YAAY,EAAC,EAAE,EAAE;QAC7B,2BAA2B,CAAC,YAAY,CAAC,CAAC;IAC5C,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IAEF,iBAAiB,CACf,WAAW,CAAC,CAAC,EAAC,YAAY,EAAC,EAAE,EAAE;QAC7B,gBAAgB,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE;YACjD,IAAI,YAAY,EAAE;gBAChB,qBAAqB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC;gBAClD,iCAAiC,CAAC,YAAY,CAAC,CAAC;aACjD;QACH,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IAEF,iBAAiB,CACf,WAAW,CAAC,CAAC,EAAC,YAAY,EAAC,EAAE,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,cAAc,CAAC,YAAY,CAAC,CAAC;IACjD,CAAC,EAAE,EAAE,CAAC,CACP,CAAC;IAEF,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,eAAe,CAAC,YAAY;IAC1C,
|
|
1
|
+
{"version":3,"file":"Translator.js","sourceRoot":"","sources":["../../../src/i18n/component/Translator.js"],"names":[],"mappings":"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"}
|
|
@@ -208,6 +208,7 @@
|
|
|
208
208
|
"Base_Print": "Print",
|
|
209
209
|
"Base_PrintTemplate": "Print template",
|
|
210
210
|
"Base_NoRecordsFound": "No records found",
|
|
211
|
+
"Base_NoPermForCreate": "You do not have permission to create this object",
|
|
211
212
|
"Base_SliceAction_FetchAttachedFiles": "fetch attached files",
|
|
212
213
|
"Base_SliceAction_FetchFilesDetails": "fetch file details",
|
|
213
214
|
"Base_SliceAction_FetchMetaModule": "fetch meta modules",
|
|
@@ -208,6 +208,7 @@
|
|
|
208
208
|
"Base_Print": "Imprimer",
|
|
209
209
|
"Base_PrintTemplate": "Modèle d'impression",
|
|
210
210
|
"Base_NoRecordsFound": "Aucun enregistrement trouvé",
|
|
211
|
+
"Base_NoPermForCreate": "Vous n'avez pas les permissions pour créer cet objet",
|
|
211
212
|
"Base_SliceAction_FetchAttachedFiles": "récupération des fichiers joints",
|
|
212
213
|
"Base_SliceAction_FetchFilesDetails": "récupération des détails du fichier",
|
|
213
214
|
"Base_SliceAction_FetchMetaModule": "récupération des modules",
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -7,6 +7,7 @@ export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image'
|
|
|
7
7
|
export { filterList, filterListContain, getLastItem, getNextItem } from './list';
|
|
8
8
|
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, formatDurationToMiliseconds, hoursToMilliseconds, } from './time';
|
|
9
9
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
|
10
|
+
export { getRoles } from './role';
|
|
10
11
|
export { showToastMessage } from './show-toast-message';
|
|
11
12
|
export { checkNullString, isHtml, splitInTwo, stringNoAccent } from './string';
|
|
12
13
|
export { filterChip, filterChipCriteria } from './filter';
|
package/lib/utils/index.js
CHANGED
|
@@ -24,6 +24,7 @@ export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image'
|
|
|
24
24
|
export { filterList, filterListContain, getLastItem, getNextItem } from './list';
|
|
25
25
|
export { calculateDiff, formatDuration, formatTwoNumber, getIntegerPart, formatDurationToMiliseconds, hoursToMilliseconds, } from './time';
|
|
26
26
|
export { areObjectsEquals, isEmpty, fetchJsonField, filterObjectsFields, pickFieldsOfObject, isPlainObject, } from './object';
|
|
27
|
+
export { getRoles } from './role';
|
|
27
28
|
export { showToastMessage } from './show-toast-message';
|
|
28
29
|
export { checkNullString, isHtml, splitInTwo, stringNoAccent } from './string';
|
|
29
30
|
export { filterChip, filterChipCriteria } from './filter';
|
package/lib/utils/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,cAAc,OAAO,CAAC;AACtB,OAAO,EACL,QAAQ,EACR,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,QAAQ,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC3C,cAAc,OAAO,CAAC;AACtB,OAAO,EACL,QAAQ,EACR,MAAM,EACN,WAAW,EACX,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EACL,UAAU,EACV,cAAc,EACd,UAAU,EACV,UAAU,EACV,SAAS,EACT,wBAAwB,EACxB,qBAAqB,EACrB,iBAAiB,GAClB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,iBAAiB,EAAE,mBAAmB,EAAE,cAAc,EAAC,MAAM,SAAS,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,iBAAiB,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,QAAQ,CAAC;AAC/E,OAAO,EACL,aAAa,EACb,cAAc,EACd,eAAe,EACf,cAAc,EACd,2BAA2B,EAC3B,mBAAmB,GACpB,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,aAAa,GACd,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,QAAQ,EAAC,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AACtD,OAAO,EAAC,eAAe,EAAE,MAAM,EAAE,UAAU,EAAE,cAAc,EAAC,MAAM,UAAU,CAAC;AAC7E,OAAO,EAAC,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const getRoles: (user: any) => any[];
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2025 Axelor (<http://axelor.com>).
|
|
5
|
+
*
|
|
6
|
+
* This program is free software: you can redistribute it and/or modify
|
|
7
|
+
* it under the terms of the GNU Affero General Public License, version 3,
|
|
8
|
+
* as published by the Free Software Foundation.
|
|
9
|
+
*
|
|
10
|
+
* This program is distributed in the hope that it will be useful,
|
|
11
|
+
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
12
|
+
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
13
|
+
* GNU Affero General Public License for more details.
|
|
14
|
+
*
|
|
15
|
+
* You should have received a copy of the GNU Affero General Public License
|
|
16
|
+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
|
+
*/
|
|
18
|
+
export const getRoles = user => {
|
|
19
|
+
const userRoles = user?.roles ?? [];
|
|
20
|
+
const groupRoles = user?.group?.roles ?? [];
|
|
21
|
+
return [...userRoles, ...groupRoles].filter((item, index, self) => self.findIndex(_i => _i.id === item.id) === index);
|
|
22
|
+
};
|
|
23
|
+
//# sourceMappingURL=role.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"role.js","sourceRoot":"","sources":["../../src/utils/role.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,QAAQ,GAAG,IAAI,CAAC,EAAE;IAC7B,MAAM,SAAS,GAAG,IAAI,EAAE,KAAK,IAAI,EAAE,CAAC;IACpC,MAAM,UAAU,GAAG,IAAI,EAAE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC;IAE5C,OAAO,CAAC,GAAG,SAAS,EAAE,GAAG,UAAU,CAAC,CAAC,MAAM,CACzC,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC,KAAK,KAAK,CACzE,CAAC;AACJ,CAAC,CAAC"}
|
|
@@ -23,8 +23,6 @@ export declare const createWebViewScreens: (webViewConfigs: {
|
|
|
23
23
|
menus: WebViewMenuConfig;
|
|
24
24
|
screens: Screens;
|
|
25
25
|
};
|
|
26
|
-
export declare const filterAuthorizedWebViewMenus: (webViewConfigs: WebViewMenuConfig,
|
|
27
|
-
roles: any[];
|
|
28
|
-
}) => Menus;
|
|
26
|
+
export declare const filterAuthorizedWebViewMenus: (webViewConfigs: WebViewMenuConfig, userRoles: any[]) => Menus;
|
|
29
27
|
export declare const registerWebViewModule: (user: any) => Promise<void>;
|
|
30
28
|
export {};
|
|
@@ -19,6 +19,7 @@ import { modulesProvider } from '../app';
|
|
|
19
19
|
import { fetchWebViewConfigs } from './api.helpers';
|
|
20
20
|
import { createWebViewActionID } from './display.helpers';
|
|
21
21
|
import { WebViewScreen } from './view';
|
|
22
|
+
import { getRoles } from '../utils';
|
|
22
23
|
const createScreenComponent = id => {
|
|
23
24
|
return props => WebViewScreen({ ...props, webViewId: id });
|
|
24
25
|
};
|
|
@@ -57,7 +58,7 @@ export const createWebViewScreens = (webViewConfigs) => {
|
|
|
57
58
|
}
|
|
58
59
|
return { menus, screens };
|
|
59
60
|
};
|
|
60
|
-
export const filterAuthorizedWebViewMenus = (webViewConfigs,
|
|
61
|
+
export const filterAuthorizedWebViewMenus = (webViewConfigs, userRoles) => {
|
|
61
62
|
const menus = {};
|
|
62
63
|
Object.entries(webViewConfigs)
|
|
63
64
|
.filter(([_, { configRoles: authorizedRoleSet }]) => {
|
|
@@ -81,9 +82,10 @@ export const registerWebViewModule = async (user) => {
|
|
|
81
82
|
.then(res => res?.data?.data)
|
|
82
83
|
.catch(() => []);
|
|
83
84
|
const { screens, menus } = createWebViewScreens(webViewConfigs);
|
|
85
|
+
const userRoles = getRoles(user);
|
|
84
86
|
modulesProvider.registerModule({
|
|
85
87
|
name: 'app-webview',
|
|
86
|
-
menus: filterAuthorizedWebViewMenus(menus,
|
|
88
|
+
menus: filterAuthorizedWebViewMenus(menus, userRoles),
|
|
87
89
|
screens,
|
|
88
90
|
});
|
|
89
91
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/webViews/menu.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAO,eAAe,EAAS,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAC,mBAAmB,EAAC,MAAM,eAAe,CAAC;AAClD,OAAO,EAAC,qBAAqB,EAAC,MAAM,mBAAmB,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"menu.helper.js","sourceRoot":"","sources":["../../src/webViews/menu.helper.ts"],"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.2.
|
|
3
|
+
"version": "8.2.8",
|
|
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.2.
|
|
28
|
-
"@axelor/aos-mobile-ui": "8.2.
|
|
27
|
+
"@axelor/aos-mobile-error": "8.2.8",
|
|
28
|
+
"@axelor/aos-mobile-ui": "8.2.8",
|
|
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",
|