@axelor/aos-mobile-core 7.2.34 → 7.2.36
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.
|
@@ -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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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "7.2.
|
|
3
|
+
"version": "7.2.36",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"publishConfig": {
|
|
@@ -84,8 +84,8 @@
|
|
|
84
84
|
"vision-camera-code-scanner": "^0.2.0"
|
|
85
85
|
},
|
|
86
86
|
"dependencies": {
|
|
87
|
-
"@axelor/aos-mobile-error": "7.2.
|
|
88
|
-
"@axelor/aos-mobile-ui": "7.2.
|
|
87
|
+
"@axelor/aos-mobile-error": "7.2.36",
|
|
88
|
+
"@axelor/aos-mobile-ui": "7.2.36",
|
|
89
89
|
"@react-navigation/drawer": "6.6.3",
|
|
90
90
|
"@react-navigation/native": "6.1.7",
|
|
91
91
|
"@react-navigation/native-stack": "6.9.13",
|