@axelor/aos-mobile-core 8.4.24 → 8.4.25
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/Action/index.d.ts +1 -1
- package/lib/apiProviders/Action/index.js +1 -0
- package/lib/apiProviders/Action/index.js.map +1 -1
- package/lib/apiProviders/Action/utils.d.ts +5 -0
- package/lib/apiProviders/Action/utils.js +16 -1
- package/lib/apiProviders/Action/utils.js.map +1 -1
- package/lib/apiProviders/Standard/requests.helper.js +2 -2
- package/lib/apiProviders/Standard/requests.helper.js.map +1 -1
- package/lib/apiProviders/index.d.ts +6 -6
- package/lib/apiProviders/index.js.map +1 -1
- package/lib/apiProviders/middlewares/fieldParser.js +18 -6
- package/lib/apiProviders/middlewares/fieldParser.js.map +1 -1
- package/lib/app/ContextedApplication.js +2 -0
- package/lib/app/ContextedApplication.js.map +1 -1
- package/lib/components/external/WebView/WebView.d.ts +5 -1
- package/lib/components/external/WebView/WebView.js +13 -5
- package/lib/components/external/WebView/WebView.js.map +1 -1
- package/lib/components/organisms/DateInput/DateInput.js +6 -3
- package/lib/components/organisms/DateInput/DateInput.js.map +1 -1
- package/lib/components/pages/FormView/Components/Field.d.ts +3 -3
- package/lib/components/pages/FormView/Components/Field.js +11 -20
- 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/FormView.js +12 -12
- package/lib/components/pages/FormView/FormView.js.map +1 -1
- package/lib/components/templates/SearchListView/SearchListView.d.ts +2 -1
- package/lib/components/templates/SearchListView/SearchListView.js +4 -1
- package/lib/components/templates/SearchListView/SearchListView.js.map +1 -1
- package/lib/forms/studio/display.helpers.js +6 -1
- package/lib/forms/studio/display.helpers.js.map +1 -1
- package/lib/forms/studio/formula.helpers.js +55 -0
- package/lib/forms/studio/formula.helpers.js.map +1 -1
- package/lib/forms/types.d.ts +3 -0
- package/lib/header/HeaderActionsProvider.js +6 -4
- package/lib/header/HeaderActionsProvider.js.map +1 -1
- package/lib/header/hooks.js +1 -1
- package/lib/header/hooks.js.map +1 -1
- package/lib/loader/ProcessStorage.d.ts +1 -0
- package/lib/loader/ProcessStorage.js +3 -0
- package/lib/loader/ProcessStorage.js.map +1 -1
- package/lib/loader/hooks.js +3 -0
- package/lib/loader/hooks.js.map +1 -1
- package/lib/permissions/format.helpers.js +9 -3
- package/lib/permissions/format.helpers.js.map +1 -1
- package/lib/selections/SelectionProvider.js +3 -2
- package/lib/selections/SelectionProvider.js.map +1 -1
- package/lib/tools/FileViewer.js +15 -16
- package/lib/tools/FileViewer.js.map +1 -1
- package/lib/utils/file.d.ts +1 -0
- package/lib/utils/file.js +1 -0
- package/lib/utils/file.js.map +1 -1
- package/lib/utils/index.d.ts +1 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/lib/webViews/WebViewPreloader.d.ts +3 -0
- package/lib/webViews/WebViewPreloader.js +111 -0
- package/lib/webViews/WebViewPreloader.js.map +1 -0
- package/lib/webViews/display.helpers.d.ts +5 -0
- package/lib/webViews/display.helpers.js +5 -0
- package/lib/webViews/display.helpers.js.map +1 -1
- package/lib/webViews/menu.helper.d.ts +2 -9
- package/lib/webViews/menu.helper.js +11 -4
- package/lib/webViews/menu.helper.js.map +1 -1
- package/lib/webViews/view/WebViewScreen.d.ts +3 -1
- package/lib/webViews/view/WebViewScreen.js +14 -10
- package/lib/webViews/view/WebViewScreen.js.map +1 -1
- package/lib/webViews/webView.provider.d.ts +28 -0
- package/lib/webViews/webView.provider.js +65 -0
- package/lib/webViews/webView.provider.js.map +1 -0
- package/package.json +8 -3
|
@@ -2,4 +2,4 @@ export { AosActionApi } from './AosActionApi';
|
|
|
2
2
|
export { GatewayActionApi } from './GatewayActionApi';
|
|
3
3
|
export { ActionApi } from './ActionApiProvider';
|
|
4
4
|
export { getActionApi, actionProvider, registerActionApi, useActionApi, } from './ActionProvider';
|
|
5
|
-
export { ActionRequest, MatcherConfig,
|
|
5
|
+
export { ActionMessageType, ActionRequest, FieldMatcher, MatcherConfig, getActionMessage, } from './utils';
|
|
@@ -18,4 +18,5 @@
|
|
|
18
18
|
export { AosActionApi } from './AosActionApi';
|
|
19
19
|
export { GatewayActionApi } from './GatewayActionApi';
|
|
20
20
|
export { getActionApi, actionProvider, registerActionApi, useActionApi, } from './ActionProvider';
|
|
21
|
+
export { getActionMessage, } from './utils';
|
|
21
22
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EACL,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,GACb,MAAM,kBAAkB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,YAAY,EAAC,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAC,gBAAgB,EAAC,MAAM,oBAAoB,CAAC;AAEpD,OAAO,EACL,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,GACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAKL,gBAAgB,GACjB,MAAM,SAAS,CAAC"}
|
|
@@ -15,4 +15,9 @@ export type MatcherConfig = {
|
|
|
15
15
|
export type FieldMatcher = {
|
|
16
16
|
[requestFieldName: string]: string;
|
|
17
17
|
};
|
|
18
|
+
export type ActionMessageType = 'error' | 'alert' | 'info' | 'notify';
|
|
19
|
+
export declare const getActionMessage: (response: any) => {
|
|
20
|
+
type: ActionMessageType;
|
|
21
|
+
message: string;
|
|
22
|
+
} | null;
|
|
18
23
|
export {};
|
|
@@ -15,5 +15,20 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
|
|
18
|
+
import { checkNullString } from '@axelor/aos-mobile-ui';
|
|
19
|
+
const ACTION_MESSAGE_TYPES_BY_SEVERITY = [
|
|
20
|
+
'error',
|
|
21
|
+
'alert',
|
|
22
|
+
'info',
|
|
23
|
+
'notify',
|
|
24
|
+
];
|
|
25
|
+
export const getActionMessage = (response) => {
|
|
26
|
+
const actionResult = response?.data?.data?.[0];
|
|
27
|
+
for (const type of ACTION_MESSAGE_TYPES_BY_SEVERITY) {
|
|
28
|
+
const message = actionResult?.[type]?.message;
|
|
29
|
+
if (!checkNullString(message))
|
|
30
|
+
return { type, message };
|
|
31
|
+
}
|
|
32
|
+
return null;
|
|
33
|
+
};
|
|
19
34
|
//# sourceMappingURL=utils.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/utils.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,uBAAuB,CAAC;AAyBtD,MAAM,gCAAgC,GAAwB;IAC5D,OAAO;IACP,OAAO;IACP,MAAM;IACN,QAAQ;CACT,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAC9B,QAAa,EACsC,EAAE;IACrD,MAAM,YAAY,GAAG,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;IAE/C,KAAK,MAAM,IAAI,IAAI,gCAAgC,EAAE;QACnD,MAAM,OAAO,GAAG,YAAY,EAAE,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;QAE9C,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC;YAAE,OAAO,EAAC,IAAI,EAAE,OAAO,EAAC,CAAC;KACvD;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC"}
|
|
@@ -74,7 +74,7 @@ class RequestBuilder {
|
|
|
74
74
|
};
|
|
75
75
|
}
|
|
76
76
|
if (provider === 'axios') {
|
|
77
|
-
axiosApiProvider.post({
|
|
77
|
+
return axiosApiProvider.post({
|
|
78
78
|
url: `/ws/rest/${model}/search`,
|
|
79
79
|
data: {
|
|
80
80
|
data: data,
|
|
@@ -169,7 +169,7 @@ class RequestBuilder {
|
|
|
169
169
|
return null;
|
|
170
170
|
}
|
|
171
171
|
if (provider === 'axios') {
|
|
172
|
-
axiosApiProvider.post({
|
|
172
|
+
return axiosApiProvider.post({
|
|
173
173
|
url: `/ws/rest/${model}/${id}/fetch`,
|
|
174
174
|
data: {
|
|
175
175
|
fields: getObjectFields(fieldKey),
|
|
@@ -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,EAAC,eAAe,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AAiCtE,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,GACM,EAAgB,EAAE;QAC9B,IAAI,KAAK,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE;YACrC,OAAO,IAAI,CAAC;SACb;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;YAC9B,QAAQ,CAAC,IAAI,CAAC,kBAAkB,CAAC,SAAS,EAAE,gBAAgB,CAAC,CAAC,CAAC;SAChE;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;YAC7B,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;SACnD;QAED,IAAI,MAAM,IAAI,IAAI,IAAI,MAAM,KAAK,EAAE,EAAE;YACnC,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;gBACxB,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;aACH;iBAAM;gBACL,IAAI,CAAC,OAAO,GAAG,MAAM,CAAC;gBACtB,IAAI,CAAC,cAAc,GAAG,aAAa,CAAC;aACrC;SACF;QAED,IAAI,cAAc,EAAE;YAClB,IAAI,CAAC,QAAQ,GAAG,cAAc,CAAC;YAC/B,IAAI,CAAC,cAAc,GAAG;gBACpB,GAAG,IAAI,CAAC,cAAc;gBACtB,GAAG,cAAc;aAClB,CAAC;SACH;QAED,IAAI,QAAQ,KAAK,OAAO,EAAE;YACxB,gBAAgB,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"requests.helper.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/requests.helper.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
export * from
|
|
2
|
-
export * from
|
|
3
|
-
export * from
|
|
4
|
-
export * from
|
|
5
|
-
export { apiProviderConfig, ApiProviderConfig } from
|
|
6
|
-
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState } from
|
|
1
|
+
export * from './Action';
|
|
2
|
+
export * from './Model';
|
|
3
|
+
export * from './Standard';
|
|
4
|
+
export * from './middlewares';
|
|
5
|
+
export { apiProviderConfig, ApiProviderConfig } from './config';
|
|
6
|
+
export { generateInifiniteScrollCases, getApiResponseData, getFirstData, handlerApiCall, handlerError, manageInfiteScrollState, } from './utils';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/apiProviders/index.ts"],"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"}
|
|
@@ -36,18 +36,30 @@ const parseDataFields = (data) => {
|
|
|
36
36
|
return data;
|
|
37
37
|
};
|
|
38
38
|
const parseField = (fieldName, value, object) => {
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
const
|
|
39
|
+
const _fieldName = renameVersionField(fieldName);
|
|
40
|
+
if (_fieldName.includes('.')) {
|
|
41
|
+
const dotIndex = _fieldName.indexOf('.');
|
|
42
|
+
const _name = _fieldName.substring(0, dotIndex);
|
|
42
43
|
if (value == null) {
|
|
43
44
|
return object;
|
|
44
45
|
}
|
|
45
46
|
return {
|
|
46
47
|
...object,
|
|
47
|
-
[
|
|
48
|
-
[_name]: parseField(
|
|
48
|
+
[_fieldName]: value,
|
|
49
|
+
[_name]: parseField(_fieldName.substring(dotIndex + 1), value, object[_name] || {}),
|
|
49
50
|
};
|
|
50
51
|
}
|
|
51
|
-
return { ...object, [
|
|
52
|
+
return { ...object, [_fieldName]: parseDataFields(value) };
|
|
53
|
+
};
|
|
54
|
+
const API_VERSION_FIELD = '$version';
|
|
55
|
+
const VERSION_FIELD = 'version';
|
|
56
|
+
const renameVersionField = (fieldName) => {
|
|
57
|
+
if (fieldName === API_VERSION_FIELD) {
|
|
58
|
+
return VERSION_FIELD;
|
|
59
|
+
}
|
|
60
|
+
if (fieldName.endsWith(`.${API_VERSION_FIELD}`)) {
|
|
61
|
+
return `${fieldName.slice(0, -API_VERSION_FIELD.length)}${VERSION_FIELD}`;
|
|
62
|
+
}
|
|
63
|
+
return fieldName;
|
|
52
64
|
};
|
|
53
65
|
//# sourceMappingURL=fieldParser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fieldParser.js","sourceRoot":"","sources":["../../../src/apiProviders/middlewares/fieldParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAuB,EACR,EAAE;IACjB,IAAI,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC1D;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAS,EAAO,EAAE;IACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;KAClD;IAED,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI,WAAW,GAAG,EAAE,CAAC;QAErB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;SACvD;QAED,OAAO,WAAW,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAE,KAAU,EAAE,MAAW,EAAO,EAAE;IACrE,
|
|
1
|
+
{"version":3,"file":"fieldParser.js","sourceRoot":"","sources":["../../../src/apiProviders/middlewares/fieldParser.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAGH,OAAO,EAAC,aAAa,EAAC,MAAM,aAAa,CAAC;AAE1C,MAAM,CAAC,MAAM,sBAAsB,GAAG,CACpC,QAAuB,EACR,EAAE;IACjB,IAAI,QAAQ,EAAE,IAAI,EAAE,IAAI,EAAE;QACxB,QAAQ,CAAC,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KAC1D;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAS,EAAO,EAAE;IACzC,IAAI,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QACvB,OAAO,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC;KAClD;IAED,IAAI,aAAa,CAAC,IAAI,CAAC,EAAE;QACvB,IAAI,WAAW,GAAG,EAAE,CAAC;QAErB,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAC1C,WAAW,GAAG,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC,CAAC;SACvD;QAED,OAAO,WAAW,CAAC;KACpB;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,MAAM,UAAU,GAAG,CAAC,SAAiB,EAAE,KAAU,EAAE,MAAW,EAAO,EAAE;IACrE,MAAM,UAAU,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;IAEjD,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;QAC5B,MAAM,QAAQ,GAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,KAAK,GAAG,UAAU,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;QAEhD,IAAI,KAAK,IAAI,IAAI,EAAE;YACjB,OAAO,MAAM,CAAC;SACf;QAED,OAAO;YACL,GAAG,MAAM;YACT,CAAC,UAAU,CAAC,EAAE,KAAK;YACnB,CAAC,KAAK,CAAC,EAAE,UAAU,CACjB,UAAU,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,CAAC,EAClC,KAAK,EACL,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,CACpB;SACF,CAAC;KACH;IAED,OAAO,EAAC,GAAG,MAAM,EAAE,CAAC,UAAU,CAAC,EAAE,eAAe,CAAC,KAAK,CAAC,EAAC,CAAC;AAC3D,CAAC,CAAC;AAEF,MAAM,iBAAiB,GAAG,UAAU,CAAC;AACrC,MAAM,aAAa,GAAG,SAAS,CAAC;AAEhC,MAAM,kBAAkB,GAAG,CAAC,SAAiB,EAAU,EAAE;IACvD,IAAI,SAAS,KAAK,iBAAiB,EAAE;QACnC,OAAO,aAAa,CAAC;KACtB;IAED,IAAI,SAAS,CAAC,QAAQ,CAAC,IAAI,iBAAiB,EAAE,CAAC,EAAE;QAC/C,OAAO,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,iBAAiB,CAAC,MAAM,CAAC,GAAG,aAAa,EAAE,CAAC;KAC3E;IAED,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}
|
|
@@ -30,6 +30,7 @@ import { useDispatch, useSelector } from '../redux/hooks';
|
|
|
30
30
|
import { setAppVersion } from '../features/authSlice';
|
|
31
31
|
import { MaintenanceTrigger } from '../apiProviders';
|
|
32
32
|
import { resetConfigs } from '../features/appConfigSlice';
|
|
33
|
+
import WebViewPreloader from '../webViews/WebViewPreloader';
|
|
33
34
|
const ContextedApplication = ({ modules, mainMenu, version, configuration, customLoginPage, }) => {
|
|
34
35
|
const dispatch = useDispatch();
|
|
35
36
|
const { logged } = useSelector(state => state.auth);
|
|
@@ -62,6 +63,7 @@ const ContextedApplication = ({ modules, mainMenu, version, configuration, custo
|
|
|
62
63
|
<LoadingIndicator />
|
|
63
64
|
<BlockInteractionMessage />
|
|
64
65
|
<GlobalToolBox />
|
|
66
|
+
<WebViewPreloader />
|
|
65
67
|
<RootNavigator modules={modules} mainMenu={mainMenu} onRefresh={handleAppRefresh} configuration={configuration} customLoginPage={customLoginPage}/>
|
|
66
68
|
</NavigationContainer>
|
|
67
69
|
</ErrorBoundary>
|
|
@@ -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,EAAC,WAAW,EAAC,MAAM,YAAY,CAAC;AACvC,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,EAAE,WAAW,EAAC,MAAM,gBAAgB,CAAC;AACxD,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAEpD,OAAO,EAAC,kBAAkB,EAAC,MAAM,iBAAiB,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"ContextedApplication.js","sourceRoot":"","sources":["../../src/app/ContextedApplication.tsx"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,10 @@ interface WebViewProps {
|
|
|
4
4
|
baseUrl?: string;
|
|
5
5
|
path?: string;
|
|
6
6
|
queryParams?: Object;
|
|
7
|
+
injectedJavaScript?: string;
|
|
8
|
+
onMessage?: (event: any) => void;
|
|
9
|
+
onLoadEnd?: () => void;
|
|
10
|
+
onError?: () => void;
|
|
7
11
|
}
|
|
8
|
-
declare const WebView: ({ style, baseUrl, path, queryParams }: WebViewProps) => React.JSX.Element;
|
|
12
|
+
declare const WebView: ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }: WebViewProps) => React.JSX.Element;
|
|
9
13
|
export default WebView;
|
|
@@ -19,18 +19,19 @@ import React, { useMemo } from 'react';
|
|
|
19
19
|
import { ActivityIndicator, StyleSheet } from 'react-native';
|
|
20
20
|
import { WebView as RNWebView } from 'react-native-webview';
|
|
21
21
|
import { useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
|
+
import { useOnline } from '../../../features/onlineSlice';
|
|
22
23
|
import { useSelector } from '../../../redux/hooks';
|
|
23
24
|
import { checkNullString } from '../../../utils';
|
|
24
|
-
const WebView = ({ style, baseUrl, path, queryParams }) => {
|
|
25
|
+
const WebView = ({ style, baseUrl, path, queryParams, injectedJavaScript, onMessage, onLoadEnd, onError, }) => {
|
|
25
26
|
const Colors = useThemeColor();
|
|
26
|
-
const {
|
|
27
|
+
const { isEnabled: isConnected } = useOnline();
|
|
28
|
+
const { baseUrl: AOSBaseUrl, token, jsessionId, } = useSelector(state => state.auth);
|
|
27
29
|
const formattedQueryParams = useMemo(() => {
|
|
28
30
|
let _formattedQueryParams = '';
|
|
29
31
|
if (queryParams != null) {
|
|
30
32
|
Object.entries(queryParams).map(([key, value]) => {
|
|
31
|
-
if (value == null)
|
|
33
|
+
if (value == null)
|
|
32
34
|
return;
|
|
33
|
-
}
|
|
34
35
|
const separator = checkNullString(_formattedQueryParams) ? '?' : '&';
|
|
35
36
|
const queryParam = key + '=' + value;
|
|
36
37
|
_formattedQueryParams += separator + queryParam;
|
|
@@ -39,7 +40,14 @@ const WebView = ({ style, baseUrl, path, queryParams }) => {
|
|
|
39
40
|
return _formattedQueryParams;
|
|
40
41
|
}, [queryParams]);
|
|
41
42
|
const uri = useMemo(() => (baseUrl ?? AOSBaseUrl) + path + formattedQueryParams, [AOSBaseUrl, baseUrl, formattedQueryParams, path]);
|
|
42
|
-
|
|
43
|
+
const targetsAOSInstance = useMemo(() => !checkNullString(AOSBaseUrl) &&
|
|
44
|
+
(checkNullString(baseUrl) || baseUrl.startsWith(AOSBaseUrl)), [AOSBaseUrl, baseUrl]);
|
|
45
|
+
const headers = useMemo(() => {
|
|
46
|
+
if (!targetsAOSInstance)
|
|
47
|
+
return undefined;
|
|
48
|
+
return { Cookie: `CSRF-TOKEN=${token}; ${jsessionId}` };
|
|
49
|
+
}, [jsessionId, targetsAOSInstance, token]);
|
|
50
|
+
return (<RNWebView containerStyle={style} source={{ uri, headers }} cacheEnabled cacheMode={isConnected ? 'LOAD_DEFAULT' : 'LOAD_CACHE_ELSE_NETWORK'} domStorageEnabled sharedCookiesEnabled thirdPartyCookiesEnabled geolocationEnabled injectedJavaScript={injectedJavaScript} onMessage={onMessage} onLoadEnd={onLoadEnd} onError={onError} startInLoadingState renderLoading={() => (<ActivityIndicator style={styles.activityIndicator} size="large" color={Colors.inverseColor.background}/>)}/>);
|
|
43
51
|
};
|
|
44
52
|
const styles = StyleSheet.create({
|
|
45
53
|
activityIndicator: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,OAAO,EAAC,MAAM,OAAO,CAAC;AACrC,OAAO,EAAC,iBAAiB,EAAE,UAAU,EAAC,MAAM,cAAc,CAAC;AAC3D,OAAO,EAAC,OAAO,IAAI,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAC,aAAa,EAAC,MAAM,uBAAuB,CAAC;AACpD,OAAO,EAAC,WAAW,EAAC,MAAM,sBAAsB,CAAC;AACjD,OAAO,EAAC,eAAe,EAAC,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"WebView.js","sourceRoot":"","sources":["../../../../src/components/external/WebView/WebView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -87,11 +87,11 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, po
|
|
|
87
87
|
wrapperRef,
|
|
88
88
|
});
|
|
89
89
|
useEffect(() => {
|
|
90
|
-
if (clickOutside === OUTSIDE_INDICATOR && pickerIsOpen) {
|
|
90
|
+
if (clickOutside === OUTSIDE_INDICATOR && pickerIsOpen && !popup) {
|
|
91
91
|
setSelectedDate(defaultDate);
|
|
92
92
|
setPickerIsOpen(false);
|
|
93
93
|
}
|
|
94
|
-
}, [clickOutside, defaultDate, pickerIsOpen]);
|
|
94
|
+
}, [clickOutside, defaultDate, pickerIsOpen, popup]);
|
|
95
95
|
const togglePicker = () => {
|
|
96
96
|
if (!readonly) {
|
|
97
97
|
setPickerIsOpen(current => !current);
|
|
@@ -117,7 +117,10 @@ const DateInput = ({ title, defaultDate, mode = 'datetime', nullable = false, po
|
|
|
117
117
|
<View style={Platform.OS === 'ios' ? styles.dropdownContainer : null}>
|
|
118
118
|
{popup ? (<Alert visible={pickerIsOpen} cancelButtonConfig={{
|
|
119
119
|
showInHeader: true,
|
|
120
|
-
onPress: () =>
|
|
120
|
+
onPress: () => {
|
|
121
|
+
setSelectedDate(defaultDate);
|
|
122
|
+
setPickerIsOpen(false);
|
|
123
|
+
},
|
|
121
124
|
}}>
|
|
122
125
|
<DateInputSelection mode={mode} nullable={nullable} popup={popup} currentDate={currentDate} selectedDate={selectedDate} setSelectedDate={setSelectedDate} onDateChange={onDateChange} setPickerIsOpen={setPickerIsOpen}/>
|
|
123
126
|
</Alert>) : (pickerIsOpen && (<Card style={styles.selectionContainer}>
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AAC/E,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACpE,OAAO,EACL,KAAK,EACL,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,IAAI,EACJ,eAAe,EACf,aAAa,EACb,iBAAiB,EAEjB,eAAe,GAChB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,aAAa,EAAC,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAC,UAAU,EAAC,MAAM,iBAAiB,CAAC;AAC3C,OAAO,cAAc,MAAM,qBAAqB,CAAC;AAEjD,MAAM,gBAAgB,GAAG,EAAE,CAAC;AAa5B,MAAM,kBAAkB,GAAG,CAAC,EAC1B,IAAI,EACJ,QAAQ,EACR,KAAK,EACL,WAAW,EACX,YAAY,EACZ,eAAe,EACf,YAAY,EACZ,eAAe,GACS,EAAE,EAAE;IAC5B,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAE/B,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAU,CAAC;IAEzD,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,IAAI,CAAC,YAAY,EAAE;YACjB,eAAe,CAAC,WAAW,CAAC,CAAC;YAC7B,YAAY,CAAC,WAAW,CAAC,CAAC;YAC1B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;aAAM;YACL,YAAY,CAAC,YAAY,CAAC,CAAC;YAC3B,eAAe,CAAC,KAAK,CAAC,CAAC;SACxB;IACH,CAAC,EAAE;QACD,WAAW;QACX,YAAY;QACZ,YAAY;QACZ,eAAe;QACf,eAAe;KAChB,CAAC,CAAC;IAEH,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,eAAe,CAAC,IAAI,CAAC,CAAC;QACtB,YAAY,CAAC,IAAI,CAAC,CAAC;QACnB,eAAe,CAAC,KAAK,CAAC,CAAC;IACzB,CAAC,EAAE,CAAC,YAAY,EAAE,eAAe,EAAE,eAAe,CAAC,CAAC,CAAC;IAErD,OAAO,CACL,CAAC,IAAI,CACH,QAAQ,CAAC,CAAC,KAAK,CAAC,EAAE;YAChB,MAAM,EAAC,KAAK,EAAC,GAAG,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC;YACzC,cAAc,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC,CAAC,CACF,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,eAAe,CAAC,wBAAwB,CAAC,CAAC,CAAC,IAAI,CAAC,CAC/D;MAAA,CAAC,UAAU,CACT,WAAW,CAAC,CAAC,YAAY,IAAI,WAAW,CAAC,CACzC,YAAY,CAAC,CAAC,eAAe,CAAC,CAC9B,IAAI,CAAC,CAAC,IAAI,CAAC,CACX,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,KAAK,GAAG,GAAG,CAAC,CAAC,CAAC,WAAW,CAAC,EAE1E;MAAA,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,eAAe,CAAC,CAC3C;QAAA,CAAC,IAAI,CACH,IAAI,CAAC,mBAAmB,CACxB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CACtC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CACvB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,KAAK,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,EAEtC;QAAA,CAAC,QAAQ,IAAI,CACX,CAAC,IAAI,CACH,IAAI,CAAC,eAAe,CACpB,KAAK,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,UAAU,CAAC,CACtC,IAAI,CAAC,CAAC,gBAAgB,CAAC,CACvB,SAAS,CAAC,CAAC,IAAI,CAAC,CAChB,OAAO,CAAC,CAAC,WAAW,CAAC,CACrB,KAAK,CAAC,CAAC,eAAe,CAAC,YAAY,CAAC,EACpC,CACH,CACH;MAAA,EAAE,IAAI,CACR;IAAA,EAAE,IAAI,CAAC,CACR,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;IACxC,YAAY,EAAE;QACZ,UAAU,EAAE,EAAE;KACf;IACD,eAAe,EAAE;QACf,aAAa,EAAE,KAAK;QACpB,cAAc,EAAE,UAAU;QAC1B,UAAU,EAAE,UAAU;QACtB,SAAS,EAAE,UAAU;KACtB;IACD,wBAAwB,EAAE;QACxB,SAAS,EAAE,EAAE;KACd;CACF,CAAC,CAAC;AAcH,MAAM,SAAS,GAAG,CAAC,EACjB,KAAK,EACL,WAAW,EACX,IAAI,GAAG,UAAU,EACjB,QAAQ,GAAG,KAAK,EAChB,KAAK,GAAG,KAAK,EACb,YAAY,EACZ,KAAK,EACL,QAAQ,GAAG,KAAK,EAChB,QAAQ,GAAG,KAAK,GACD,EAAE,EAAE;IACnB,MAAM,MAAM,GAAG,aAAa,EAAE,CAAC;IAC/B,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAE7B,MAAM,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,IAAI,EAAE,EAAE,EAAE,CAAC,CAAC;IAElD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IACxD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAG,OAAO,CACvB,GAAG,EAAE,CAAC,QAAQ,IAAI,YAAY,IAAI,IAAI,EACtC,CAAC,QAAQ,EAAE,YAAY,CAAC,CACzB,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,eAAe,CAAC,WAAW,CAAC,CAAC;IAC/B,CAAC,EAAE,CAAC,WAAW,CAAC,CAAC,CAAC;IAElB,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC;IAChC,MAAM,YAAY,GAAG,eAAe,CAAC;QACnC,UAAU;KACX,CAAC,CAAC;IAEH,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,YAAY,KAAK,iBAAiB,IAAI,YAAY,EAAE;
|
|
1
|
+
{"version":3,"file":"DateInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/DateInput/DateInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import React from 'react';
|
|
2
|
-
import { DisplayField, DisplayPanel
|
|
2
|
+
import { DisplayField, DisplayPanel } from '../../../../forms';
|
|
3
3
|
interface FieldProps {
|
|
4
4
|
handleFieldChange: (newValue: any, fieldName: string) => void;
|
|
5
5
|
_field: DisplayField;
|
|
6
6
|
object: any;
|
|
7
|
-
|
|
7
|
+
parentReadonly?: boolean;
|
|
8
8
|
formContent: (DisplayPanel | DisplayField)[];
|
|
9
9
|
modelName: string;
|
|
10
10
|
}
|
|
11
|
-
declare const Field: ({ handleFieldChange, _field, object,
|
|
11
|
+
declare const Field: ({ handleFieldChange, _field, object, parentReadonly, formContent, modelName, }: FieldProps) => React.JSX.Element;
|
|
12
12
|
export default Field;
|
|
@@ -25,18 +25,16 @@ import { UploadFileInput } from '../../../molecules';
|
|
|
25
25
|
import { DateInput, SignatureInput } from '../../../organisms';
|
|
26
26
|
import { CustomPasswordInput } from '../Custom';
|
|
27
27
|
import { useFieldPermitted } from '../../../../permissions';
|
|
28
|
-
const Field = ({ handleFieldChange, _field, object,
|
|
28
|
+
const Field = ({ handleFieldChange, _field, object, parentReadonly = false, formContent, modelName, }) => {
|
|
29
29
|
const I18n = useTranslator();
|
|
30
30
|
const Colors = useThemeColor();
|
|
31
31
|
const value = object?.[_field.key];
|
|
32
|
-
const storeState = useSelector(
|
|
32
|
+
const storeState = useSelector(state => state);
|
|
33
33
|
const { hidden, readonly } = useFieldPermitted({
|
|
34
34
|
modelName,
|
|
35
35
|
fieldName: _field.key,
|
|
36
36
|
});
|
|
37
|
-
const zIndex = useMemo(() =>
|
|
38
|
-
return getZIndex(formContent, _field.key);
|
|
39
|
-
}, [_field.key, formContent]);
|
|
37
|
+
const zIndex = useMemo(() => getZIndex(formContent, _field.key), [_field.key, formContent]);
|
|
40
38
|
const [error, setError] = useState();
|
|
41
39
|
const handleValidate = useCallback((_value) => {
|
|
42
40
|
validateFieldSchema(_field, _value)
|
|
@@ -51,19 +49,12 @@ const Field = ({ handleFieldChange, _field, object, globalReadonly = () => false
|
|
|
51
49
|
handleValidate(_value);
|
|
52
50
|
handleFieldChange(_value, _field.key);
|
|
53
51
|
}, [_field.key, handleFieldChange, handleValidate]);
|
|
54
|
-
const isHidden = useMemo(() => {
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
}, [_field, object, storeState]);
|
|
61
|
-
const isReadonly = useMemo(() => {
|
|
62
|
-
return (readonly ||
|
|
63
|
-
globalReadonly({ objectState: object, storeState: storeState }) ||
|
|
64
|
-
_field.readonly ||
|
|
65
|
-
_field.readonlyIf({ objectState: object, storeState: storeState }));
|
|
66
|
-
}, [_field, globalReadonly, object, readonly, storeState]);
|
|
52
|
+
const isHidden = useMemo(() => hidden || _field.hideIf?.({ objectState: object, storeState }), [_field, hidden, object, storeState]);
|
|
53
|
+
const isRequired = useMemo(() => _field.required || _field.requiredIf?.({ objectState: object, storeState }), [_field, object, storeState]);
|
|
54
|
+
const isReadonly = useMemo(() => readonly ||
|
|
55
|
+
parentReadonly ||
|
|
56
|
+
_field.readonly ||
|
|
57
|
+
_field.readonlyIf?.({ objectState: object, storeState }), [_field, object, parentReadonly, readonly, storeState]);
|
|
67
58
|
const fieldStyle = useMemo(() => ({
|
|
68
59
|
width: `${_field.parentPanel != null ? 100 : 90}%`,
|
|
69
60
|
alignSelf: 'center',
|
|
@@ -71,7 +62,7 @@ const Field = ({ handleFieldChange, _field, object, globalReadonly = () => false
|
|
|
71
62
|
const getComponent = () => {
|
|
72
63
|
switch (getWidget(_field)) {
|
|
73
64
|
case 'custom':
|
|
74
|
-
return _field.customComponent({
|
|
65
|
+
return _field.customComponent?.({
|
|
75
66
|
style: fieldStyle,
|
|
76
67
|
title: I18n.t(_field.titleKey),
|
|
77
68
|
defaultValue: value,
|
|
@@ -90,7 +81,7 @@ const Field = ({ handleFieldChange, _field, object, globalReadonly = () => false
|
|
|
90
81
|
case 'signature':
|
|
91
82
|
return (<SignatureInput style={fieldStyle} title={I18n.t(_field.titleKey)} defaultValue={value} onChange={handleChange} required={isRequired} readonly={isReadonly} popup={true} {..._field.options}/>);
|
|
92
83
|
case 'date':
|
|
93
|
-
return (<DateInput style={fieldStyle} title={I18n.t(_field.titleKey)} mode={_field.type} defaultDate={value ? new Date(value) :
|
|
84
|
+
return (<DateInput style={fieldStyle} title={I18n.t(_field.titleKey)} mode={_field.type} defaultDate={value ? new Date(value) : undefined} onDateChange={_date => {
|
|
94
85
|
if (_date) {
|
|
95
86
|
const isoDate = _date.toISOString();
|
|
96
87
|
if (_field.type === 'datetime') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../../../../src/components/pages/FormView/Components/Field.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,QAAQ,EAAE,OAAO,EAAC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAC,UAAU,EAAa,UAAU,EAAE,IAAI,EAAY,MAAM,cAAc,CAAC;AAChF,OAAO,EACL,QAAQ,EACR,aAAa,EACb,kBAAkB,EAClB,SAAS,EACT,UAAU,EACV,KAAK,EACL,SAAS,EACT,IAAI,EACJ,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,
|
|
1
|
+
{"version":3,"file":"Field.js","sourceRoot":"","sources":["../../../../../src/components/pages/FormView/Components/Field.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import React, { ReactNode } from 'react';
|
|
2
2
|
import { DisplayField, DisplayPanel } from '../../../../forms';
|
|
3
3
|
interface PanelProps {
|
|
4
|
-
renderItem: (item: DisplayPanel | DisplayField) => ReactNode;
|
|
4
|
+
renderItem: (item: DisplayPanel | DisplayField, readonly?: boolean) => ReactNode;
|
|
5
5
|
formContent: (DisplayPanel | DisplayField)[];
|
|
6
6
|
_panel: DisplayPanel;
|
|
7
|
+
object: any;
|
|
8
|
+
parentReadonly?: boolean;
|
|
7
9
|
}
|
|
8
|
-
declare const Panel: ({ renderItem, formContent, _panel }: PanelProps) => React.JSX.Element;
|
|
10
|
+
declare const Panel: ({ renderItem, formContent, _panel, object, parentReadonly, }: PanelProps) => React.JSX.Element;
|
|
9
11
|
export default Panel;
|
|
@@ -15,16 +15,20 @@
|
|
|
15
15
|
* You should have received a copy of the GNU Affero General Public License
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
|
-
import React, { useMemo } from 'react';
|
|
18
|
+
import React, { useCallback, useMemo } from 'react';
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { DropdownCard, HorizontalRule, Text } from '@axelor/aos-mobile-ui';
|
|
21
|
+
import { useSelector } from '../../../../redux/hooks';
|
|
21
22
|
import { useTranslator } from '../../../../i18n';
|
|
22
23
|
import { DEFAULT_COLSPAN, getZIndex, getZIndexStyle, } from '../../../../forms';
|
|
23
|
-
const Panel = ({ renderItem, formContent, _panel }) => {
|
|
24
|
+
const Panel = ({ renderItem, formContent, _panel, object, parentReadonly = false, }) => {
|
|
24
25
|
const I18n = useTranslator();
|
|
25
|
-
const
|
|
26
|
-
|
|
27
|
-
|
|
26
|
+
const storeState = useSelector(state => state);
|
|
27
|
+
const isHidden = useMemo(() => _panel.hideIf?.({ objectState: object, storeState }), [_panel, object, storeState]);
|
|
28
|
+
const isReadonly = useMemo(() => parentReadonly ||
|
|
29
|
+
_panel.readonly ||
|
|
30
|
+
_panel.readonlyIf?.({ objectState: object, storeState }), [_panel, object, parentReadonly, storeState]);
|
|
31
|
+
const zIndex = useMemo(() => getZIndex(formContent, _panel.key), [_panel.key, formContent]);
|
|
28
32
|
const panelStyle = useMemo(() => ({
|
|
29
33
|
alignItems: 'center',
|
|
30
34
|
flexDirection: _panel.direction ?? 'row',
|
|
@@ -37,6 +41,11 @@ const Panel = ({ renderItem, formContent, _panel }) => {
|
|
|
37
41
|
paddingLeft: _panel.parent != null ? 5 : null,
|
|
38
42
|
paddingRight: _panel.parent != null ? 5 : null,
|
|
39
43
|
}), [_panel]);
|
|
44
|
+
const renderContent = useCallback(() => {
|
|
45
|
+
return _panel.content?.map(_i => renderItem(_i, isReadonly));
|
|
46
|
+
}, [_panel.content, isReadonly, renderItem]);
|
|
47
|
+
if (isHidden)
|
|
48
|
+
return null;
|
|
40
49
|
if (!Array.isArray(_panel.content) || _panel.content.length === 0) {
|
|
41
50
|
return <View key={_panel.key} style={panelStyle}/>;
|
|
42
51
|
}
|
|
@@ -44,12 +53,10 @@ const Panel = ({ renderItem, formContent, _panel }) => {
|
|
|
44
53
|
return (<DropdownCard key={_panel.key} title={I18n.t(_panel.titleKey)} styleContainer={getZIndexStyle(zIndex)}>
|
|
45
54
|
<View style={[
|
|
46
55
|
styles.content,
|
|
47
|
-
{
|
|
48
|
-
flexDirection: panelStyle.flexDirection,
|
|
49
|
-
},
|
|
56
|
+
{ flexDirection: panelStyle.flexDirection },
|
|
50
57
|
getZIndexStyle(zIndex + 1),
|
|
51
58
|
]}>
|
|
52
|
-
{
|
|
59
|
+
{renderContent()}
|
|
53
60
|
</View>
|
|
54
61
|
</DropdownCard>);
|
|
55
62
|
}
|
|
@@ -59,17 +66,15 @@ const Panel = ({ renderItem, formContent, _panel }) => {
|
|
|
59
66
|
<HorizontalRule style={styles.line}/>
|
|
60
67
|
<View style={[
|
|
61
68
|
styles.content,
|
|
62
|
-
{
|
|
63
|
-
flexDirection: panelStyle.flexDirection,
|
|
64
|
-
},
|
|
69
|
+
{ flexDirection: panelStyle.flexDirection },
|
|
65
70
|
getZIndexStyle(zIndex + 1),
|
|
66
71
|
]}>
|
|
67
|
-
{
|
|
72
|
+
{renderContent()}
|
|
68
73
|
</View>
|
|
69
74
|
</View>);
|
|
70
75
|
}
|
|
71
76
|
return (<View key={_panel.key} style={[panelStyle, getZIndexStyle(zIndex)]}>
|
|
72
|
-
{
|
|
77
|
+
{renderContent()}
|
|
73
78
|
</View>);
|
|
74
79
|
};
|
|
75
80
|
const styles = StyleSheet.create({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../../../src/components/pages/FormView/Components/Panel.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAY,OAAO,EAAC,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"Panel.js","sourceRoot":"","sources":["../../../../../src/components/pages/FormView/Components/Panel.tsx"],"names":[],"mappings":"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"}
|