datastake-daf 0.6.552 → 0.6.554
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/dist/components/index.js +7 -11
- package/dist/context/index.js +7 -11
- package/dist/services/index.js +10 -17
- package/package.json +1 -1
- package/src/@daf/services/BaseService.js +5 -5
- package/src/@daf/services/ErrorService.js +3 -3
- package/src/@daf/services/helpers/config.js +4 -6
- package/src/services.js +1 -1
package/dist/components/index.js
CHANGED
|
@@ -41063,7 +41063,7 @@ const createErrorHandler = (config = {}) => {
|
|
|
41063
41063
|
};
|
|
41064
41064
|
};
|
|
41065
41065
|
|
|
41066
|
-
window.
|
|
41066
|
+
window.globalServicesConfig = {
|
|
41067
41067
|
application: null,
|
|
41068
41068
|
mainApiUrl: null,
|
|
41069
41069
|
storeUrl: null,
|
|
@@ -41073,11 +41073,8 @@ window.globalConfig = {
|
|
|
41073
41073
|
store: null,
|
|
41074
41074
|
addToastAction: null
|
|
41075
41075
|
};
|
|
41076
|
-
const
|
|
41077
|
-
|
|
41078
|
-
getConfig: window.globalConfig
|
|
41079
|
-
});
|
|
41080
|
-
return window.globalConfig;
|
|
41076
|
+
const getServicesConfig = () => {
|
|
41077
|
+
return window.globalServicesConfig;
|
|
41081
41078
|
};
|
|
41082
41079
|
|
|
41083
41080
|
class ErrorService {
|
|
@@ -41086,7 +41083,7 @@ class ErrorService {
|
|
|
41086
41083
|
statusText,
|
|
41087
41084
|
data
|
|
41088
41085
|
}) {
|
|
41089
|
-
const config =
|
|
41086
|
+
const config = getServicesConfig();
|
|
41090
41087
|
if (config.store && config.addToastAction) {
|
|
41091
41088
|
config.store.dispatch(config.addToastAction({
|
|
41092
41089
|
title: statusText,
|
|
@@ -41107,7 +41104,6 @@ class ErrorService {
|
|
|
41107
41104
|
// In datastake-daf - src/services/BaseService.js
|
|
41108
41105
|
class BaseService extends BaseHTTPService {
|
|
41109
41106
|
constructor() {
|
|
41110
|
-
getConfig$1();
|
|
41111
41107
|
const errorHandler = createErrorHandler({
|
|
41112
41108
|
getStorageManager: () => StorageManager,
|
|
41113
41109
|
handleError: ({
|
|
@@ -41144,7 +41140,7 @@ class BaseService extends BaseHTTPService {
|
|
|
41144
41140
|
super({
|
|
41145
41141
|
getToken: () => getToken(),
|
|
41146
41142
|
getHeaders: () => {
|
|
41147
|
-
const config =
|
|
41143
|
+
const config = getServicesConfig();
|
|
41148
41144
|
return {
|
|
41149
41145
|
Language: config.language || StorageManager.get('datastakeLng') || 'en',
|
|
41150
41146
|
'ngrok-skip-browser-warning': true,
|
|
@@ -41152,7 +41148,7 @@ class BaseService extends BaseHTTPService {
|
|
|
41152
41148
|
};
|
|
41153
41149
|
},
|
|
41154
41150
|
getBaseURL: options => {
|
|
41155
|
-
const config =
|
|
41151
|
+
const config = getServicesConfig();
|
|
41156
41152
|
if (options?.isStore) return config.storeUrl;
|
|
41157
41153
|
return config.mainApiUrl;
|
|
41158
41154
|
},
|
|
@@ -41161,7 +41157,7 @@ class BaseService extends BaseHTTPService {
|
|
|
41161
41157
|
});
|
|
41162
41158
|
}
|
|
41163
41159
|
apiGet(options) {
|
|
41164
|
-
const config =
|
|
41160
|
+
const config = getServicesConfig();
|
|
41165
41161
|
|
|
41166
41162
|
// Add custom baseURL handling for isStore
|
|
41167
41163
|
if (options.isStore) {
|
package/dist/context/index.js
CHANGED
|
@@ -841,7 +841,7 @@ const createErrorHandler = (config = {}) => {
|
|
|
841
841
|
};
|
|
842
842
|
};
|
|
843
843
|
|
|
844
|
-
window.
|
|
844
|
+
window.globalServicesConfig = {
|
|
845
845
|
application: null,
|
|
846
846
|
mainApiUrl: null,
|
|
847
847
|
storeUrl: null,
|
|
@@ -851,11 +851,8 @@ window.globalConfig = {
|
|
|
851
851
|
store: null,
|
|
852
852
|
addToastAction: null
|
|
853
853
|
};
|
|
854
|
-
const
|
|
855
|
-
|
|
856
|
-
getConfig: window.globalConfig
|
|
857
|
-
});
|
|
858
|
-
return window.globalConfig;
|
|
854
|
+
const getServicesConfig = () => {
|
|
855
|
+
return window.globalServicesConfig;
|
|
859
856
|
};
|
|
860
857
|
|
|
861
858
|
class ErrorService {
|
|
@@ -864,7 +861,7 @@ class ErrorService {
|
|
|
864
861
|
statusText,
|
|
865
862
|
data
|
|
866
863
|
}) {
|
|
867
|
-
const config =
|
|
864
|
+
const config = getServicesConfig();
|
|
868
865
|
if (config.store && config.addToastAction) {
|
|
869
866
|
config.store.dispatch(config.addToastAction({
|
|
870
867
|
title: statusText,
|
|
@@ -885,7 +882,6 @@ class ErrorService {
|
|
|
885
882
|
// In datastake-daf - src/services/BaseService.js
|
|
886
883
|
class BaseService extends BaseHTTPService {
|
|
887
884
|
constructor() {
|
|
888
|
-
getConfig();
|
|
889
885
|
const errorHandler = createErrorHandler({
|
|
890
886
|
getStorageManager: () => StorageManager$1,
|
|
891
887
|
handleError: ({
|
|
@@ -922,7 +918,7 @@ class BaseService extends BaseHTTPService {
|
|
|
922
918
|
super({
|
|
923
919
|
getToken: () => getToken(),
|
|
924
920
|
getHeaders: () => {
|
|
925
|
-
const config =
|
|
921
|
+
const config = getServicesConfig();
|
|
926
922
|
return {
|
|
927
923
|
Language: config.language || StorageManager$1.get('datastakeLng') || 'en',
|
|
928
924
|
'ngrok-skip-browser-warning': true,
|
|
@@ -930,7 +926,7 @@ class BaseService extends BaseHTTPService {
|
|
|
930
926
|
};
|
|
931
927
|
},
|
|
932
928
|
getBaseURL: options => {
|
|
933
|
-
const config =
|
|
929
|
+
const config = getServicesConfig();
|
|
934
930
|
if (options?.isStore) return config.storeUrl;
|
|
935
931
|
return config.mainApiUrl;
|
|
936
932
|
},
|
|
@@ -939,7 +935,7 @@ class BaseService extends BaseHTTPService {
|
|
|
939
935
|
});
|
|
940
936
|
}
|
|
941
937
|
apiGet(options) {
|
|
942
|
-
const config =
|
|
938
|
+
const config = getServicesConfig();
|
|
943
939
|
|
|
944
940
|
// Add custom baseURL handling for isStore
|
|
945
941
|
if (options.isStore) {
|
package/dist/services/index.js
CHANGED
|
@@ -470,7 +470,7 @@ class ErrorHandler {
|
|
|
470
470
|
}
|
|
471
471
|
}
|
|
472
472
|
|
|
473
|
-
window.
|
|
473
|
+
window.globalServicesConfig = {
|
|
474
474
|
application: null,
|
|
475
475
|
mainApiUrl: null,
|
|
476
476
|
storeUrl: null,
|
|
@@ -481,19 +481,13 @@ window.globalConfig = {
|
|
|
481
481
|
addToastAction: null
|
|
482
482
|
};
|
|
483
483
|
const configureServices = config => {
|
|
484
|
-
window.
|
|
485
|
-
...window.
|
|
484
|
+
window.globalServicesConfig = {
|
|
485
|
+
...window.globalServicesConfig,
|
|
486
486
|
...config
|
|
487
487
|
};
|
|
488
|
-
console.log({
|
|
489
|
-
configureServices: window.globalConfig
|
|
490
|
-
});
|
|
491
488
|
};
|
|
492
|
-
const
|
|
493
|
-
|
|
494
|
-
getConfig: window.globalConfig
|
|
495
|
-
});
|
|
496
|
-
return window.globalConfig;
|
|
489
|
+
const getServicesConfig = () => {
|
|
490
|
+
return window.globalServicesConfig;
|
|
497
491
|
};
|
|
498
492
|
|
|
499
493
|
/**
|
|
@@ -611,7 +605,7 @@ class ErrorService {
|
|
|
611
605
|
statusText,
|
|
612
606
|
data
|
|
613
607
|
}) {
|
|
614
|
-
const config =
|
|
608
|
+
const config = getServicesConfig();
|
|
615
609
|
if (config.store && config.addToastAction) {
|
|
616
610
|
config.store.dispatch(config.addToastAction({
|
|
617
611
|
title: statusText,
|
|
@@ -632,7 +626,6 @@ class ErrorService {
|
|
|
632
626
|
// In datastake-daf - src/services/BaseService.js
|
|
633
627
|
class BaseService extends BaseHTTPService {
|
|
634
628
|
constructor() {
|
|
635
|
-
getConfig();
|
|
636
629
|
const errorHandler = createErrorHandler({
|
|
637
630
|
getStorageManager: () => StorageManager$1,
|
|
638
631
|
handleError: ({
|
|
@@ -669,7 +662,7 @@ class BaseService extends BaseHTTPService {
|
|
|
669
662
|
super({
|
|
670
663
|
getToken: () => getToken(),
|
|
671
664
|
getHeaders: () => {
|
|
672
|
-
const config =
|
|
665
|
+
const config = getServicesConfig();
|
|
673
666
|
return {
|
|
674
667
|
Language: config.language || StorageManager$1.get('datastakeLng') || 'en',
|
|
675
668
|
'ngrok-skip-browser-warning': true,
|
|
@@ -677,7 +670,7 @@ class BaseService extends BaseHTTPService {
|
|
|
677
670
|
};
|
|
678
671
|
},
|
|
679
672
|
getBaseURL: options => {
|
|
680
|
-
const config =
|
|
673
|
+
const config = getServicesConfig();
|
|
681
674
|
if (options?.isStore) return config.storeUrl;
|
|
682
675
|
return config.mainApiUrl;
|
|
683
676
|
},
|
|
@@ -686,7 +679,7 @@ class BaseService extends BaseHTTPService {
|
|
|
686
679
|
});
|
|
687
680
|
}
|
|
688
681
|
apiGet(options) {
|
|
689
|
-
const config =
|
|
682
|
+
const config = getServicesConfig();
|
|
690
683
|
|
|
691
684
|
// Add custom baseURL handling for isStore
|
|
692
685
|
if (options.isStore) {
|
|
@@ -1178,4 +1171,4 @@ exports.QueryService = QueryService$1;
|
|
|
1178
1171
|
exports.UserService = UserService$1;
|
|
1179
1172
|
exports.configureServices = configureServices;
|
|
1180
1173
|
exports.createLazyService = createLazyService;
|
|
1181
|
-
exports.
|
|
1174
|
+
exports.getServicesConfig = getServicesConfig;
|
package/package.json
CHANGED
|
@@ -3,12 +3,12 @@ import { BaseHTTPService } from './helpers/BaseHTTPService.js';
|
|
|
3
3
|
import { getToken } from '../../helpers/Token.js';
|
|
4
4
|
import { createErrorHandler } from '../../helpers/errorHandling.js';
|
|
5
5
|
import { StorageManager } from '../../helpers/StorageManager.js';
|
|
6
|
-
import {
|
|
6
|
+
import { getServicesConfig } from './helpers/config.js';
|
|
7
7
|
import { ErrorService } from './ErrorService.js';
|
|
8
8
|
|
|
9
9
|
export class BaseService extends BaseHTTPService {
|
|
10
10
|
constructor() {
|
|
11
|
-
const config =
|
|
11
|
+
const config = getServicesConfig();
|
|
12
12
|
|
|
13
13
|
const errorHandler = createErrorHandler({
|
|
14
14
|
getStorageManager: () => StorageManager,
|
|
@@ -34,7 +34,7 @@ export class BaseService extends BaseHTTPService {
|
|
|
34
34
|
super({
|
|
35
35
|
getToken: () => getToken(),
|
|
36
36
|
getHeaders: () => {
|
|
37
|
-
const config =
|
|
37
|
+
const config = getServicesConfig();
|
|
38
38
|
return {
|
|
39
39
|
Language: config.language || StorageManager.get('datastakeLng') || 'en',
|
|
40
40
|
'ngrok-skip-browser-warning': true,
|
|
@@ -42,7 +42,7 @@ export class BaseService extends BaseHTTPService {
|
|
|
42
42
|
};
|
|
43
43
|
},
|
|
44
44
|
getBaseURL: (options) => {
|
|
45
|
-
const config =
|
|
45
|
+
const config = getServicesConfig();
|
|
46
46
|
if (options?.isStore) return config.storeUrl;
|
|
47
47
|
return config.mainApiUrl;
|
|
48
48
|
},
|
|
@@ -52,7 +52,7 @@ export class BaseService extends BaseHTTPService {
|
|
|
52
52
|
}
|
|
53
53
|
|
|
54
54
|
apiGet(options) {
|
|
55
|
-
const config =
|
|
55
|
+
const config = getServicesConfig();
|
|
56
56
|
|
|
57
57
|
// Add custom baseURL handling for isStore
|
|
58
58
|
if (options.isStore) {
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { getServicesConfig } from './helpers/config.js';
|
|
2
2
|
import { message } from 'antd';
|
|
3
3
|
|
|
4
4
|
export class ErrorService {
|
|
5
5
|
static handle({ status, statusText, data }) {
|
|
6
|
-
const config =
|
|
6
|
+
const config = getServicesConfig();
|
|
7
7
|
|
|
8
8
|
if (config.store && config.addToastAction) {
|
|
9
9
|
config.store.dispatch(config.addToastAction({
|
|
@@ -25,6 +25,6 @@ export class ErrorService {
|
|
|
25
25
|
}
|
|
26
26
|
|
|
27
27
|
export const handleError = (err) => {
|
|
28
|
-
const config =
|
|
28
|
+
const config = getServicesConfig();
|
|
29
29
|
message.error(err?.response?.data?.message);
|
|
30
30
|
};
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
window.
|
|
1
|
+
window.globalServicesConfig = {
|
|
2
2
|
application: null,
|
|
3
3
|
mainApiUrl: null,
|
|
4
4
|
storeUrl: null,
|
|
@@ -10,11 +10,9 @@ window.globalConfig = {
|
|
|
10
10
|
};
|
|
11
11
|
|
|
12
12
|
export const configureServices = (config) => {
|
|
13
|
-
window.
|
|
14
|
-
console.log({configureServices: window.globalConfig})
|
|
13
|
+
window.globalServicesConfig = { ...window.globalServicesConfig, ...config };
|
|
15
14
|
};
|
|
16
15
|
|
|
17
|
-
export const
|
|
18
|
-
|
|
19
|
-
return window.globalConfig;
|
|
16
|
+
export const getServicesConfig = () => {
|
|
17
|
+
return window.globalServicesConfig;
|
|
20
18
|
};
|
package/src/services.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
// HELPERS
|
|
2
2
|
export { BaseHTTPService } from './@daf/services/helpers/BaseHTTPService.js';
|
|
3
3
|
export { ErrorHandler } from './@daf/services/helpers/ErrorHandler.js';
|
|
4
|
-
export { configureServices,
|
|
4
|
+
export { configureServices, getServicesConfig } from './@daf/services/helpers/config.js';
|
|
5
5
|
export { createLazyService } from './@daf/services/helpers/LazyService.js';
|
|
6
6
|
|
|
7
7
|
// SERVICES
|