@axelor/aos-mobile-core 9.0.12 → 9.1.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/api/axios-init.js +2 -2
- package/lib/api/axios-init.js.map +1 -1
- package/lib/apiProviders/File/AopFileApi.d.ts +14 -0
- package/lib/apiProviders/File/AopFileApi.js +68 -0
- package/lib/apiProviders/File/AopFileApi.js.map +1 -0
- package/lib/apiProviders/File/FileApiProvider.d.ts +34 -0
- package/lib/apiProviders/File/FileApiProvider.js +19 -0
- package/lib/apiProviders/File/FileApiProvider.js.map +1 -0
- package/lib/apiProviders/File/GatewayFileApi.d.ts +13 -0
- package/lib/apiProviders/File/GatewayFileApi.js +61 -0
- package/lib/apiProviders/File/GatewayFileApi.js.map +1 -0
- package/lib/apiProviders/File/Provider.d.ts +12 -0
- package/lib/apiProviders/File/Provider.js +43 -0
- package/lib/apiProviders/File/Provider.js.map +1 -0
- package/lib/apiProviders/File/index.d.ts +5 -0
- package/lib/apiProviders/File/index.js +23 -0
- package/lib/apiProviders/File/index.js.map +1 -0
- package/lib/apiProviders/File/utils.d.ts +11 -0
- package/lib/apiProviders/File/utils.js +148 -0
- package/lib/apiProviders/File/utils.js.map +1 -0
- package/lib/apiProviders/Model/AopModelApi.d.ts +4 -1
- package/lib/apiProviders/Model/AopModelApi.js +4 -1
- package/lib/apiProviders/Model/AopModelApi.js.map +1 -1
- package/lib/apiProviders/Model/GatewayModelApi.d.ts +4 -1
- package/lib/apiProviders/Model/GatewayModelApi.js +4 -0
- package/lib/apiProviders/Model/GatewayModelApi.js.map +1 -1
- package/lib/apiProviders/Model/ModelApiProvider.d.ts +4 -1
- package/lib/apiProviders/Model/utils.d.ts +8 -2
- package/lib/apiProviders/Standard/ObjectFieldsProvider.d.ts +2 -2
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js +22 -11
- package/lib/apiProviders/Standard/ObjectFieldsProvider.js.map +1 -1
- package/lib/apiProviders/Standard/requests.helper.d.ts +3 -3
- package/lib/apiProviders/Standard/requests.helper.js +15 -7
- package/lib/apiProviders/Standard/requests.helper.js.map +1 -1
- package/lib/apiProviders/index.d.ts +2 -1
- package/lib/apiProviders/index.js +2 -1
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/apiProviders/middlewares/grouping.d.ts +2 -0
- package/lib/apiProviders/middlewares/grouping.js +69 -0
- package/lib/apiProviders/middlewares/grouping.js.map +1 -0
- package/lib/apiProviders/middlewares/index.d.ts +1 -0
- package/lib/apiProviders/middlewares/index.js +1 -0
- package/lib/apiProviders/middlewares/index.js.map +1 -1
- package/lib/apiProviders/utils.d.ts +11 -0
- package/lib/apiProviders/utils.js +47 -4
- package/lib/apiProviders/utils.js.map +1 -1
- package/lib/app/Application.js +7 -3
- package/lib/app/Application.js.map +1 -1
- package/lib/app/RootNavigator.js +7 -2
- package/lib/app/RootNavigator.js.map +1 -1
- package/lib/app/modules/defaults.d.ts +2 -0
- package/lib/app/modules/defaults.js +33 -0
- package/lib/app/modules/defaults.js.map +1 -0
- package/lib/app/modules/index.d.ts +1 -0
- package/lib/app/modules/index.js +1 -0
- package/lib/app/modules/index.js.map +1 -1
- package/lib/app/modules/types.d.ts +7 -1
- package/lib/auth/features/userSlice.d.ts +15 -1
- package/lib/auth/features/userSlice.js +5 -13
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +6 -5
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/organisms/AOSImage/AOSImage.js +12 -12
- package/lib/components/organisms/AOSImage/AOSImage.js.map +1 -1
- package/lib/components/organisms/AOSImageBubble/AOSImageBubble.js +3 -7
- package/lib/components/organisms/AOSImageBubble/AOSImageBubble.js.map +1 -1
- package/lib/components/pages/FormView/Components/Field.d.ts +4 -4
- package/lib/components/pages/FormView/Components/Field.js +12 -18
- package/lib/components/pages/FormView/Components/Field.js.map +1 -1
- package/lib/components/pages/FormView/Components/Panel.d.ts +4 -2
- package/lib/components/pages/FormView/Components/Panel.js +19 -14
- package/lib/components/pages/FormView/Components/Panel.js.map +1 -1
- package/lib/components/pages/FormView/Custom/CustomButton.d.ts +1 -1
- package/lib/components/pages/FormView/Custom/CustomButton.js +7 -4
- package/lib/components/pages/FormView/Custom/CustomButton.js.map +1 -1
- package/lib/components/pages/FormView/Custom/CustomMultiPicker.d.ts +14 -0
- package/lib/components/pages/FormView/Custom/CustomMultiPicker.js +54 -0
- package/lib/components/pages/FormView/Custom/CustomMultiPicker.js.map +1 -0
- package/lib/components/pages/FormView/Custom/CustomPicker.d.ts +3 -1
- package/lib/components/pages/FormView/Custom/CustomPicker.js +5 -2
- package/lib/components/pages/FormView/Custom/CustomPicker.js.map +1 -1
- package/lib/components/pages/FormView/Custom/CustomSearchBar.d.ts +3 -1
- package/lib/components/pages/FormView/Custom/CustomSearchBar.js +9 -4
- package/lib/components/pages/FormView/Custom/CustomSearchBar.js.map +1 -1
- package/lib/components/pages/FormView/Custom/index.d.ts +1 -0
- package/lib/components/pages/FormView/Custom/index.js +1 -0
- package/lib/components/pages/FormView/Custom/index.js.map +1 -1
- package/lib/components/pages/FormView/FormView.js +22 -20
- package/lib/components/pages/FormView/FormView.js.map +1 -1
- package/lib/components/templates/GlobalToolBox/GlobalToolBox.js +30 -14
- package/lib/components/templates/GlobalToolBox/GlobalToolBox.js.map +1 -1
- package/lib/components/templates/GridListView/GridListView.d.ts +34 -0
- package/lib/components/templates/GridListView/GridListView.js +99 -0
- package/lib/components/templates/GridListView/GridListView.js.map +1 -0
- package/lib/components/templates/SearchListView/SearchListView.d.ts +6 -1
- package/lib/components/templates/SearchListView/SearchListView.js +24 -12
- package/lib/components/templates/SearchListView/SearchListView.js.map +1 -1
- package/lib/components/templates/index.d.ts +12 -11
- package/lib/components/templates/index.js +1 -0
- package/lib/components/templates/index.js.map +1 -1
- package/lib/config/index.d.ts +1 -0
- package/lib/config/index.js +1 -0
- package/lib/config/index.js.map +1 -1
- package/lib/config/routes.d.ts +3 -0
- package/lib/config/routes.js +2 -0
- package/lib/config/routes.js.map +1 -1
- package/lib/config/userProvider.d.ts +9 -0
- package/lib/config/userProvider.js +34 -0
- package/lib/config/userProvider.js.map +1 -0
- package/lib/features/asyncFunctions-index.d.ts +1 -1
- package/lib/features/asyncFunctions-index.js +1 -1
- package/lib/features/asyncFunctions-index.js.map +1 -1
- package/lib/features/authSlice.js +5 -1
- package/lib/features/authSlice.js.map +1 -1
- package/lib/features/onlineSlice.d.ts +11 -1
- package/lib/features/onlineSlice.js +5 -1
- package/lib/features/onlineSlice.js.map +1 -1
- package/lib/forms/display.helpers.js +2 -0
- package/lib/forms/display.helpers.js.map +1 -1
- package/lib/forms/studio/api.helpers.d.ts +2 -2
- package/lib/forms/studio/api.helpers.js +58 -43
- package/lib/forms/studio/api.helpers.js.map +1 -1
- package/lib/forms/types.d.ts +4 -1
- package/lib/header/hooks.js +3 -12
- package/lib/header/hooks.js.map +1 -1
- package/lib/hooks/use-navigation.js +22 -2
- package/lib/hooks/use-navigation.js.map +1 -1
- package/lib/hooks/use-scan-activator.d.ts +3 -0
- package/lib/hooks/use-scan-activator.js +26 -7
- package/lib/hooks/use-scan-activator.js.map +1 -1
- package/lib/i18n/translations/en.json +1 -0
- package/lib/i18n/translations/fr.json +1 -0
- package/lib/navigator/components/DrawerContent.js +1 -1
- package/lib/navigator/components/DrawerContent.js.map +1 -1
- package/lib/navigator/helpers/menu.helper.d.ts +6 -6
- package/lib/screens/ERPAccessScreen.d.ts +3 -0
- package/lib/screens/ERPAccessScreen.js +26 -0
- package/lib/screens/ERPAccessScreen.js.map +1 -0
- package/lib/screens/index.d.ts +7 -37
- package/lib/screens/index.js +9 -1
- package/lib/screens/index.js.map +1 -1
- package/lib/tools/FileDownloader.d.ts +2 -12
- package/lib/tools/FileDownloader.js +4 -100
- package/lib/tools/FileDownloader.js.map +1 -1
- package/lib/tools/FileViewer.d.ts +2 -11
- package/lib/tools/FileViewer.js +9 -25
- package/lib/tools/FileViewer.js.map +1 -1
- package/lib/utils/image.js +45 -23
- package/lib/utils/image.js.map +1 -1
- package/package.json +3 -3
|
@@ -26,11 +26,17 @@ export type ReadOptions = {
|
|
|
26
26
|
[fieldName: string]: string[];
|
|
27
27
|
};
|
|
28
28
|
};
|
|
29
|
-
export interface
|
|
29
|
+
export interface ApiResponse<T> {
|
|
30
30
|
data: {
|
|
31
|
-
data:
|
|
31
|
+
data: T;
|
|
32
32
|
};
|
|
33
33
|
}
|
|
34
|
+
export type RequestResponse = ApiResponse<any[]>;
|
|
35
|
+
export interface FieldsResult {
|
|
36
|
+
fields: any[];
|
|
37
|
+
jsonFields?: any;
|
|
38
|
+
}
|
|
39
|
+
export type FieldsResponse = ApiResponse<FieldsResult>;
|
|
34
40
|
export type Domain = {
|
|
35
41
|
domain: string;
|
|
36
42
|
domainContext: any;
|
|
@@ -13,11 +13,11 @@ declare class ObjectFieldsProvider {
|
|
|
13
13
|
private handleSchemaField;
|
|
14
14
|
getSortFields(objectKey: string): string[];
|
|
15
15
|
getSearchFields(objectKey: string): string[];
|
|
16
|
-
getSearchCriterias(objectKey: string, searchValue: string): CriteriaGroup;
|
|
16
|
+
getSearchCriterias(objectKey: string | string[], searchValue: string): CriteriaGroup;
|
|
17
17
|
}
|
|
18
18
|
export declare const objectFieldsProvider: ObjectFieldsProvider;
|
|
19
19
|
export declare function getObjectFields(objectKey: string): string[];
|
|
20
20
|
export declare function getObjectFieldsForSearch(objectKey: string): string[];
|
|
21
21
|
export declare function getSortFields(objectKey: string): string[];
|
|
22
|
-
export declare function getSearchCriterias(objectKey: string, searchValue: string): CriteriaGroup;
|
|
22
|
+
export declare function getSearchCriterias(objectKey: string | string[], searchValue: string): CriteriaGroup;
|
|
23
23
|
export {};
|
|
@@ -16,6 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { checkNullString } from '../../utils/string';
|
|
19
|
+
const BASIC_FIELDS = ['id', 'version', '$version'];
|
|
19
20
|
class ObjectFieldsProvider {
|
|
20
21
|
objectFields;
|
|
21
22
|
searchFields;
|
|
@@ -55,22 +56,30 @@ class ObjectFieldsProvider {
|
|
|
55
56
|
const fields = schema.fields;
|
|
56
57
|
const result = [];
|
|
57
58
|
for (const fieldName of schema._nodes) {
|
|
58
|
-
if (isNested &&
|
|
59
|
-
excludeNestedArrays &&
|
|
60
|
-
fields[fieldName].type === 'array') {
|
|
61
|
-
continue;
|
|
62
|
-
}
|
|
63
|
-
result.push(fieldName);
|
|
64
59
|
if (fields[fieldName].type === 'object') {
|
|
65
60
|
this.handleSchemaField(fields[fieldName], true, excludeNestedArrays).forEach(_field => {
|
|
66
|
-
if (_field
|
|
67
|
-
_field === '$version' ||
|
|
68
|
-
_field === 'version') {
|
|
61
|
+
if (BASIC_FIELDS.includes(_field))
|
|
69
62
|
return;
|
|
70
|
-
}
|
|
71
63
|
result.push(`${fieldName}.${_field}`);
|
|
72
64
|
});
|
|
73
65
|
}
|
|
66
|
+
if (fields[fieldName].type === 'array') {
|
|
67
|
+
if (isNested && excludeNestedArrays) {
|
|
68
|
+
continue;
|
|
69
|
+
}
|
|
70
|
+
else {
|
|
71
|
+
const subSchema = fields[fieldName].innerType;
|
|
72
|
+
if (subSchema?._nodes?.find((_i) => !BASIC_FIELDS.includes(_i)) !=
|
|
73
|
+
null) {
|
|
74
|
+
this.handleSchemaField(subSchema).forEach(_field => {
|
|
75
|
+
if (BASIC_FIELDS.includes(_field))
|
|
76
|
+
return;
|
|
77
|
+
result.push(`${fieldName}.${_field}`);
|
|
78
|
+
});
|
|
79
|
+
}
|
|
80
|
+
}
|
|
81
|
+
}
|
|
82
|
+
result.push(fieldName);
|
|
74
83
|
}
|
|
75
84
|
return result.filter((item, index, self) => self.indexOf(item) === index);
|
|
76
85
|
}
|
|
@@ -89,7 +98,9 @@ class ObjectFieldsProvider {
|
|
|
89
98
|
return [];
|
|
90
99
|
}
|
|
91
100
|
getSearchCriterias(objectKey, searchValue) {
|
|
92
|
-
const searchFields =
|
|
101
|
+
const searchFields = Array.isArray(objectKey)
|
|
102
|
+
? objectKey
|
|
103
|
+
: this.getSearchFields(objectKey);
|
|
93
104
|
let criteria = [];
|
|
94
105
|
if (searchFields.length > 0 && !checkNullString(searchValue)) {
|
|
95
106
|
criteria = searchFields.map(_searchField => ({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ObjectFieldsProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/ObjectFieldsProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,OAAO,EAAC,eAAe,EAAC,MAAM,oBAAoB,CAAC;AAEnD,MAAM,oBAAoB;IAChB,YAAY,CAAe;IAC3B,YAAY,CAAe;IAC3B,UAAU,CAAa;IAE/B;QACE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;QACvB,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;IACvB,CAAC;IAED,IAAI,CAAC,MAAc;QACjB,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;QACxC,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC;IACtC,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,iBAAiB,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEzD,IAAI,iBAAiB,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC1C,OAAO,IAAI,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,eAAe,CAAC,SAAiB;QAC/B,MAAM,YAAY,GAAQ,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,CAAC,CAAC;QAC9C,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,wBAAwB,CAAC,SAAiB;QACxC,MAAM,YAAY,GAAQ,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC;QAE1D,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,YAAY,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;QAC3D,CAAC;QAED,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,iBAAiB,CACvB,MAAW,EACX,QAAQ,GAAG,KAAK,EAChB,mBAAmB,GAAG,KAAK;QAE3B,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC;QAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;QAE5B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;YACtC,
|
|
1
|
+
{"version":3,"file":"ObjectFieldsProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/ObjectFieldsProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,8 +5,8 @@ interface SearchProps {
|
|
|
5
5
|
criteria?: Criteria[];
|
|
6
6
|
domain?: string;
|
|
7
7
|
domainContext?: any;
|
|
8
|
-
fieldKey: string;
|
|
9
|
-
sortKey?: string;
|
|
8
|
+
fieldKey: string[] | string;
|
|
9
|
+
sortKey?: string[] | string;
|
|
10
10
|
page: number;
|
|
11
11
|
numberElementsByPage?: number;
|
|
12
12
|
provider?: 'axios' | 'model';
|
|
@@ -23,7 +23,7 @@ interface HierarchicalSearchProps extends SearchProps {
|
|
|
23
23
|
}
|
|
24
24
|
interface FetchProps {
|
|
25
25
|
model: string;
|
|
26
|
-
fieldKey: string;
|
|
26
|
+
fieldKey: string[] | string;
|
|
27
27
|
id: number;
|
|
28
28
|
relatedFields?: any;
|
|
29
29
|
provider?: 'axios' | 'model';
|
|
@@ -73,16 +73,21 @@ class RequestBuilder {
|
|
|
73
73
|
..._filterContext,
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
|
-
const fields =
|
|
77
|
-
?
|
|
78
|
-
:
|
|
76
|
+
const fields = Array.isArray(fieldKey)
|
|
77
|
+
? fieldKey
|
|
78
|
+
: includeNestedArrayFields
|
|
79
|
+
? getObjectFields(fieldKey)
|
|
80
|
+
: getObjectFieldsForSearch(fieldKey);
|
|
81
|
+
const sortFields = Array.isArray(sortKey)
|
|
82
|
+
? sortKey
|
|
83
|
+
: (getSortFields(sortKey ?? '') ?? ['id']);
|
|
79
84
|
if (provider === 'axios') {
|
|
80
85
|
axiosApiProvider.post({
|
|
81
86
|
url: `/ws/rest/${model}/search`,
|
|
82
87
|
data: {
|
|
83
88
|
data: data,
|
|
84
89
|
fields,
|
|
85
|
-
sortBy:
|
|
90
|
+
sortBy: sortFields,
|
|
86
91
|
limit: limit,
|
|
87
92
|
offset: limit * page,
|
|
88
93
|
translate: true,
|
|
@@ -94,7 +99,7 @@ class RequestBuilder {
|
|
|
94
99
|
query: {
|
|
95
100
|
data: data,
|
|
96
101
|
fields,
|
|
97
|
-
sortBy:
|
|
102
|
+
sortBy: sortFields,
|
|
98
103
|
limit: limit,
|
|
99
104
|
offset: limit * page,
|
|
100
105
|
},
|
|
@@ -171,11 +176,14 @@ class RequestBuilder {
|
|
|
171
176
|
if (model == null || fieldKey == null) {
|
|
172
177
|
return null;
|
|
173
178
|
}
|
|
179
|
+
const fields = Array.isArray(fieldKey)
|
|
180
|
+
? fieldKey
|
|
181
|
+
: getObjectFields(fieldKey);
|
|
174
182
|
if (provider === 'axios') {
|
|
175
183
|
axiosApiProvider.post({
|
|
176
184
|
url: `/ws/rest/${model}/${id}/fetch`,
|
|
177
185
|
data: {
|
|
178
|
-
fields:
|
|
186
|
+
fields: fields,
|
|
179
187
|
related: relatedFields,
|
|
180
188
|
translate: true,
|
|
181
189
|
},
|
|
@@ -185,7 +193,7 @@ class RequestBuilder {
|
|
|
185
193
|
modelName: model,
|
|
186
194
|
id: id,
|
|
187
195
|
query: {
|
|
188
|
-
fields:
|
|
196
|
+
fields: fields,
|
|
189
197
|
related: relatedFields,
|
|
190
198
|
},
|
|
191
199
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAmB,WAAW,EAAC,MAAM,UAAU,CAAC;AACvD,OAAO,EAAC,gBAAgB,EAAC,MAAM,iBAAiB,CAAC;AACjD,OAAO,EACL,eAAe,EACf,wBAAwB,EACxB,aAAa,GACd,MAAM,wBAAwB,CAAC;AAkChC,MAAM,cAAc;IACV,YAAY,CAAS;IAE7B;QACE,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAED,IAAI,CAAC,mBAA2B;QAC9B,IAAI,CAAC,YAAY,GAAG,mBAAmB,CAAC;IAC1C,CAAC;IAED,eAAe;QACb,OAAO,IAAI,CAAC,YAAY,CAAC;IAC3B,CAAC;IAED,oBAAoB,GAAG,CAAC,EACtB,KAAK,EACL,QAAQ,GAAG,EAAE,EACb,MAAM,GAAG,EAAE,EACX,aAAa,GAAG,EAAE,EAClB,QAAQ,EACR,OAAO,EACP,IAAI,GAAG,CAAC,EACR,oBAAoB,EACpB,QAAQ,GAAG,OAAO,EAClB,SAAS,EACT,YAAY,GAAG,KAAK,EACpB,gBAAgB,EAChB,mBAAmB,EACnB,MAAM,EACN,wBAAwB,GAAG,KAAK,GACpB,EAAgB,EAAE;QAC9B,IAAI,KAAK,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,KAAK,GACT,oBAAoB,KAAK,SAAS;YAChC,CAAC,CAAC,oBAAoB;YACtB,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;QAExB,IAAI,SAAS,IAAI,CAAC,YAAY,EAAE,CAAC;YAC/B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;QACjE,CAAC;QAED,MAAM,EACJ,QAAQ,EAAE,eAAe,GAAG,EAAE,EAC9B,aAAa,EAAE,cAAc,EAC7B,OAAO,EAAE,cAAc,GACxB,GAAG,gBAAgB,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAEpC,IAAI,IAAI,GAAQ;YACd,QAAQ,EAAE;gBACR;oBACE,QAAQ,EAAE,KAAK;oBACf,QAAQ,EAAE,CAAC,GAAG,QAAQ,EAAE,GAAG,eAAe,CAAC;iBAC5C;aACF;SACF,CAAC;QAEF,IAAI,SAAS,IAAI,YAAY,EAAE,CAAC;YAC9B,MAAM,aAAa,GAAG,gBAAgB,CAAC,SAAS,EAAE,mBAAmB,CAAC,CAAC;YAEvE,IAAI,CAAC,OAAO,GAAG,aAAa,CAAC,MAAM,CAAC;YACpC,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC,aAAa,CAAC;QACpD,CAAC;QAED,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;YACpC,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE,CAAC;gBACzB,IAAI,CAAC,OAAO,GAAG,IAAI,IAAI,CAAC,OAAO,UAAU,MAAM,GAAG,CAAC;gBACnD,IAAI,CAAC,cAAc,GAAG;oBACpB,GAAG,IAAI,CAAC,cAAc;oBACtB,GAAG,aAAa;iBACjB,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;gBACtB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;YACtC,CAAC;QACH,CAAC;QAED,IAAI,cAAc,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;YAC/B,IAAI,CAAC,cAAc,GAAG;gBACpB,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,cAAc;aAClB,CAAC;QACJ,CAAC;QAED,MAAM,MAAM,GAAG,wBAAwB;
|
|
1
|
+
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
export * from "./Action";
|
|
2
|
+
export * from "./File";
|
|
2
3
|
export * from "./Model";
|
|
3
4
|
export * from "./Standard";
|
|
4
5
|
export * from "./middlewares";
|
|
5
6
|
export { apiProviderConfig, ApiProviderConfig } from "./config";
|
|
6
|
-
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from "./utils";
|
|
7
|
+
export { generateFetchRecordCases, generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from "./utils";
|
|
@@ -16,9 +16,10 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
export * from './Action';
|
|
19
|
+
export * from './File';
|
|
19
20
|
export * from './Model';
|
|
20
21
|
export * from './Standard';
|
|
21
22
|
export * from './middlewares';
|
|
22
23
|
export { apiProviderConfig, ApiProviderConfig } from './config';
|
|
23
|
-
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
24
|
+
export { generateFetchRecordCases, generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
24
25
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC9D,OAAO,EACL,4BAA4B,EAC5B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC;AACxB,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,OAAO,EAAC,iBAAiB,EAAE,iBAAiB,EAAC,MAAM,UAAU,CAAC;AAC9D,OAAO,EACL,wBAAwB,EACxB,4BAA4B,EAC5B,kBAAkB,EAClB,YAAY,EACZ,cAAc,EACd,YAAY,EACZ,uBAAuB,GACxB,MAAM,SAAS,CAAC"}
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
/*
|
|
2
|
+
* Axelor Business Solutions
|
|
3
|
+
*
|
|
4
|
+
* Copyright (C) 2026 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
|
+
import { isPlainObject } from '../../utils';
|
|
19
|
+
export const groupingMiddleware = (response) => {
|
|
20
|
+
if (Array.isArray(response?.data?.data)) {
|
|
21
|
+
response.data.data = groupFlattenedData(response.data.data);
|
|
22
|
+
}
|
|
23
|
+
return response;
|
|
24
|
+
};
|
|
25
|
+
const groupFlattenedData = (data) => {
|
|
26
|
+
const idCount = {};
|
|
27
|
+
for (const item of data) {
|
|
28
|
+
if (item.id != null) {
|
|
29
|
+
idCount[item.id] = (idCount[item.id] || 0) + 1;
|
|
30
|
+
}
|
|
31
|
+
}
|
|
32
|
+
if (!Object.values(idCount).some(count => count > 1)) {
|
|
33
|
+
return data;
|
|
34
|
+
}
|
|
35
|
+
const groups = new Map();
|
|
36
|
+
for (const item of data) {
|
|
37
|
+
const id = item.id;
|
|
38
|
+
if (!groups.has(id))
|
|
39
|
+
groups.set(id, []);
|
|
40
|
+
groups.get(id).push(item);
|
|
41
|
+
}
|
|
42
|
+
return Array.from(groups.values()).map(mergeGroup);
|
|
43
|
+
};
|
|
44
|
+
const mergeGroup = (items) => {
|
|
45
|
+
const result = {};
|
|
46
|
+
const first = items[0];
|
|
47
|
+
for (const key of Object.keys(first)) {
|
|
48
|
+
if (key.includes('.'))
|
|
49
|
+
continue;
|
|
50
|
+
const value = first[key];
|
|
51
|
+
if (isPlainObject(value)) {
|
|
52
|
+
const subItems = [];
|
|
53
|
+
const seenIds = new Set();
|
|
54
|
+
for (const item of items) {
|
|
55
|
+
const subVal = item[key];
|
|
56
|
+
if (subVal != null && !seenIds.has(subVal.id)) {
|
|
57
|
+
seenIds.add(subVal.id);
|
|
58
|
+
subItems.push(subVal);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
result[key] = subItems.length > 1 ? subItems : (subItems[0] ?? value);
|
|
62
|
+
}
|
|
63
|
+
else {
|
|
64
|
+
result[key] = value;
|
|
65
|
+
}
|
|
66
|
+
}
|
|
67
|
+
return result;
|
|
68
|
+
};
|
|
69
|
+
//# sourceMappingURL=grouping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"grouping.js","sourceRoot":"","sources":["../../../src/apiProviders/middlewares/grouping.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAuB,EAAiB,EAAE;IAC3E,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,IAAI,CAAC,EAAE,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,kBAAkB,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,kBAAkB,GAAG,CAAC,IAAW,EAAS,EAAE;IAChD,MAAM,OAAO,GAA2B,EAAE,CAAC;IAC3C,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,EAAE,IAAI,IAAI,EAAE,CAAC;YACpB,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC;QACjD,CAAC;IACH,CAAC;IAED,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC;QACrD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,GAAG,EAAc,CAAC;IACrC,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,MAAM,EAAE,GAAG,IAAI,CAAC,EAAE,CAAC;QACnB,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC;YAAE,MAAM,CAAC,GAAG,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACxC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC;IAED,OAAO,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;AACrD,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,KAAY,EAAO,EAAE;IACvC,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;IAEvB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC;QACrC,IAAI,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;YAAE,SAAS;QAEhC,MAAM,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;QAEzB,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE,CAAC;YACzB,MAAM,QAAQ,GAAU,EAAE,CAAC;YAC3B,MAAM,OAAO,GAAG,IAAI,GAAG,EAAO,CAAC;YAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBACzB,MAAM,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,IAAI,MAAM,IAAI,IAAI,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,CAAC;oBAC9C,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;oBACvB,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;gBACxB,CAAC;YACH,CAAC;YACD,MAAM,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC;QACxE,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;IACH,CAAC;IAED,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/middlewares/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/middlewares/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,eAAe,CAAC"}
|
|
@@ -35,5 +35,16 @@ export declare const manageInfiteScrollState: (state: any, action: any, status:
|
|
|
35
35
|
export declare const generateInifiniteScrollCases: (builder: ActionReducerMapBuilder<any>, actionCreator: any, keys: InfiniteScrollStateKeys, options?: {
|
|
36
36
|
manageTotal?: boolean;
|
|
37
37
|
parseFunction?: (data: any[]) => any[];
|
|
38
|
+
keyExtractor?: (action: any) => string;
|
|
39
|
+
keyStateContainer?: string;
|
|
40
|
+
}) => void;
|
|
41
|
+
type FetchRecordStateKeys = {
|
|
42
|
+
loading: string;
|
|
43
|
+
record: string;
|
|
44
|
+
};
|
|
45
|
+
export declare const generateFetchRecordCases: (builder: ActionReducerMapBuilder<any>, actionCreator: any, keys: FetchRecordStateKeys, options?: {
|
|
46
|
+
parseFunction?: (data: any) => any;
|
|
47
|
+
keyExtractor?: (action: any) => string;
|
|
48
|
+
keyStateContainer?: string;
|
|
38
49
|
}) => void;
|
|
39
50
|
export {};
|
|
@@ -19,7 +19,7 @@ import { checkNullString } from '@axelor/aos-mobile-ui';
|
|
|
19
19
|
import { traceError } from '../api/traceback-api';
|
|
20
20
|
import { i18nProvider } from '../i18n';
|
|
21
21
|
import { apiProviderConfig } from './config';
|
|
22
|
-
import { showToastMessage } from '../utils';
|
|
22
|
+
import { showToastMessage, isEmpty } from '../utils';
|
|
23
23
|
import { requestBuilder } from './Standard/requests.helper';
|
|
24
24
|
export const getApiResponseData = (response, { isArrayResponse = true }) => {
|
|
25
25
|
if (response.data && response.data.object != null) {
|
|
@@ -169,14 +169,57 @@ export const manageInfiteScrollState = (state, action, status, keys, manageTotal
|
|
|
169
169
|
return state;
|
|
170
170
|
};
|
|
171
171
|
export const generateInifiniteScrollCases = (builder, actionCreator, keys, options) => {
|
|
172
|
+
const getTargetState = (state, action) => {
|
|
173
|
+
if (!options?.keyExtractor || !options?.keyStateContainer)
|
|
174
|
+
return state;
|
|
175
|
+
const key = options.keyExtractor(action);
|
|
176
|
+
if (!state[options.keyStateContainer][key]) {
|
|
177
|
+
state[options.keyStateContainer][key] = {
|
|
178
|
+
[keys.loading]: false,
|
|
179
|
+
[keys.moreLoading]: false,
|
|
180
|
+
[keys.isListEnd]: false,
|
|
181
|
+
[keys.list]: [],
|
|
182
|
+
};
|
|
183
|
+
}
|
|
184
|
+
return state[options.keyStateContainer][key];
|
|
185
|
+
};
|
|
172
186
|
builder.addCase(actionCreator.pending, (state, action) => {
|
|
173
|
-
state = manageInfiteScrollState(state, action, 'pending', keys, options?.manageTotal, options?.parseFunction);
|
|
187
|
+
state = manageInfiteScrollState(getTargetState(state, action), action, 'pending', keys, options?.manageTotal, options?.parseFunction);
|
|
174
188
|
});
|
|
175
189
|
builder.addCase(actionCreator.fulfilled, (state, action) => {
|
|
176
|
-
state = manageInfiteScrollState(state, action, 'fulfilled', keys, options?.manageTotal, options?.parseFunction);
|
|
190
|
+
state = manageInfiteScrollState(getTargetState(state, action), action, 'fulfilled', keys, options?.manageTotal, options?.parseFunction);
|
|
177
191
|
});
|
|
178
192
|
builder.addCase(actionCreator.rejected, (state, action) => {
|
|
179
|
-
state = manageInfiteScrollState(state, action, 'rejected', keys, options?.manageTotal, options?.parseFunction);
|
|
193
|
+
state = manageInfiteScrollState(getTargetState(state, action), action, 'rejected', keys, options?.manageTotal, options?.parseFunction);
|
|
194
|
+
});
|
|
195
|
+
};
|
|
196
|
+
export const generateFetchRecordCases = (builder, actionCreator, keys, options) => {
|
|
197
|
+
const getTargetState = (state, action) => {
|
|
198
|
+
if (!options?.keyExtractor || !options?.keyStateContainer)
|
|
199
|
+
return state;
|
|
200
|
+
const key = options.keyExtractor(action);
|
|
201
|
+
if (!state[options.keyStateContainer][key]) {
|
|
202
|
+
state[options.keyStateContainer][key] = {
|
|
203
|
+
[keys.loading]: false,
|
|
204
|
+
[keys.record]: null,
|
|
205
|
+
};
|
|
206
|
+
}
|
|
207
|
+
return state[options.keyStateContainer][key];
|
|
208
|
+
};
|
|
209
|
+
builder.addCase(actionCreator.pending, (state, action) => {
|
|
210
|
+
getTargetState(state, action)[keys.loading] = true;
|
|
211
|
+
});
|
|
212
|
+
builder.addCase(actionCreator.rejected, (state, action) => {
|
|
213
|
+
getTargetState(state, action)[keys.loading] = false;
|
|
214
|
+
});
|
|
215
|
+
builder.addCase(actionCreator.fulfilled, (state, action) => {
|
|
216
|
+
const _parseFunction = options?.parseFunction ?? (_d => _d);
|
|
217
|
+
const _result = action.payload;
|
|
218
|
+
const targetState = getTargetState(state, action);
|
|
219
|
+
targetState[keys.loading] = false;
|
|
220
|
+
targetState[keys.record] = isEmpty(_result)
|
|
221
|
+
? null
|
|
222
|
+
: _parseFunction(_result);
|
|
180
223
|
});
|
|
181
224
|
};
|
|
182
225
|
//# sourceMappingURL=utils.js.map
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../src/apiProviders/utils.ts"],"names":[],"mappings":"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"}
|
package/lib/app/Application.js
CHANGED
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import React, { useEffect, useRef } from 'react';
|
|
19
|
-
import { modulesProvider } from './modules';
|
|
19
|
+
import { erpAccressModule, modulesProvider } from './modules';
|
|
20
20
|
import ContextsProvider from './ContextsProvider';
|
|
21
21
|
import ContextedApplication from './ContextedApplication';
|
|
22
22
|
import { authModule } from '../auth';
|
|
@@ -24,13 +24,17 @@ import { RouterProvider } from '../config';
|
|
|
24
24
|
import { ApiProviderConfig } from '../apiProviders/config';
|
|
25
25
|
import { sessionStorage } from '../sessions';
|
|
26
26
|
const Application = ({ modules: modulesProvided, mainMenu, additionalsReducers, version, themes, defaultTheme, writingThemes, defaultWritingTheme, showModulesSubtitle = false, configuration, customLoginPage, }) => {
|
|
27
|
-
const modules = useRef([
|
|
27
|
+
const modules = useRef([
|
|
28
|
+
authModule,
|
|
29
|
+
erpAccressModule,
|
|
30
|
+
...modulesProvided,
|
|
31
|
+
]).current;
|
|
28
32
|
RouterProvider.init({
|
|
29
33
|
retrocompatibility: configuration?.retrocompatibilityAOS6,
|
|
30
34
|
routesDefinition: configuration?.additionalRoutes,
|
|
31
35
|
});
|
|
32
36
|
ApiProviderConfig.allowConnectionBlock =
|
|
33
|
-
configuration
|
|
37
|
+
configuration?.allowInternetConnectionBlock;
|
|
34
38
|
useEffect(() => {
|
|
35
39
|
modulesProvider.init(modules, modules
|
|
36
40
|
.filter(_module => _module.moduleRegister)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/app/Application.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,SAAS,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AAO/C,OAAO,
|
|
1
|
+
{"version":3,"file":"Application.js","sourceRoot":"","sources":["../../src/app/Application.tsx"],"names":[],"mappings":"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"}
|
package/lib/app/RootNavigator.js
CHANGED
|
@@ -22,6 +22,7 @@ import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
|
22
22
|
import { default as CoreNavigator } from '../navigator/Navigator';
|
|
23
23
|
import { getNetInfo, getTokenInfo } from '../api/net-info-utils';
|
|
24
24
|
import { useHeaderRegisters } from '../hooks/use-header-registers';
|
|
25
|
+
import { setConnected, useOnline } from '../features/onlineSlice';
|
|
25
26
|
import LoginScreen from '../screens/LoginScreen';
|
|
26
27
|
import SessionManagementScreen from '../screens/SessionManagementScreen';
|
|
27
28
|
import { useHeaderBand } from '../header';
|
|
@@ -41,6 +42,7 @@ const RootNavigator = ({ modules, mainMenu, onRefresh, configuration, customLogi
|
|
|
41
42
|
const { registerHeaderBand } = useHeaderBand();
|
|
42
43
|
const { updateConfigFromStorage } = useConfigUpdater();
|
|
43
44
|
const { logged } = useSelector(state => state.auth);
|
|
45
|
+
const { isConnected } = useOnline();
|
|
44
46
|
const modulesHeaderRegisters = useMemo(() => {
|
|
45
47
|
return modules
|
|
46
48
|
.filter(_module => _module.models?.headerRegisters)
|
|
@@ -49,7 +51,10 @@ const RootNavigator = ({ modules, mainMenu, onRefresh, configuration, customLogi
|
|
|
49
51
|
useHeaderRegisters(modulesHeaderRegisters);
|
|
50
52
|
const AppNavigator = useCallback(() => (<CoreNavigator mainMenu={mainMenu} onRefresh={onRefresh} versionCheckConfig={configuration?.versionCheckConfig}/>), [mainMenu, onRefresh, configuration?.versionCheckConfig]);
|
|
51
53
|
const checkInternetConnection = useCallback(async () => {
|
|
52
|
-
const { isConnected } = await getNetInfo();
|
|
54
|
+
const { isConnected: _isConnected } = await getNetInfo();
|
|
55
|
+
dispatch(setConnected(_isConnected));
|
|
56
|
+
}, [dispatch]);
|
|
57
|
+
useEffect(() => {
|
|
53
58
|
registerHeaderBand({
|
|
54
59
|
key: 'noInternetConnection',
|
|
55
60
|
text: I18n.t('Base_NoConnection'),
|
|
@@ -57,7 +62,7 @@ const RootNavigator = ({ modules, mainMenu, onRefresh, configuration, customLogi
|
|
|
57
62
|
order: 15,
|
|
58
63
|
showIf: !isConnected,
|
|
59
64
|
});
|
|
60
|
-
}, [Colors, I18n, registerHeaderBand]);
|
|
65
|
+
}, [Colors, I18n, registerHeaderBand, isConnected]);
|
|
61
66
|
useEffect(() => {
|
|
62
67
|
connectionInterval.current = setInterval(checkInternetConnection, 5000);
|
|
63
68
|
return () => clearInterval(connectionInterval.current);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAC,MAAM,OAAO,CAAC;AACrE,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EAAC,0BAA0B,EAAC,MAAM,gCAAgC,CAAC;AAC1E,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,OAAO,IAAI,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAChE,OAAO,EAAC,UAAU,EAAE,YAAY,EAAC,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAC,kBAAkB,EAAC,MAAM,+BAA+B,CAAC;AACjE,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,uBAAuB,MAAM,oCAAoC,CAAC;AACzE,OAAO,EAAC,aAAa,EAAC,MAAM,WAAW,CAAC;AACxC,OAAO,EAAC,aAAa,EAAC,MAAM,SAAS,CAAC;AACtC,OAAO,EAAC,gBAAgB,EAAC,MAAM,UAAU,CAAC;AAC1C,OAAO,EAAC,MAAM,EAAC,MAAM,uBAAuB,CAAC;AAC7C,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,6BAA6B,CAAC;AAE7D,MAAM,EAAC,SAAS,EAAE,MAAM,EAAC,GAAG,0BAA0B,EAAE,CAAC;AAEzD,MAAM,aAAa,GAAG,CAAC,EACrB,OAAO,EACP,QAAQ,EACR,SAAS,EACT,aAAa,EACb,eAAe,EAAE,eAAe,GACjC,EAAE,EAAE;IACH,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,QAAQ,GAAG,WAAW,EAAE,CAAC;IAE/B,MAAM,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IACnC,MAAM,kBAAkB,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAExC,MAAM,EAAC,cAAc,EAAC,GAAG,iBAAiB,EAAE,CAAC;IAC7C,MAAM,EAAC,kBAAkB,EAAC,GAAG,aAAa,EAAE,CAAC;IAC7C,MAAM,EAAC,uBAAuB,EAAC,GAAG,gBAAgB,EAAE,CAAC;IAErD,MAAM,EAAC,MAAM,EAAC,GAAG,WAAW,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"RootNavigator.js","sourceRoot":"","sources":["../../src/app/RootNavigator.js"],"names":[],"mappings":"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"}
|