@axelor/aos-mobile-core 8.5.30 → 8.5.31
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/metafile-api.d.ts +3 -11
- package/lib/api/metafile-api.js +6 -3
- package/lib/api/metafile-api.js.map +1 -1
- package/lib/apiProviders/Action/ActionApiProvider.d.ts +19 -0
- package/lib/apiProviders/Action/AosActionApi.d.ts +6 -1
- package/lib/apiProviders/Action/AosActionApi.js +17 -0
- package/lib/apiProviders/Action/AosActionApi.js.map +1 -1
- package/lib/apiProviders/Action/GatewayActionApi.d.ts +5 -1
- package/lib/apiProviders/Action/GatewayActionApi.js +29 -1
- package/lib/apiProviders/Action/GatewayActionApi.js.map +1 -1
- package/lib/apiProviders/Action/index.d.ts +2 -2
- package/lib/apiProviders/Action/index.js.map +1 -1
- package/lib/apiProviders/Action/utils.d.ts +5 -0
- package/lib/apiProviders/Action/utils.js.map +1 -1
- package/lib/apiProviders/Standard/AxiosProvider.d.ts +10 -18
- package/lib/apiProviders/Standard/AxiosProvider.js +8 -8
- package/lib/apiProviders/Standard/AxiosProvider.js.map +1 -1
- package/lib/auth/features/userSlice.js +14 -0
- package/lib/auth/features/userSlice.js.map +1 -1
- package/lib/components/molecules/CameraButton/CameraButton.js +4 -8
- package/lib/components/molecules/CameraButton/CameraButton.js.map +1 -1
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js +5 -15
- package/lib/components/molecules/UploadFileInput/UploadFileInput.js.map +1 -1
- package/lib/components/organisms/AOSImage/AOSImage.js +3 -3
- 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/organisms/SignatureInput/SignatureInput.js +5 -17
- package/lib/components/organisms/SignatureInput/SignatureInput.js.map +1 -1
- package/lib/features/authSlice.js +3 -0
- package/lib/features/authSlice.js.map +1 -1
- package/lib/forms/studio/api.helpers.js +13 -3
- package/lib/forms/studio/api.helpers.js.map +1 -1
- package/lib/forms/validation.helpers.js +5 -1
- package/lib/forms/validation.helpers.js.map +1 -1
- package/lib/tools/FileViewer.js +19 -9
- package/lib/tools/FileViewer.js.map +1 -1
- package/lib/utils/file.d.ts +9 -0
- package/lib/utils/file.js +16 -0
- package/lib/utils/file.js.map +1 -1
- package/lib/utils/formatters.js +26 -2
- package/lib/utils/formatters.js.map +1 -1
- package/lib/utils/image.js +11 -5
- package/lib/utils/image.js.map +1 -1
- package/lib/utils/index.d.ts +2 -1
- package/lib/utils/index.js +1 -1
- package/lib/utils/index.js.map +1 -1
- package/package.json +3 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ActionApiCredentials, UploadedMetaFile, UploadFile } from '../apiProviders';
|
|
1
2
|
import { DocumentPickerResponse } from '@react-native-documents/picker';
|
|
2
3
|
export declare function fetchFileDetails({ listFiles }: {
|
|
3
4
|
listFiles: any;
|
|
@@ -7,15 +8,6 @@ export declare function uploadFile(file: DocumentPickerResponse, { baseUrl, jses
|
|
|
7
8
|
jsessionId: any;
|
|
8
9
|
token: any;
|
|
9
10
|
returnBase64String: any;
|
|
10
|
-
}): Promise<
|
|
11
|
-
export declare function uploadBase64(file: {
|
|
12
|
-
base64: string;
|
|
13
|
-
name: string;
|
|
14
|
-
size: number;
|
|
15
|
-
type: string;
|
|
16
|
-
}, { baseUrl, jsessionId, token }: {
|
|
17
|
-
baseUrl: any;
|
|
18
|
-
jsessionId: any;
|
|
19
|
-
token: any;
|
|
20
|
-
}): Promise<any>;
|
|
11
|
+
}): Promise<string | UploadedMetaFile>;
|
|
12
|
+
export declare function uploadBase64(file: UploadFile, { baseUrl, jsessionId, token }: ActionApiCredentials): Promise<UploadedMetaFile>;
|
|
21
13
|
export declare function deleteMetaFile(fileId: number): Promise<any>;
|
package/lib/api/metafile-api.js
CHANGED
|
@@ -15,7 +15,7 @@
|
|
|
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 {
|
|
18
|
+
import { createStandardSearch, getActionApi, } from '../apiProviders';
|
|
19
19
|
import RNFS from 'react-native-fs';
|
|
20
20
|
import RNFetchBlob from 'react-native-blob-util';
|
|
21
21
|
import { sanitizeFileName } from '../utils';
|
|
@@ -58,7 +58,7 @@ export async function uploadFile(file, { baseUrl, jsessionId, token, returnBase6
|
|
|
58
58
|
}
|
|
59
59
|
export async function uploadBase64(file, { baseUrl, jsessionId, token }) {
|
|
60
60
|
if (file == null) {
|
|
61
|
-
|
|
61
|
+
throw new Error('No file to upload.');
|
|
62
62
|
}
|
|
63
63
|
return new Promise(async (resolve, reject) => {
|
|
64
64
|
try {
|
|
@@ -87,8 +87,11 @@ export async function uploadBase64(file, { baseUrl, jsessionId, token }) {
|
|
|
87
87
|
});
|
|
88
88
|
}
|
|
89
89
|
export async function deleteMetaFile(fileId) {
|
|
90
|
-
return
|
|
90
|
+
return getActionApi().send({
|
|
91
91
|
url: `ws/rest/com.axelor.meta.db.MetaFile/${fileId}`,
|
|
92
|
+
method: 'delete',
|
|
93
|
+
body: undefined,
|
|
94
|
+
description: 'delete file',
|
|
92
95
|
});
|
|
93
96
|
}
|
|
94
97
|
//# sourceMappingURL=metafile-api.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"metafile-api.js","sourceRoot":"","sources":["../../src/api/metafile-api.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,25 @@
|
|
|
1
1
|
import { ActionRequest } from './utils';
|
|
2
|
+
export interface ActionApiCredentials {
|
|
3
|
+
baseUrl: string;
|
|
4
|
+
token: string;
|
|
5
|
+
jsessionId?: string;
|
|
6
|
+
}
|
|
7
|
+
export interface UploadFile {
|
|
8
|
+
base64: string;
|
|
9
|
+
name: string;
|
|
10
|
+
size: number;
|
|
11
|
+
type: string;
|
|
12
|
+
}
|
|
13
|
+
export type UploadedMetaFile = {
|
|
14
|
+
id: number;
|
|
15
|
+
fileName: string;
|
|
16
|
+
} & Record<string, unknown>;
|
|
2
17
|
export interface ActionApi {
|
|
18
|
+
init(credentials: ActionApiCredentials): void;
|
|
19
|
+
reset(): void;
|
|
3
20
|
isAvailable(): Promise<boolean>;
|
|
21
|
+
resolvePending(request: ActionRequest): Promise<ActionRequest | null>;
|
|
4
22
|
send(request: ActionRequest): Promise<any>;
|
|
23
|
+
upload(file: UploadFile): Promise<UploadedMetaFile>;
|
|
5
24
|
synchronize(onEnd?: () => void): Promise<void>;
|
|
6
25
|
}
|
|
@@ -1,9 +1,14 @@
|
|
|
1
|
-
import { ActionApi } from './ActionApiProvider';
|
|
1
|
+
import { ActionApi, ActionApiCredentials, UploadedMetaFile, UploadFile } from './ActionApiProvider';
|
|
2
2
|
import { ActionRequest } from './utils';
|
|
3
3
|
export declare class AosActionApi implements ActionApi {
|
|
4
|
+
private credentials;
|
|
4
5
|
constructor();
|
|
5
6
|
static isOnlineAvailable: boolean;
|
|
7
|
+
init(credentials: ActionApiCredentials): void;
|
|
8
|
+
reset(): void;
|
|
6
9
|
isAvailable(): Promise<boolean>;
|
|
10
|
+
resolvePending(request: ActionRequest): Promise<ActionRequest | null>;
|
|
7
11
|
send(request: ActionRequest): Promise<any>;
|
|
12
|
+
upload(file: UploadFile): Promise<UploadedMetaFile>;
|
|
8
13
|
synchronize(): Promise<void>;
|
|
9
14
|
}
|
|
@@ -17,9 +17,17 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import axios from 'axios';
|
|
19
19
|
import { getNetInfo } from '../../api/net-info-utils';
|
|
20
|
+
import { uploadBase64 } from '../../api/metafile-api';
|
|
20
21
|
export class AosActionApi {
|
|
22
|
+
credentials;
|
|
21
23
|
constructor() { }
|
|
22
24
|
static isOnlineAvailable = true;
|
|
25
|
+
init(credentials) {
|
|
26
|
+
this.credentials = credentials;
|
|
27
|
+
}
|
|
28
|
+
reset() {
|
|
29
|
+
this.credentials = undefined;
|
|
30
|
+
}
|
|
23
31
|
async isAvailable() {
|
|
24
32
|
const { isConnected } = await getNetInfo();
|
|
25
33
|
return new Promise(resolve => {
|
|
@@ -31,9 +39,18 @@ export class AosActionApi {
|
|
|
31
39
|
}
|
|
32
40
|
});
|
|
33
41
|
}
|
|
42
|
+
resolvePending(request) {
|
|
43
|
+
return Promise.resolve(request);
|
|
44
|
+
}
|
|
34
45
|
send(request) {
|
|
35
46
|
return axios[request.method](request.url, request.body);
|
|
36
47
|
}
|
|
48
|
+
upload(file) {
|
|
49
|
+
if (this.credentials == null) {
|
|
50
|
+
return Promise.reject(new Error('Cannot upload a file before the user is logged in.'));
|
|
51
|
+
}
|
|
52
|
+
return uploadBase64(file, this.credentials);
|
|
53
|
+
}
|
|
37
54
|
synchronize() {
|
|
38
55
|
return new Promise(resolve => {
|
|
39
56
|
resolve();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AosActionApi.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/AosActionApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;
|
|
1
|
+
{"version":3,"file":"AosActionApi.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/AosActionApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,UAAU,EAAC,MAAM,0BAA0B,CAAC;AACpD,OAAO,EAAC,YAAY,EAAC,MAAM,wBAAwB,CAAC;AASpD,MAAM,OAAO,YAAY;IACf,WAAW,CAAmC;IAEtD,gBAAe,CAAC;IAEhB,MAAM,CAAC,iBAAiB,GAAG,IAAI,CAAC;IAEhC,IAAI,CAAC,WAAiC;QACpC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;IACjC,CAAC;IAED,KAAK;QACH,IAAI,CAAC,WAAW,GAAG,SAAS,CAAC;IAC/B,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,EAAC,WAAW,EAAC,GAAG,MAAM,UAAU,EAAE,CAAC;QAEzC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,IAAI,CAAC,YAAY,CAAC,iBAAiB,EAAE;gBACnC,OAAO,CAAC,KAAK,CAAC,CAAC;aAChB;iBAAM;gBACL,OAAO,CAAC,WAAW,CAAC,CAAC;aACtB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED,cAAc,CAAC,OAAsB;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,OAAsB;QACzB,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;IAC1D,CAAC;IAED,MAAM,CAAC,IAAgB;QACrB,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;YAC5B,OAAO,OAAO,CAAC,MAAM,CACnB,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAChE,CAAC;SACH;QAED,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;IAC9C,CAAC;IAED,WAAW;QACT,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;YAC3B,OAAO,EAAE,CAAC;QACZ,CAAC,CAAC,CAAC;IACL,CAAC"}
|
|
@@ -1,9 +1,13 @@
|
|
|
1
|
-
import { ActionApi } from './ActionApiProvider';
|
|
1
|
+
import { ActionApi, ActionApiCredentials, UploadedMetaFile, UploadFile } from './ActionApiProvider';
|
|
2
2
|
import { ActionRequest } from './utils';
|
|
3
3
|
export declare class GatewayActionApi implements ActionApi {
|
|
4
4
|
private actionsApi;
|
|
5
5
|
constructor(...actionsApi: ActionApi[]);
|
|
6
|
+
init(credentials: ActionApiCredentials): void;
|
|
7
|
+
reset(): void;
|
|
6
8
|
isAvailable(): Promise<boolean>;
|
|
9
|
+
resolvePending(request: ActionRequest): Promise<ActionRequest | null>;
|
|
7
10
|
send(request: ActionRequest): Promise<void>;
|
|
11
|
+
upload(file: UploadFile): Promise<UploadedMetaFile>;
|
|
8
12
|
synchronize(onEnd?: () => void): Promise<void>;
|
|
9
13
|
}
|
|
@@ -29,13 +29,41 @@ export class GatewayActionApi {
|
|
|
29
29
|
constructor(...actionsApi) {
|
|
30
30
|
this.actionsApi = actionsApi;
|
|
31
31
|
}
|
|
32
|
+
init(credentials) {
|
|
33
|
+
this.actionsApi.forEach(_actionApi => _actionApi.init(credentials));
|
|
34
|
+
}
|
|
35
|
+
reset() {
|
|
36
|
+
this.actionsApi.forEach(_actionApi => _actionApi.reset());
|
|
37
|
+
}
|
|
32
38
|
async isAvailable() {
|
|
33
39
|
const _actionApi = await getAvailableActionApi(this.actionsApi);
|
|
34
40
|
return _actionApi.isAvailable();
|
|
35
41
|
}
|
|
42
|
+
async resolvePending(request) {
|
|
43
|
+
let resolvedRequest = request;
|
|
44
|
+
for (const _actionApi of this.actionsApi) {
|
|
45
|
+
resolvedRequest = await _actionApi.resolvePending(resolvedRequest);
|
|
46
|
+
if (resolvedRequest == null) {
|
|
47
|
+
return null;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
return resolvedRequest;
|
|
51
|
+
}
|
|
36
52
|
async send(request) {
|
|
53
|
+
let resolvedRequest = request;
|
|
54
|
+
for (const _actionApi of this.actionsApi) {
|
|
55
|
+
const result = await _actionApi.resolvePending(resolvedRequest);
|
|
56
|
+
if (result == null) {
|
|
57
|
+
return _actionApi.send(resolvedRequest);
|
|
58
|
+
}
|
|
59
|
+
resolvedRequest = result;
|
|
60
|
+
}
|
|
61
|
+
const _actionApi = await getAvailableActionApi(this.actionsApi);
|
|
62
|
+
return _actionApi.send(resolvedRequest);
|
|
63
|
+
}
|
|
64
|
+
async upload(file) {
|
|
37
65
|
const _actionApi = await getAvailableActionApi(this.actionsApi);
|
|
38
|
-
return _actionApi.
|
|
66
|
+
return _actionApi.upload(file);
|
|
39
67
|
}
|
|
40
68
|
async synchronize(onEnd) {
|
|
41
69
|
for (const _actionApi of this.actionsApi) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GatewayActionApi.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/GatewayActionApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;
|
|
1
|
+
{"version":3,"file":"GatewayActionApi.js","sourceRoot":"","sources":["../../../src/apiProviders/Action/GatewayActionApi.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAUH,KAAK,UAAU,qBAAqB,CAClC,UAAuB;IAEvB,KAAK,MAAM,UAAU,IAAI,UAAU,EAAE;QACnC,MAAM,YAAY,GAAG,MAAM,UAAU,CAAC,WAAW,EAAE,CAAC;QAEpD,IAAI,YAAY,EAAE;YAChB,OAAO,UAAU,CAAC;SACnB;KACF;IAED,MAAM,IAAI,KAAK,CAAC,yDAAyD,CAAC,CAAC;AAC7E,CAAC;AAED,MAAM,OAAO,gBAAgB;IACnB,UAAU,CAAc;IAEhC,YAAY,GAAG,UAAuB;QACpC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;IAC/B,CAAC;IAED,IAAI,CAAC,WAAiC;QACpC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC;IACtE,CAAC;IAED,KAAK;QACH,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC;IAC5D,CAAC;IAED,KAAK,CAAC,WAAW;QACf,MAAM,UAAU,GAAc,MAAM,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE3E,OAAO,UAAU,CAAC,WAAW,EAAE,CAAC;IAClC,CAAC;IAED,KAAK,CAAC,cAAc,CAAC,OAAsB;QACzC,IAAI,eAAe,GAAyB,OAAO,CAAC;QAEpD,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE;YACxC,eAAe,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YAEnE,IAAI,eAAe,IAAI,IAAI,EAAE;gBAC3B,OAAO,IAAI,CAAC;aACb;SACF;QAED,OAAO,eAAe,CAAC;IACzB,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,OAAsB;QAC/B,IAAI,eAAe,GAAG,OAAO,CAAC;QAE9B,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE;YACxC,MAAM,MAAM,GAAG,MAAM,UAAU,CAAC,cAAc,CAAC,eAAe,CAAC,CAAC;YAEhE,IAAI,MAAM,IAAI,IAAI,EAAE;gBAClB,OAAO,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;aACzC;YAED,eAAe,GAAG,MAAM,CAAC;SAC1B;QAED,MAAM,UAAU,GAAc,MAAM,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE3E,OAAO,UAAU,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;IAC1C,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAgB;QAC3B,MAAM,UAAU,GAAc,MAAM,qBAAqB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAE3E,OAAO,UAAU,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,KAAK,CAAC,WAAW,CAAC,KAAkB;QAClC,KAAK,MAAM,UAAU,IAAI,IAAI,CAAC,UAAU,EAAE;YACxC,UAAU,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;SAC/B;IACH,CAAC;CACF"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
export { AosActionApi } from './AosActionApi';
|
|
2
2
|
export { GatewayActionApi } from './GatewayActionApi';
|
|
3
|
-
export { ActionApi } from './ActionApiProvider';
|
|
3
|
+
export { ActionApi, ActionApiCredentials, UploadedMetaFile, UploadFile, } from './ActionApiProvider';
|
|
4
4
|
export { getActionApi, actionProvider, registerActionApi, useActionApi, } from './ActionProvider';
|
|
5
|
-
export { ActionMessageType, ActionRequest, FieldMatcher, MatcherConfig, getActionMessage, } from './utils';
|
|
5
|
+
export { ActionMessageType, ActionRequest, FieldMatcher, MatcherConfig, MatcherParent, getActionMessage, } from './utils';
|
|
@@ -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;
|
|
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;AAOpD,OAAO,EACL,YAAY,EACZ,cAAc,EACd,iBAAiB,EACjB,YAAY,GACb,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAML,gBAAgB,GACjB,MAAM,SAAS,CAAC"}
|
|
@@ -7,10 +7,15 @@ export type ActionRequest = {
|
|
|
7
7
|
matchers?: MatcherConfig;
|
|
8
8
|
ignoreRequest?: boolean;
|
|
9
9
|
};
|
|
10
|
+
export type MatcherParent = {
|
|
11
|
+
modelName: string;
|
|
12
|
+
id: number;
|
|
13
|
+
};
|
|
10
14
|
export type MatcherConfig = {
|
|
11
15
|
modelName: string;
|
|
12
16
|
id: number;
|
|
13
17
|
fields: FieldMatcher;
|
|
18
|
+
parent?: MatcherParent;
|
|
14
19
|
};
|
|
15
20
|
export type FieldMatcher = {
|
|
16
21
|
[requestFieldName: string]: string;
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
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;AAgCtD,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"}
|
|
@@ -1,29 +1,21 @@
|
|
|
1
|
+
import { AxiosRequestConfig } from 'axios';
|
|
1
2
|
interface ApiCallProps {
|
|
2
3
|
url: string;
|
|
3
4
|
data?: any;
|
|
5
|
+
config?: AxiosRequestConfig;
|
|
4
6
|
}
|
|
5
7
|
export interface ApiProvider {
|
|
6
|
-
post({ url, data }:
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
}): Promise<any>;
|
|
10
|
-
put({ url, data }: {
|
|
11
|
-
url: any;
|
|
12
|
-
data: any;
|
|
13
|
-
}): Promise<any>;
|
|
14
|
-
get({ url }: {
|
|
15
|
-
url: any;
|
|
16
|
-
}): Promise<any>;
|
|
17
|
-
delete({ url }: {
|
|
18
|
-
url: any;
|
|
19
|
-
}): Promise<any>;
|
|
8
|
+
post({ url, data, config }: ApiCallProps): Promise<any>;
|
|
9
|
+
put({ url, data, config }: ApiCallProps): Promise<any>;
|
|
10
|
+
get({ url, config }: ApiCallProps): Promise<any>;
|
|
11
|
+
delete({ url, config }: ApiCallProps): Promise<any>;
|
|
20
12
|
}
|
|
21
13
|
declare class AxiosApiProvider implements ApiProvider {
|
|
22
14
|
constructor();
|
|
23
|
-
post({ url, data }: ApiCallProps): Promise<any>;
|
|
24
|
-
put({ url, data }: ApiCallProps): Promise<any>;
|
|
25
|
-
get({ url }: ApiCallProps): Promise<any>;
|
|
26
|
-
delete({ url }: ApiCallProps): Promise<any>;
|
|
15
|
+
post({ url, data, config }: ApiCallProps): Promise<any>;
|
|
16
|
+
put({ url, data, config }: ApiCallProps): Promise<any>;
|
|
17
|
+
get({ url, config }: ApiCallProps): Promise<any>;
|
|
18
|
+
delete({ url, config }: ApiCallProps): Promise<any>;
|
|
27
19
|
}
|
|
28
20
|
export declare const axiosApiProvider: AxiosApiProvider;
|
|
29
21
|
export {};
|
|
@@ -18,17 +18,17 @@
|
|
|
18
18
|
import axios from 'axios';
|
|
19
19
|
class AxiosApiProvider {
|
|
20
20
|
constructor() { }
|
|
21
|
-
post({ url, data }) {
|
|
22
|
-
return axios.post(url, data);
|
|
21
|
+
post({ url, data, config }) {
|
|
22
|
+
return axios.post(url, data, config);
|
|
23
23
|
}
|
|
24
|
-
put({ url, data }) {
|
|
25
|
-
return axios.put(url, data);
|
|
24
|
+
put({ url, data, config }) {
|
|
25
|
+
return axios.put(url, data, config);
|
|
26
26
|
}
|
|
27
|
-
get({ url }) {
|
|
28
|
-
return axios.get(url);
|
|
27
|
+
get({ url, config }) {
|
|
28
|
+
return axios.get(url, config);
|
|
29
29
|
}
|
|
30
|
-
delete({ url }) {
|
|
31
|
-
return axios.delete(url);
|
|
30
|
+
delete({ url, config }) {
|
|
31
|
+
return axios.delete(url, config);
|
|
32
32
|
}
|
|
33
33
|
}
|
|
34
34
|
export const axiosApiProvider = new AxiosApiProvider();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/AxiosProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,
|
|
1
|
+
{"version":3,"file":"AxiosProvider.js","sourceRoot":"","sources":["../../../src/apiProviders/Standard/AxiosProvider.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAA2B,MAAM,OAAO,CAAC;AAgBhD,MAAM,gBAAgB;IACpB,gBAAe,CAAC;IAEhB,IAAI,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAe;QACpC,OAAO,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACvC,CAAC;IAED,GAAG,CAAC,EAAC,GAAG,EAAE,IAAI,EAAE,MAAM,EAAe;QACnC,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,CAAC;IAED,GAAG,CAAC,EAAC,GAAG,EAAE,MAAM,EAAe;QAC7B,OAAO,KAAK,CAAC,GAAG,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAChC,CAAC;IAED,MAAM,CAAC,EAAC,GAAG,EAAE,MAAM,EAAe;QAChC,OAAO,KAAK,CAAC,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACnC,CAAC;CACF;AAED,MAAM,CAAC,MAAM,gBAAgB,GAAG,IAAI,gBAAgB,EAAE,CAAC"}
|
|
@@ -65,6 +65,13 @@ const userSlice = createSlice({
|
|
|
65
65
|
});
|
|
66
66
|
builder.addCase(fetchActiveUser.fulfilled, (state, action) => {
|
|
67
67
|
state.loadingUser = false;
|
|
68
|
+
/*
|
|
69
|
+
* Nothing came back for the user already loaded in this session, for
|
|
70
|
+
* example offline: keep it instead of reporting a missing user.
|
|
71
|
+
*/
|
|
72
|
+
if (action.payload == null && state.user?.id === action.meta.arg) {
|
|
73
|
+
return;
|
|
74
|
+
}
|
|
68
75
|
state.user = action.payload ?? {};
|
|
69
76
|
state.isUser = action.payload != null;
|
|
70
77
|
state.canModifyCompany = action.payload?.companySet?.length > 1;
|
|
@@ -74,6 +81,13 @@ const userSlice = createSlice({
|
|
|
74
81
|
state.isUser = false;
|
|
75
82
|
});
|
|
76
83
|
builder.addCase(updateActiveUser.fulfilled, (state, action) => {
|
|
84
|
+
/*
|
|
85
|
+
* Nothing came back from the update, for example offline: keep the user
|
|
86
|
+
* of the session instead of erasing it.
|
|
87
|
+
*/
|
|
88
|
+
if (action.payload == null) {
|
|
89
|
+
return;
|
|
90
|
+
}
|
|
77
91
|
state.user = action.payload;
|
|
78
92
|
state.canModifyCompany = action.payload?.companySet?.length > 1;
|
|
79
93
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,0BAA0B,CAAC;AACxD,OAAO,EAAC,aAAa,EAAE,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AAExD,MAAM,CAAC,MAAM,eAAe,GAAG,gBAAgB,CAC7C,sBAAsB,EACtB,KAAK,WAAW,MAAM,EAAE,EAAC,QAAQ,EAAC;IAChC,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,MAAM;QACZ,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC;AACL,CAAC,CACF,CAAC;AAEF,MAAM,CAAC,MAAM,gBAAgB,GAAG,gBAAgB,CAC9C,uBAAuB,EACvB,KAAK,WAAW,IAAI,EAAE,EAAC,QAAQ,EAAC;IAC9B,OAAO,cAAc,CAAC;QACpB,aAAa,EAAE,QAAQ;QACvB,IAAI,EAAE,IAAI;QACV,MAAM,EAAE,mCAAmC;QAC3C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE,CACX,cAAc,CAAC;QACb,aAAa,EAAE,aAAa;QAC5B,IAAI,EAAE,IAAI,CAAC,EAAE;QACb,MAAM,EAAE,kCAAkC;QAC1C,QAAQ;QACR,eAAe,EAAE,EAAC,eAAe,EAAE,KAAK,EAAC;KAC1C,CAAC,CACH,CAAC;AACJ,CAAC,CACF,CAAC;AAEF,MAAM,YAAY,GAAG;IACnB,WAAW,EAAE,IAAI;IACjB,IAAI,EAAE,EAAE;IACR,MAAM,EAAE,KAAK;IACb,gBAAgB,EAAE,KAAK;CACxB,CAAC;AAEF,MAAM,SAAS,GAAG,WAAW,CAAC;IAC5B,IAAI,EAAE,MAAM;IACZ,YAAY;IACZ,QAAQ,EAAE;QACR,0BAA0B,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC5C,KAAK,CAAC,IAAI,GAAG;gBACX,GAAG,KAAK,CAAC,IAAI;gBACb,qBAAqB,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB;aACvD,CAAC;QACJ,CAAC;KACF;IACD,aAAa,EAAE,OAAO,CAAC,EAAE;QACvB,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,OAAO,EAAE,KAAK,CAAC,EAAE;YAC/C,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,OAAO,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE;YAC3D,KAAK,CAAC,WAAW,GAAG,KAAK,CAAC;
|
|
1
|
+
{"version":3,"file":"userSlice.js","sourceRoot":"","sources":["../../../src/auth/features/userSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -20,13 +20,13 @@ import { Dimensions, StyleSheet } from 'react-native';
|
|
|
20
20
|
import { useDispatch, useSelector } from 'react-redux';
|
|
21
21
|
import { CircleButton, useConfig, useThemeColor } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { clearPhoto, enableCamera, useCameraValueByKey, } from '../../../features/cameraSlice';
|
|
23
|
-
import {
|
|
23
|
+
import { useActionApi } from '../../../apiProviders';
|
|
24
24
|
const CameraButton = ({ size = 70, cameraKey, onUpload, returnBase64 = false, getFileName, }) => {
|
|
25
25
|
const Colors = useThemeColor();
|
|
26
26
|
const dispatch = useDispatch();
|
|
27
|
+
const actionApi = useActionApi();
|
|
27
28
|
const { setActivityIndicator } = useConfig();
|
|
28
29
|
const cameraPicture = useCameraValueByKey(cameraKey);
|
|
29
|
-
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
30
30
|
const { user } = useSelector((state) => state.user);
|
|
31
31
|
const styles = useMemo(() => getStyles(Colors, size), [Colors, size]);
|
|
32
32
|
const handleCameraPress = useCallback(() => {
|
|
@@ -54,17 +54,13 @@ const CameraButton = ({ size = 70, cameraKey, onUpload, returnBase64 = false, ge
|
|
|
54
54
|
handleNext(_file);
|
|
55
55
|
return;
|
|
56
56
|
}
|
|
57
|
-
const response = await
|
|
58
|
-
baseUrl,
|
|
59
|
-
token,
|
|
60
|
-
jsessionId,
|
|
61
|
-
});
|
|
57
|
+
const response = await actionApi.upload(_file);
|
|
62
58
|
handleNext(response);
|
|
63
59
|
}
|
|
64
60
|
catch (error) {
|
|
65
61
|
console.log('Could not upload the file:', error);
|
|
66
62
|
}
|
|
67
|
-
}, [
|
|
63
|
+
}, [actionApi, getFileName, handleNext, returnBase64, user]);
|
|
68
64
|
useEffect(() => {
|
|
69
65
|
if (cameraPicture) {
|
|
70
66
|
setActivityIndicator(true);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CameraButton.js","sourceRoot":"","sources":["../../../../src/components/molecules/CameraButton/CameraButton.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,EAAC,YAAY,EAAE,SAAS,EAAE,aAAa,EAAC,MAAM,uBAAuB,CAAC;AAC7E,OAAO,EAEL,UAAU,EACV,YAAY,EACZ,mBAAmB,GACpB,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,
|
|
1
|
+
{"version":3,"file":"CameraButton.js","sourceRoot":"","sources":["../../../../src/components/molecules/CameraButton/CameraButton.tsx"],"names":[],"mappings":"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"}
|
|
@@ -19,7 +19,8 @@ import React, { useCallback, useEffect, useMemo, useState } from 'react';
|
|
|
19
19
|
import { StyleSheet, View } from 'react-native';
|
|
20
20
|
import { useDispatch, useSelector } from 'react-redux';
|
|
21
21
|
import { Text, getCommonStyles, useThemeColor, Image, Icon, } from '@axelor/aos-mobile-ui';
|
|
22
|
-
import { deleteMetaFile
|
|
22
|
+
import { deleteMetaFile } from '../../../api/metafile-api';
|
|
23
|
+
import { useActionApi } from '../../../apiProviders';
|
|
23
24
|
import { useTranslator } from '../../../i18n';
|
|
24
25
|
import { handleDocumentSelection, openFileInExternalApp } from '../../../tools';
|
|
25
26
|
import { checkNullString, useMetafileUri } from '../../../utils';
|
|
@@ -49,6 +50,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
49
50
|
const cameraKey = useMemo(() => `${title}camera_upload`, [title]);
|
|
50
51
|
const cameraPicture = useCameraValueByKey(cameraKey);
|
|
51
52
|
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
53
|
+
const actionApi = useActionApi();
|
|
52
54
|
const [selectedFile, setSelectedFile] = useState(defaultValue);
|
|
53
55
|
const [errorMessage, setErrorMessage] = useState(null);
|
|
54
56
|
const _required = useMemo(() => required && selectedFile == null, [required, selectedFile]);
|
|
@@ -77,11 +79,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
77
79
|
onUpload(file.base64);
|
|
78
80
|
return;
|
|
79
81
|
}
|
|
80
|
-
const response = await
|
|
81
|
-
baseUrl,
|
|
82
|
-
token,
|
|
83
|
-
jsessionId,
|
|
84
|
-
});
|
|
82
|
+
const response = await actionApi.upload(file);
|
|
85
83
|
manageFileLocally && setSelectedFile({ ...file, ...response });
|
|
86
84
|
onUpload(response);
|
|
87
85
|
}
|
|
@@ -89,15 +87,7 @@ const UploadFileInput = ({ style, title, defaultValue, onUpload = console.log, r
|
|
|
89
87
|
console.log('Could not upload the file:', error);
|
|
90
88
|
setErrorMessage(I18n.t('Base_FileUploadError'));
|
|
91
89
|
}
|
|
92
|
-
}, [
|
|
93
|
-
I18n,
|
|
94
|
-
baseUrl,
|
|
95
|
-
jsessionId,
|
|
96
|
-
manageFileLocally,
|
|
97
|
-
onUpload,
|
|
98
|
-
returnBase64String,
|
|
99
|
-
token,
|
|
100
|
-
]);
|
|
90
|
+
}, [I18n, actionApi, manageFileLocally, onUpload, returnBase64String]);
|
|
101
91
|
const handleDocumentPick = useCallback(async (file) => {
|
|
102
92
|
const _file = {
|
|
103
93
|
name: file.name,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,EAAE,EAAC,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAC,MAAM,OAAO,CAAC;AACvE,OAAO,EAAC,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,aAAa,CAAC;AACrD,OAAO,EACL,IAAI,EACJ,eAAe,EACf,aAAa,EAEb,KAAK,EACL,IAAI,GACL,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"UploadFileInput.js","sourceRoot":"","sources":["../../../../src/components/molecules/UploadFileInput/UploadFileInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -21,16 +21,16 @@ import { Image } from '@axelor/aos-mobile-ui';
|
|
|
21
21
|
import { useSelector } from 'react-redux';
|
|
22
22
|
import { openFileInExternalApp } from '../../../tools/FileViewer';
|
|
23
23
|
import useTranslator from '../../../i18n/hooks/use-translator';
|
|
24
|
+
import { useMetafileUri } from '../../../utils/image';
|
|
24
25
|
const AOSImage = ({ imageSize, generalStyle, resizeMode, metaFile, defaultIconSize = 60, enableImageViewer = false, }) => {
|
|
25
26
|
const { baseUrl, token, jsessionId } = useSelector((state) => state.auth);
|
|
26
27
|
const I18n = useTranslator();
|
|
28
|
+
const formatMetafileURI = useMetafileUri();
|
|
27
29
|
const handleShowFile = async () => {
|
|
28
30
|
await openFileInExternalApp({ fileName: metaFile?.fileName, id: metaFile?.id, isMetaFile: true }, { baseUrl: baseUrl, token: token, jsessionId: jsessionId }, I18n);
|
|
29
31
|
};
|
|
30
32
|
return (<TouchableOpacity disabled={!enableImageViewer || metaFile?.id == null || metaFile?.fileName == null} onPress={handleShowFile}>
|
|
31
|
-
<Image imageSize={imageSize} generalStyle={generalStyle} resizeMode={resizeMode} source={{
|
|
32
|
-
uri: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${metaFile?.id}/content/download`,
|
|
33
|
-
}} defaultIconSize={defaultIconSize}/>
|
|
33
|
+
<Image imageSize={imageSize} generalStyle={generalStyle} resizeMode={resizeMode} source={formatMetafileURI(metaFile?.id)} defaultIconSize={defaultIconSize}/>
|
|
34
34
|
</TouchableOpacity>);
|
|
35
35
|
};
|
|
36
36
|
export default AOSImage;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AOSImage.js","sourceRoot":"","sources":["../../../../src/components/organisms/AOSImage/AOSImage.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAIL,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,aAAa,MAAM,oCAAoC,CAAC;
|
|
1
|
+
{"version":3,"file":"AOSImage.js","sourceRoot":"","sources":["../../../../src/components/organisms/AOSImage/AOSImage.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAIL,gBAAgB,GACjB,MAAM,cAAc,CAAC;AACtB,OAAO,EAAC,KAAK,EAAC,MAAM,uBAAuB,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,qBAAqB,EAAC,MAAM,2BAA2B,CAAC;AAChE,OAAO,aAAa,MAAM,oCAAoC,CAAC;AAC/D,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAgBpD,MAAM,QAAQ,GAAG,CAAC,EAChB,SAAS,EACT,YAAY,EACZ,UAAU,EACV,QAAQ,EACR,eAAe,GAAG,EAAE,EACpB,iBAAiB,GAAG,KAAK,GACX,EAAE,EAAE;IAClB,MAAM,EAAC,OAAO,EAAE,KAAK,EAAE,UAAU,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC7E,MAAM,IAAI,GAAG,aAAa,EAAE,CAAC;IAC7B,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,MAAM,cAAc,GAAG,KAAK,IAAI,EAAE;QAChC,MAAM,qBAAqB,CACzB,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,UAAU,EAAE,IAAI,EAAC,EAClE,EAAC,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAC,EACxD,IAAI,CACL,CAAC;IACJ,CAAC,CAAC;IAEF,OAAO,CACL,CAAC,gBAAgB,CACf,QAAQ,CAAC,CACP,CAAC,iBAAiB,IAAI,QAAQ,EAAE,EAAE,IAAI,IAAI,IAAI,QAAQ,EAAE,QAAQ,IAAI,IAAI,CACzE,CACD,OAAO,CAAC,CAAC,cAAc,CAAC,CACxB;MAAA,CAAC,KAAK,CACJ,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,YAAY,CAAC,CAAC,YAAY,CAAC,CAC3B,UAAU,CAAC,CAAC,UAAU,CAAC,CACvB,MAAM,CAAC,CAAC,iBAAiB,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,CACxC,eAAe,CAAC,CAAC,eAAe,CAAC,EAErC;IAAA,EAAE,gBAAgB,CAAC,CACpB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,QAAQ,CAAC"}
|
|
@@ -17,14 +17,10 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import React from 'react';
|
|
19
19
|
import { ImageBubble } from '@axelor/aos-mobile-ui';
|
|
20
|
-
import {
|
|
20
|
+
import { useMetafileUri } from '../../../utils/image';
|
|
21
21
|
const AOSImageBubble = ({ imageSize, style, metaFileId, defaultIconSize = 60, listComponent = [], }) => {
|
|
22
|
-
const
|
|
23
|
-
return (<ImageBubble style={style} source={metaFileId
|
|
24
|
-
? {
|
|
25
|
-
uri: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${metaFileId}/content/download`,
|
|
26
|
-
}
|
|
27
|
-
: null} listComponent={listComponent} imageSize={imageSize} defaultIconSize={defaultIconSize}/>);
|
|
22
|
+
const formatMetafileURI = useMetafileUri();
|
|
23
|
+
return (<ImageBubble style={style} source={metaFileId ? formatMetafileURI(metaFileId) : null} listComponent={listComponent} imageSize={imageSize} defaultIconSize={defaultIconSize}/>);
|
|
28
24
|
};
|
|
29
25
|
export default AOSImageBubble;
|
|
30
26
|
//# sourceMappingURL=AOSImageBubble.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AOSImageBubble.js","sourceRoot":"","sources":["../../../../src/components/organisms/AOSImageBubble/AOSImageBubble.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,
|
|
1
|
+
{"version":3,"file":"AOSImageBubble.js","sourceRoot":"","sources":["../../../../src/components/organisms/AOSImageBubble/AOSImageBubble.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,WAAW,EAAC,MAAM,uBAAuB,CAAC;AAClD,OAAO,EAAC,cAAc,EAAC,MAAM,sBAAsB,CAAC;AAUpD,MAAM,cAAc,GAAG,CAAC,EACtB,SAAS,EACT,KAAK,EACL,UAAU,EACV,eAAe,GAAG,EAAE,EACpB,aAAa,GAAG,EAAE,GACE,EAAE,EAAE;IACxB,MAAM,iBAAiB,GAAG,cAAc,EAAE,CAAC;IAE3C,OAAO,CACL,CAAC,WAAW,CACV,KAAK,CAAC,CAAC,KAAK,CAAC,CACb,MAAM,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAC1D,aAAa,CAAC,CAAC,aAAa,CAAC,CAC7B,SAAS,CAAC,CAAC,SAAS,CAAC,CACrB,eAAe,CAAC,CAAC,eAAe,CAAC,EACjC,CACH,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,cAAc,CAAC"}
|
|
@@ -20,8 +20,8 @@ import { Dimensions, Modal, StyleSheet, View } from 'react-native';
|
|
|
20
20
|
import Signature from 'react-native-signature-canvas';
|
|
21
21
|
import { checkNullString, Icon, Text, getCommonStyles, useThemeColor, } from '@axelor/aos-mobile-ui';
|
|
22
22
|
import { handleDocumentSelection } from '../../../tools';
|
|
23
|
-
import { deleteMetaFile
|
|
24
|
-
import {
|
|
23
|
+
import { deleteMetaFile } from '../../../api/metafile-api';
|
|
24
|
+
import { useActionApi } from '../../../apiProviders';
|
|
25
25
|
import { showToastMessage } from '../../../utils';
|
|
26
26
|
import { AOSImage } from '../../organisms';
|
|
27
27
|
import PictureIcon from './PictureIcon';
|
|
@@ -30,7 +30,7 @@ const POPUP_INPUT_HEIGHT = 100;
|
|
|
30
30
|
const SignatureInput = ({ style, title, defaultValue, readonly = false, required = false, onChange = () => { }, enableFileSelection = true, enablePicture = true, cameraKey = 'signature_answer', canvaSize = Dimensions.get('window').width * 0.75, returnBase64String = false, iconSize = 25, popup = false, }) => {
|
|
31
31
|
const ref = useRef(null);
|
|
32
32
|
const Colors = useThemeColor();
|
|
33
|
-
const
|
|
33
|
+
const actionApi = useActionApi();
|
|
34
34
|
const [unsavedChanges, setUnsavedChanges] = useState(false);
|
|
35
35
|
const [editSignature, setEditSignature] = useState(false);
|
|
36
36
|
const [popupIsOpen, setPopupIsOpen] = useState(false);
|
|
@@ -74,11 +74,7 @@ const SignatureInput = ({ style, title, defaultValue, readonly = false, required
|
|
|
74
74
|
onChange(file.fullBase64);
|
|
75
75
|
return;
|
|
76
76
|
}
|
|
77
|
-
const response = await
|
|
78
|
-
baseUrl,
|
|
79
|
-
token,
|
|
80
|
-
jsessionId,
|
|
81
|
-
});
|
|
77
|
+
const response = await actionApi.upload(file);
|
|
82
78
|
onChange(response);
|
|
83
79
|
}
|
|
84
80
|
catch (error) {
|
|
@@ -90,15 +86,7 @@ const SignatureInput = ({ style, title, defaultValue, readonly = false, required
|
|
|
90
86
|
onPress: () => { },
|
|
91
87
|
});
|
|
92
88
|
}
|
|
93
|
-
}, [
|
|
94
|
-
baseUrl,
|
|
95
|
-
handleClose,
|
|
96
|
-
handleFileDelete,
|
|
97
|
-
jsessionId,
|
|
98
|
-
onChange,
|
|
99
|
-
returnBase64String,
|
|
100
|
-
token,
|
|
101
|
-
]);
|
|
89
|
+
}, [actionApi, handleClose, handleFileDelete, onChange, returnBase64String]);
|
|
102
90
|
const handleSignature = useCallback((fullBase64) => {
|
|
103
91
|
const [_type, base64] = fullBase64.split(';base64,');
|
|
104
92
|
const type = _type.replace('data:', '');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SignatureInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/SignatureInput/SignatureInput.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,KAAK,EAAE,UAAU,EAAE,IAAI,EAAC,MAAM,cAAc,CAAC;AACjE,OAAO,SAA6B,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EACL,eAAe,EACf,IAAI,EACJ,IAAI,EAEJ,eAAe,EACf,aAAa,GACd,MAAM,uBAAuB,CAAC;AAC/B,OAAO,EAAC,uBAAuB,EAAC,MAAM,gBAAgB,CAAC;AACvD,OAAO,EAAC,cAAc,
|
|
1
|
+
{"version":3,"file":"SignatureInput.js","sourceRoot":"","sources":["../../../../src/components/organisms/SignatureInput/SignatureInput.tsx"],"names":[],"mappings":"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"}
|
|
@@ -18,6 +18,7 @@
|
|
|
18
18
|
import { createAsyncThunk, createSlice } from '@reduxjs/toolkit';
|
|
19
19
|
import { ejectAxios, getActiveUserInfo, loginApi, logoutApi, } from '../api/login-api';
|
|
20
20
|
import { apiProviderConfig } from '../apiProviders/config';
|
|
21
|
+
import { getActionApi } from '../apiProviders';
|
|
21
22
|
import { saveUrlInStorage } from '../sessions';
|
|
22
23
|
import { checkNullString, testUrl } from '../utils';
|
|
23
24
|
import { modulesProvider } from '../app';
|
|
@@ -37,6 +38,7 @@ export const login = createAsyncThunk('auth/login', async ({ url, username, pass
|
|
|
37
38
|
token,
|
|
38
39
|
jsessionId,
|
|
39
40
|
});
|
|
41
|
+
getActionApi()?.init({ baseUrl: urlWithProtocol, token, jsessionId });
|
|
40
42
|
dispatch(resetConfigs());
|
|
41
43
|
return {
|
|
42
44
|
url: urlWithProtocol,
|
|
@@ -59,6 +61,7 @@ export const logout = createAsyncThunk('auth/logout', async function (_, { getSt
|
|
|
59
61
|
await logoutApi();
|
|
60
62
|
const { requestInterceptorId, responseInterceptorId } = getState()?.auth;
|
|
61
63
|
ejectAxios({ requestInterceptorId, responseInterceptorId });
|
|
64
|
+
getActionApi()?.reset();
|
|
62
65
|
webSocketProvider.closeWebSocket();
|
|
63
66
|
clearModelMetaCaches();
|
|
64
67
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,gBAAgB,EAAE,WAAW,EAAC,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,QAAQ,EACR,SAAS,GACV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAC,iBAAiB,EAAC,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAC,gBAAgB,EAAC,MAAM,aAAa,CAAC;AAC7C,OAAO,EAAC,eAAe,EAAE,OAAO,EAAC,MAAM,UAAU,CAAC;AAClD,OAAO,EAAC,eAAe,EAAC,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAC,iBAAiB,EAAC,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAC,oBAAoB,EAAC,MAAM,6BAA6B,CAAC;AACjE,OAAO,EAAC,YAAY,EAAC,MAAM,kBAAkB,CAAC;AAE9C,MAAM,CAAC,MAAM,KAAK,GAAG,gBAAgB,CACnC,YAAY,EACZ,KAAK,EAAE,EAAC,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAC,EAAE,EAAC,QAAQ,EAAC,EAAE,EAAE;IAC1D,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,CAAC;IAC3C,MAAM,EAAC,KAAK,EAAE,UAAU,EAAE,oBAAoB,EAAE,qBAAqB,EAAC,GACpE,MAAM,QAAQ,CAAC,eAAe,EAAE,QAAQ,EAAE,QAAQ,CAAC,CAAC;IACtD,MAAM,EAAC,MAAM,EAAE,eAAe,EAAC,GAAG,MAAM,iBAAiB,EAAE,CAAC;IAE5D,gBAAgB,CAAC,eAAe,CAAC,CAAC;IAElC,iBAAiB,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAE3C,UAAU,EAAE,EAAE,CAAC;IAEf,eAAe,CAAC,kBAAkB,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAE/D,iBAAiB,CAAC,aAAa,CAAC;QAC9B,OAAO,EAAE,eAAe;QACxB,KAAK;QACL,UAAU;KACX,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"authSlice.js","sourceRoot":"","sources":["../../src/features/authSlice.js"],"names":[],"mappings":"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"}
|
|
@@ -16,7 +16,7 @@
|
|
|
16
16
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
17
17
|
*/
|
|
18
18
|
import { checkNullString } from '../../utils';
|
|
19
|
-
import { axiosApiProvider, createStandardSearch, } from '../../apiProviders';
|
|
19
|
+
import { axiosApiProvider, createStandardSearch, getActionApi, } from '../../apiProviders';
|
|
20
20
|
const CACHE_KEY_SEPARATOR = '#';
|
|
21
21
|
const modelMetaCaches = new Map();
|
|
22
22
|
/**
|
|
@@ -126,9 +126,19 @@ export async function fetchObjectModelTypes({ modelName }) {
|
|
|
126
126
|
export async function updateJsonFieldsObject({ modelName, id, version, values, }) {
|
|
127
127
|
if (modelName == null || id == null)
|
|
128
128
|
return null;
|
|
129
|
-
return
|
|
129
|
+
return getActionApi().send({
|
|
130
130
|
url: `ws/rest/${modelName}`,
|
|
131
|
-
|
|
131
|
+
method: 'post',
|
|
132
|
+
body: { data: { id, version, ...values } },
|
|
133
|
+
description: `update custom fields of ${modelName}`,
|
|
134
|
+
matchers: {
|
|
135
|
+
modelName,
|
|
136
|
+
id,
|
|
137
|
+
fields: Object.fromEntries(Object.keys(values ?? {}).map(fieldName => [
|
|
138
|
+
`data.${fieldName}`,
|
|
139
|
+
fieldName,
|
|
140
|
+
])),
|
|
141
|
+
},
|
|
132
142
|
});
|
|
133
143
|
}
|
|
134
144
|
export async function fetchData({ modelName, domain, searchValue = null, page = 0, criteria = [], searchFields, }) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAC5C,OAAO,EACL,gBAAgB,EAChB,oBAAoB,
|
|
1
|
+
{"version":3,"file":"api.helpers.js","sourceRoot":"","sources":["../../../src/forms/studio/api.helpers.ts"],"names":[],"mappings":"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"}
|
|
@@ -157,8 +157,12 @@ const getFieldSchema = (field) => {
|
|
|
157
157
|
schema = array().of(object());
|
|
158
158
|
break;
|
|
159
159
|
case 'object':
|
|
160
|
+
/*
|
|
161
|
+
* A record picked or created on the device before it reaches the
|
|
162
|
+
* server can carry a temporary negative id, so only 0 is refused.
|
|
163
|
+
*/
|
|
160
164
|
schema = object().shape({
|
|
161
|
-
id: getRequiredCondition(number().
|
|
165
|
+
id: getRequiredCondition(number().integer().notOneOf([0], 'Base_FormValidation_Object'), field),
|
|
162
166
|
version: number().min(0).integer().nullable(),
|
|
163
167
|
});
|
|
164
168
|
break;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validation.helpers.js","sourceRoot":"","sources":["../../src/forms/validation.helpers.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"validation.helpers.js","sourceRoot":"","sources":["../../src/forms/validation.helpers.ts"],"names":[],"mappings":"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"}
|
package/lib/tools/FileViewer.js
CHANGED
|
@@ -18,16 +18,32 @@
|
|
|
18
18
|
import FileViewer from 'react-native-file-viewer';
|
|
19
19
|
import RNFetchBlob from 'react-native-blob-util';
|
|
20
20
|
import RNFS from 'react-native-fs';
|
|
21
|
-
import { sanitizeLocalFileName, showToastMessage } from '../utils';
|
|
21
|
+
import { getLocalFilePath, getServerFileId, sanitizeLocalFileName, showToastMessage, } from '../utils';
|
|
22
|
+
const showCannotOpenFile = (I18n, error) => {
|
|
23
|
+
showToastMessage({
|
|
24
|
+
type: 'error',
|
|
25
|
+
position: 'bottom',
|
|
26
|
+
text1: I18n.t('Auth_Error'),
|
|
27
|
+
text2: I18n.t('Auth_CannotOpenFile'),
|
|
28
|
+
});
|
|
29
|
+
console.log(error);
|
|
30
|
+
};
|
|
22
31
|
export const openFileInExternalApp = async (file, authentification, I18n) => {
|
|
23
32
|
if (file == null) {
|
|
24
33
|
return;
|
|
25
34
|
}
|
|
35
|
+
const devicePath = file.id != null
|
|
36
|
+
? getLocalFilePath(file.id)
|
|
37
|
+
: null;
|
|
38
|
+
if (devicePath != null) {
|
|
39
|
+
await FileViewer.open(devicePath, { showOpenWithDialog: true }).catch(error => showCannotOpenFile(I18n, error));
|
|
40
|
+
return;
|
|
41
|
+
}
|
|
26
42
|
const localFile = `${RNFS.DocumentDirectoryPath}/${sanitizeLocalFileName(file.fileName)}`;
|
|
27
43
|
const fromUrl = file.path != null
|
|
28
44
|
? `${authentification.baseUrl}${file.path}`
|
|
29
45
|
: file.isMetaFile
|
|
30
|
-
? `${authentification.baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${file.id}/content/download`
|
|
46
|
+
? `${authentification.baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${getServerFileId(file.id)}/content/download`
|
|
31
47
|
: `${authentification.baseUrl}ws/dms/inline/${file.id}`;
|
|
32
48
|
try {
|
|
33
49
|
const res = await RNFetchBlob.config({ path: localFile }).fetch('GET', fromUrl, {
|
|
@@ -41,13 +57,7 @@ export const openFileInExternalApp = async (file, authentification, I18n) => {
|
|
|
41
57
|
await FileViewer.open(localFile, { showOpenWithDialog: true });
|
|
42
58
|
}
|
|
43
59
|
catch (error) {
|
|
44
|
-
|
|
45
|
-
type: 'error',
|
|
46
|
-
position: 'bottom',
|
|
47
|
-
text1: I18n.t('Auth_Error'),
|
|
48
|
-
text2: I18n.t('Auth_CannotOpenFile'),
|
|
49
|
-
});
|
|
50
|
-
console.log(error);
|
|
60
|
+
showCannotOpenFile(I18n, error);
|
|
51
61
|
}
|
|
52
62
|
};
|
|
53
63
|
//# sourceMappingURL=FileViewer.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FileViewer.js","sourceRoot":"","sources":["../../src/tools/FileViewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,OAAO,
|
|
1
|
+
{"version":3,"file":"FileViewer.js","sourceRoot":"","sources":["../../src/tools/FileViewer.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,WAAW,MAAM,wBAAwB,CAAC;AACjD,OAAO,IAAI,MAAM,iBAAiB,CAAC;AAEnC,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,qBAAqB,EACrB,gBAAgB,GACjB,MAAM,UAAU,CAAC;AAmBlB,MAAM,kBAAkB,GAAG,CAAC,IAAqB,EAAE,KAAc,EAAE,EAAE;IACnE,gBAAgB,CAAC;QACf,IAAI,EAAE,OAAO;QACb,QAAQ,EAAE,QAAQ;QAClB,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3B,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,qBAAqB,CAAC;KACrC,CAAC,CAAC;IACH,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;AACrB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,KAAK,EACxC,IAAyB,EACzB,gBAA+B,EAC/B,IAAqB,EACrB,EAAE;IACF,IAAI,IAAI,IAAI,IAAI,EAAE;QAChB,OAAO;KACR;IAED,MAAM,UAAU,GACb,IAAiB,CAAC,EAAE,IAAI,IAAI;QAC3B,CAAC,CAAC,gBAAgB,CAAE,IAAiB,CAAC,EAAE,CAAC;QACzC,CAAC,CAAC,IAAI,CAAC;IAEX,IAAI,UAAU,IAAI,IAAI,EAAE;QACtB,MAAM,UAAU,CAAC,IAAI,CAAC,UAAU,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAC1E,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAChC,CAAC;QACF,OAAO;KACR;IAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,qBAAqB,IAAI,qBAAqB,CACtE,IAAI,CAAC,QAAQ,CACd,EAAE,CAAC;IAEJ,MAAM,OAAO,GACV,IAAiB,CAAC,IAAI,IAAI,IAAI;QAC7B,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,GAAI,IAAiB,CAAC,IAAI,EAAE;QACzD,CAAC,CAAE,IAAiB,CAAC,UAAU;YAC7B,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,uCAAuC,eAAe,CAC9E,IAAiB,CAAC,EAAE,CACtB,mBAAmB;YACtB,CAAC,CAAC,GAAG,gBAAgB,CAAC,OAAO,iBAAkB,IAAiB,CAAC,EAAE,EAAE,CAAC;IAE5E,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,MAAM,CAAC,EAAC,IAAI,EAAE,SAAS,EAAC,CAAC,CAAC,KAAK,CAC3D,KAAK,EACL,OAAO,EACP;YACE,MAAM,EAAE,cAAc,gBAAgB,CAAC,KAAK,KAAK,gBAAgB,CAAC,UAAU,EAAE;SAC/E,CACF,CAAC;QACF,MAAM,EAAC,MAAM,EAAC,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC;QAE5B,IAAI,MAAM,GAAG,GAAG,IAAI,MAAM,IAAI,GAAG,EAAE;YACjC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC7C,MAAM,IAAI,KAAK,CAAC,+BAA+B,MAAM,EAAE,CAAC,CAAC;SAC1D;QAED,MAAM,UAAU,CAAC,IAAI,CAAC,SAAS,EAAE,EAAC,kBAAkB,EAAE,IAAI,EAAC,CAAC,CAAC;KAC9D;IAAC,OAAO,KAAK,EAAE;QACd,kBAAkB,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;KACjC;AACH,CAAC,CAAC"}
|
package/lib/utils/file.d.ts
CHANGED
|
@@ -1,2 +1,11 @@
|
|
|
1
1
|
export declare const sanitizeFileName: (name: string) => string;
|
|
2
2
|
export declare const sanitizeLocalFileName: (name: string) => string;
|
|
3
|
+
export type LocalFileLookup = {
|
|
4
|
+
path: string;
|
|
5
|
+
} | {
|
|
6
|
+
serverId: number;
|
|
7
|
+
};
|
|
8
|
+
export type LocalFileResolver = (fileId: number) => LocalFileLookup | null;
|
|
9
|
+
export declare const registerLocalFileResolver: (resolver: LocalFileResolver | null) => void;
|
|
10
|
+
export declare const getLocalFilePath: (fileId: number) => string | null;
|
|
11
|
+
export declare const getServerFileId: (fileId: number) => number;
|
package/lib/utils/file.js
CHANGED
|
@@ -20,4 +20,20 @@ export const sanitizeFileName = (name) => name
|
|
|
20
20
|
.replace(/[\u0300-\u036f]/g, '')
|
|
21
21
|
.replace(/[ :*?"<>|\\]/g, '_');
|
|
22
22
|
export const sanitizeLocalFileName = (name) => sanitizeFileName(name)?.replace(/[^a-zA-Z0-9._\-()]/g, '_');
|
|
23
|
+
let localFileResolver = null;
|
|
24
|
+
export const registerLocalFileResolver = (resolver) => {
|
|
25
|
+
localFileResolver = resolver;
|
|
26
|
+
};
|
|
27
|
+
const resolveLocalFile = (fileId) => fileId != null ? (localFileResolver?.(fileId) ?? null) : null;
|
|
28
|
+
export const getLocalFilePath = (fileId) => {
|
|
29
|
+
const localFile = resolveLocalFile(fileId);
|
|
30
|
+
return localFile != null && 'path' in localFile ? localFile.path : null;
|
|
31
|
+
};
|
|
32
|
+
// The id to ask the server for: the real id of a file uploaded under another id.
|
|
33
|
+
export const getServerFileId = (fileId) => {
|
|
34
|
+
const localFile = resolveLocalFile(fileId);
|
|
35
|
+
return localFile != null && 'serverId' in localFile
|
|
36
|
+
? localFile.serverId
|
|
37
|
+
: fileId;
|
|
38
|
+
};
|
|
23
39
|
//# sourceMappingURL=file.js.map
|
package/lib/utils/file.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/C,IAAI;IACF,EAAE,SAAS,CAAC,KAAK,CAAC;KACjB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;KAC/B,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,EAAE,CACpD,gBAAgB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"file.js","sourceRoot":"","sources":["../../src/utils/file.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CAC/C,IAAI;IACF,EAAE,SAAS,CAAC,KAAK,CAAC;KACjB,OAAO,CAAC,kBAAkB,EAAE,EAAE,CAAC;KAC/B,OAAO,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC;AAEnC,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,EAAE,CACpD,gBAAgB,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC,qBAAqB,EAAE,GAAG,CAAC,CAAC;AAW9D,IAAI,iBAAiB,GAA6B,IAAI,CAAC;AAEvD,MAAM,CAAC,MAAM,yBAAyB,GAAG,CACvC,QAAkC,EAClC,EAAE;IACF,iBAAiB,GAAG,QAAQ,CAAC;AAC/B,CAAC,CAAC;AAEF,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAA0B,EAAE,CAClE,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;AAEhE,MAAM,CAAC,MAAM,gBAAgB,GAAG,CAAC,MAAc,EAAiB,EAAE;IAChE,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE3C,OAAO,SAAS,IAAI,IAAI,IAAI,MAAM,IAAI,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;AAC1E,CAAC,CAAC;AAEF,iFAAiF;AACjF,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,MAAc,EAAU,EAAE;IACxD,MAAM,SAAS,GAAG,gBAAgB,CAAC,MAAM,CAAC,CAAC;IAE3C,OAAO,SAAS,IAAI,IAAI,IAAI,UAAU,IAAI,SAAS;QACjD,CAAC,CAAC,SAAS,CAAC,QAAQ;QACpB,CAAC,CAAC,MAAM,CAAC;AACb,CAAC,CAAC"}
|
package/lib/utils/formatters.js
CHANGED
|
@@ -117,6 +117,30 @@ export const getDateZonesISOString = (dateString) => {
|
|
|
117
117
|
return `${date}T${time}`;
|
|
118
118
|
};
|
|
119
119
|
const isValidObject = (value) => value != null && typeof value === 'object';
|
|
120
|
+
const isPrimitive = (value) => typeof value === 'string' ||
|
|
121
|
+
typeof value === 'number' ||
|
|
122
|
+
typeof value === 'boolean';
|
|
123
|
+
/*
|
|
124
|
+
* A linked record is sent with its id and its plain values, such as its name.
|
|
125
|
+
* The server reads a link without version as a reference and ignores the
|
|
126
|
+
* other values, while the offline copy of the record keeps them to display
|
|
127
|
+
* the link. The version is never sent: with it, the server would update the
|
|
128
|
+
* linked record.
|
|
129
|
+
*/
|
|
130
|
+
const formatLinkedRecord = (record) => {
|
|
131
|
+
const linkedRecord = { id: record.id };
|
|
132
|
+
if (record.id == null) {
|
|
133
|
+
return linkedRecord;
|
|
134
|
+
}
|
|
135
|
+
Object.entries(record).forEach(([fieldName, value]) => {
|
|
136
|
+
if (fieldName !== 'version' &&
|
|
137
|
+
!fieldName.startsWith('$') &&
|
|
138
|
+
isPrimitive(value)) {
|
|
139
|
+
linkedRecord[fieldName] = value;
|
|
140
|
+
}
|
|
141
|
+
});
|
|
142
|
+
return linkedRecord;
|
|
143
|
+
};
|
|
120
144
|
export const formatRequestBody = (data, matcherPrefix = null) => {
|
|
121
145
|
if (isEmpty(data)) {
|
|
122
146
|
return { formattedData: null, matchers: {} };
|
|
@@ -127,10 +151,10 @@ export const formatRequestBody = (data, matcherPrefix = null) => {
|
|
|
127
151
|
const matcherKey = `${matcherPrefix ? matcherPrefix + '.' : ''}${_key}`;
|
|
128
152
|
matchers[matcherKey] = _key;
|
|
129
153
|
if (Array.isArray(_value)) {
|
|
130
|
-
_data[_key] = _value.map(_i =>
|
|
154
|
+
_data[_key] = _value.map(_i => isValidObject(_i) ? formatLinkedRecord(_i) : _i);
|
|
131
155
|
}
|
|
132
156
|
else if (isValidObject(_value)) {
|
|
133
|
-
_data[_key] =
|
|
157
|
+
_data[_key] = formatLinkedRecord(_value);
|
|
134
158
|
}
|
|
135
159
|
else {
|
|
136
160
|
_data[_key] = _value;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"formatters.js","sourceRoot":"","sources":["../../src/utils/formatters.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,MAAM,MAAM,QAAQ,CAAC;AAC5B,OAAO,EAAC,eAAe,EAAC,MAAM,UAAU,CAAC;AACzC,OAAO,EAAC,OAAO,EAAC,MAAM,UAAU,CAAC;AAEjC,MAAM,UAAU,UAAU,CAAC,SAAS,EAAE,MAAM;IAC1C,4FAA4F;IAC5F,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IAEjC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;IAC3B,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;IAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;IAEhC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;QAC3B,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;KAClD;SAAM,IAAI,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;QAChC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACzD;IACD,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAE/D,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,MAAM,EAAE,EAAE;IACjD,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,QAAQ,CAAC,CAAC;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAElC,MAAM,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IACtC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAEnE,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC;AAEF,MAAM,UAAU,UAAU,CAAC,SAAiB,EAAE,MAAc;IAC1D,MAAM,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC;IACjC,MAAM,KAAK,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC;IAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,UAAU,EAAE,CAAC;IAElC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IACjE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC;IAEnE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAgB,EAAE,MAAc;IAC7D,MAAM,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAE5C,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC9D,MAAM,IAAI,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC1D,MAAM,KAAK,GAAG,SAAS,CAAC,KAAK,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAChE,MAAM,OAAO,GAAG,SAAS,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAEhE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IACtC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACpC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACrC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IACvC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvC,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,MAAM,UAAU,UAAU,CACxB,YAAoB,EACpB,WAAmB,EACnB,SAAkB,IAAI;IAEtB,IAAI,MAAM,IAAI,WAAW,IAAI,IAAI,IAAI,YAAY,IAAI,IAAI,EAAE;QACzD,IACE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,QAAQ,CAChC,WAAW,CAAC,WAAW,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAClD,EACD;YACA,OAAO,YAAY,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;SAClC;aAAM;YACL,OAAO,YAAY,CAAC;SACrB;KACF;SAAM;QACL,OAAO,YAAY,CAAC;KACrB;AACH,CAAC;AAED,MAAM,gBAAgB,GAAG,MAAM,CAAC;AAChC,MAAM,yBAAyB,GAAG,eAAe,CAAC;AAClD,MAAM,cAAc,GAAG,cAAc,CAAC;AACtC,MAAM,aAAa,GAAG,SAAS,CAAC;AAEhC,MAAM,UAAU,SAAS,CAAC,GAAW;IACnC,IAAI,eAAe,CAAC,GAAG,CAAC,EAAE;QACxB,OAAO,EAAE,CAAC;KACX;IAED,MAAM,QAAQ,GAAG,GAAG;SACjB,UAAU,CAAC,gBAAgB,EAAE,EAAE,CAAC;SAChC,UAAU,CAAC,yBAAyB,EAAE,EAAE,CAAC;SACzC,UAAU,CAAC,cAAc,EAAE,EAAE,CAAC;SAC9B,UAAU,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;IAElC,OAAO,WAAW,CAAC,QAAQ,CAAC,CAAC;AAC/B,CAAC;AAED,SAAS,WAAW,CAAC,GAAW;IAC9B,IAAI,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;QACzB,OAAO,GAAG,CAAC;KACZ;IAED,OAAO,GAAG,GAAG,GAAG,CAAC;AACnB,CAAC;AAED,MAAM,CAAC,MAAM,wBAAwB,GAAG,GAAG,EAAE;IAC3C,MAAM,GAAG,GAAG,IAAI,IAAI,EAAE,CAAC;IAEvB,OAAO,qBAAqB,CAAC,GAAG,CAAC,QAAQ,EAAE,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAC1D,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,UAAU,CAAC,CAAC;IAEnC,MAAM,IAAI,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IACjC,MAAM,KAAK,GAAG,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACjE,MAAM,GAAG,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAExD,MAAM,IAAI,GAAG,GAAG,IAAI,IAAI,KAAK,IAAI,GAAG,EAAE,CAAC;IAEvC,MAAM,KAAK,GAAG,KAAK,CAAC,QAAQ,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC3D,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/D,MAAM,OAAO,GAAG,KAAK,CAAC,UAAU,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAC/D,MAAM,YAAY,GAAG,KAAK,CAAC,eAAe,EAAE,CAAC,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IAEzE,MAAM,IAAI,GAAG,GAAG,KAAK,IAAI,OAAO,IAAI,OAAO,IAAI,YAAY,EAAE,CAAC;IAE9D,OAAO,GAAG,IAAI,IAAI,IAAI,EAAE,CAAC;AAC3B,CAAC,CAAC;AAEF,MAAM,aAAa,GAAG,CAAC,KAAU,EAAE,EAAE,CACnC,KAAK,IAAI,IAAI,IAAI,OAAO,KAAK,KAAK,QAAQ,CAAC;AAE7C,MAAM,WAAW,GAAG,CAAC,KAAc,EAAsC,EAAE,CACzE,OAAO,KAAK,KAAK,QAAQ;IACzB,OAAO,KAAK,KAAK,QAAQ;IACzB,OAAO,KAAK,KAAK,SAAS,CAAC;AAE7B;;;;;;GAMG;AACH,MAAM,kBAAkB,GAAG,CAAC,MAA+B,EAAE,EAAE;IAC7D,MAAM,YAAY,GAA4B,EAAC,EAAE,EAAE,MAAM,CAAC,EAAE,EAAC,CAAC;IAE9D,IAAI,MAAM,CAAC,EAAE,IAAI,IAAI,EAAE;QACrB,OAAO,YAAY,CAAC;KACrB;IAED,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,EAAE,KAAK,CAAC,EAAE,EAAE;QACpD,IACE,SAAS,KAAK,SAAS;YACvB,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC;YAC1B,WAAW,CAAC,KAAK,CAAC,EAClB;YACA,YAAY,CAAC,SAAS,CAAC,GAAG,KAAK,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,YAAY,CAAC;AACtB,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAAY,EACZ,gBAAwB,IAAI,EAC5B,EAAE;IACF,IAAI,OAAO,CAAC,IAAI,CAAC,EAAE;QACjB,OAAO,EAAC,aAAa,EAAE,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAC,CAAC;KAC5C;IAED,IAAI,KAAK,GAAG,EAAE,CAAC;IACf,IAAI,QAAQ,GAAG,EAAE,CAAC;IAElB,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,EAAE;QAC9C,MAAM,UAAU,GAAG,GAAG,aAAa,CAAC,CAAC,CAAC,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,CAAC;QACxE,QAAQ,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;QAE5B,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YACzB,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,CAC5B,aAAa,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAChD,CAAC;SACH;aAAM,IAAI,aAAa,CAAC,MAAM,CAAC,EAAE;YAChC,KAAK,CAAC,IAAI,CAAC,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;SAC1C;aAAM;YACL,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC;SACtB;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,EAAC,aAAa,EAAE,KAAK,EAAE,QAAQ,EAAC,CAAC;AAC1C,CAAC,CAAC"}
|
package/lib/utils/image.js
CHANGED
|
@@ -17,13 +17,19 @@
|
|
|
17
17
|
*/
|
|
18
18
|
import { useCallback } from 'react';
|
|
19
19
|
import { useSelector } from 'react-redux';
|
|
20
|
+
import { getLocalFilePath, getServerFileId } from './file';
|
|
20
21
|
export const useMetafileUri = () => {
|
|
21
22
|
const { baseUrl } = useSelector((state) => state.auth);
|
|
22
|
-
return useCallback((metafileId) =>
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
23
|
+
return useCallback((metafileId) => {
|
|
24
|
+
if (metafileId == null)
|
|
25
|
+
return null;
|
|
26
|
+
const localPath = getLocalFilePath(metafileId);
|
|
27
|
+
return {
|
|
28
|
+
uri: localPath != null
|
|
29
|
+
? `file://${localPath}`
|
|
30
|
+
: `${baseUrl}ws/rest/com.axelor.meta.db.MetaFile/${getServerFileId(metafileId)}/content/download`,
|
|
31
|
+
};
|
|
32
|
+
}, [baseUrl]);
|
|
27
33
|
};
|
|
28
34
|
export const useBinaryImageUri = () => {
|
|
29
35
|
const { baseUrl } = useSelector((state) => state.auth);
|
package/lib/utils/image.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"image.js","sourceRoot":"","sources":["../../src/utils/image.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,OAAO,EAAC,WAAW,EAAC,MAAM,OAAO,CAAC;AAClC,OAAO,EAAC,WAAW,EAAC,MAAM,aAAa,CAAC;AACxC,OAAO,EAAC,gBAAgB,EAAE,eAAe,EAAC,MAAM,QAAQ,CAAC;AAEzD,MAAM,CAAC,MAAM,cAAc,GAAG,GAAG,EAAE;IACjC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,UAAkB,EAAE,EAAE;QACrB,IAAI,UAAU,IAAI,IAAI;YAAE,OAAO,IAAI,CAAC;QAEpC,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAE/C,OAAO;YACL,GAAG,EACD,SAAS,IAAI,IAAI;gBACf,CAAC,CAAC,UAAU,SAAS,EAAE;gBACvB,CAAC,CAAC,GAAG,OAAO,uCAAuC,eAAe,CAC9D,UAAU,CACX,mBAAmB;SAC3B,CAAC;IACJ,CAAC,EACD,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,iBAAiB,GAAG,GAAG,EAAE;IACpC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QACzB,CAAC,CAAC,IAAI;QACN,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,mBACnC,OAAO,IAAI,IAAI;gBACb,CAAC,CAAC,KAAK,OAAO,aAAa,EAAE,gBAAgB,KAAK,GAAG;gBACrD,CAAC,CAAC,EACN,YAAY;SACb,EACP,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,mBAAmB,GAAG,GAAG,EAAE;IACtC,MAAM,EAAC,OAAO,EAAC,GAAG,WAAW,CAAC,CAAC,KAAU,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAE1D,OAAO,WAAW,CAChB,CAAC,EAAU,EAAE,OAAe,EAAE,KAAa,EAAE,EAAE,CAC7C,EAAE,IAAI,IAAI,IAAI,OAAO,IAAI,IAAI,IAAI,KAAK,IAAI,IAAI;QAC5C,CAAC,CAAC;YACE,GAAG,EAAE,GAAG,OAAO,WAAW,KAAK,IAAI,EAAE,uBAAuB,OAAO,aAAa,EAAE,gBAAgB,KAAK,aAAa;SACrH;QACH,CAAC,CAAC,IAAI,EACV,CAAC,OAAO,CAAC,CACV,CAAC;AACJ,CAAC,CAAC"}
|
package/lib/utils/index.d.ts
CHANGED
|
@@ -2,7 +2,8 @@ export { updateAgendaItems } from './agenda';
|
|
|
2
2
|
export * from './api';
|
|
3
3
|
export { decreaseDate, diffDate, getDay, getEndOfDay, getFromNowDate, getFullDateItems, getMonth, getNextMonth, getPreviousMonth, getStartOfDay, incrementDate, isDate, isDateTime, ISODateTimeToDate, isMidnightDate, isToday, sameDate, } from './date';
|
|
4
4
|
export { displayItemName, displayItemFullname, displayItemTitle, } from './displayers';
|
|
5
|
-
export {
|
|
5
|
+
export type { LocalFileLookup, LocalFileResolver } from './file';
|
|
6
|
+
export { getLocalFilePath, getServerFileId, registerLocalFileResolver, sanitizeFileName, sanitizeLocalFileName, } from './file';
|
|
6
7
|
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, formatRequestBody, } from './formatters';
|
|
7
8
|
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
8
9
|
export { filterList, filterListContain, getLastItem, getNextItem } from './list';
|
package/lib/utils/index.js
CHANGED
|
@@ -19,7 +19,7 @@ export { updateAgendaItems } from './agenda';
|
|
|
19
19
|
export * from './api';
|
|
20
20
|
export { decreaseDate, diffDate, getDay, getEndOfDay, getFromNowDate, getFullDateItems, getMonth, getNextMonth, getPreviousMonth, getStartOfDay, incrementDate, isDate, isDateTime, ISODateTimeToDate, isMidnightDate, isToday, sameDate, } from './date';
|
|
21
21
|
export { displayItemName, displayItemFullname, displayItemTitle, } from './displayers';
|
|
22
|
-
export { sanitizeFileName, sanitizeLocalFileName } from './file';
|
|
22
|
+
export { getLocalFilePath, getServerFileId, registerLocalFileResolver, sanitizeFileName, sanitizeLocalFileName, } from './file';
|
|
23
23
|
export { formatDate, formatDateTime, formatTime, formatScan, formatURL, getNowDateZonesISOString, getDateZonesISOString, formatRequestBody, } from './formatters';
|
|
24
24
|
export { useBinaryImageUri, useBinaryPictureUri, useMetafileUri } from './image';
|
|
25
25
|
export { filterList, filterListContain, getLastItem, getNextItem } from './list';
|
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,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,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,YAAY,EACZ,QAAQ,EACR,MAAM,EACN,WAAW,EACX,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,YAAY,EACZ,gBAAgB,EAChB,aAAa,EACb,aAAa,EACb,MAAM,EACN,UAAU,EACV,iBAAiB,EACjB,cAAc,EACd,OAAO,EACP,QAAQ,GACT,MAAM,QAAQ,CAAC;AAChB,OAAO,EACL,eAAe,EACf,mBAAmB,EACnB,gBAAgB,GACjB,MAAM,cAAc,CAAC;AAEtB,OAAO,EACL,gBAAgB,EAChB,eAAe,EACf,yBAAyB,EACzB,gBAAgB,EAChB,qBAAqB,GACtB,MAAM,QAAQ,CAAC;AAChB,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,EACL,eAAe,EACf,mBAAmB,EACnB,MAAM,EACN,UAAU,EACV,cAAc,GACf,MAAM,UAAU,CAAC;AAClB,OAAO,EAAC,UAAU,EAAE,kBAAkB,EAAC,MAAM,UAAU,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axelor/aos-mobile-core",
|
|
3
|
-
"version": "8.5.
|
|
3
|
+
"version": "8.5.31",
|
|
4
4
|
"author": "Axelor",
|
|
5
5
|
"license": "AGPL-3.0-only",
|
|
6
6
|
"repository": {
|
|
@@ -31,8 +31,8 @@
|
|
|
31
31
|
"license:add": "npx add-copyright-header --generate --dir 'src'"
|
|
32
32
|
},
|
|
33
33
|
"dependencies": {
|
|
34
|
-
"@axelor/aos-mobile-error": "8.5.
|
|
35
|
-
"@axelor/aos-mobile-ui": "8.5.
|
|
34
|
+
"@axelor/aos-mobile-error": "8.5.31",
|
|
35
|
+
"@axelor/aos-mobile-ui": "8.5.31",
|
|
36
36
|
"@react-navigation/drawer": "7.5.9",
|
|
37
37
|
"@react-navigation/native": "7.1.18",
|
|
38
38
|
"@react-navigation/native-stack": "7.3.27",
|