@firedesktop/react-base 1.84.0 → 1.86.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/dist/utils/fetch/fetchWrapper.js +132 -98
  2. package/dist/utils/fetch/fetchWrapper.js.map +1 -1
  3. package/package.json +11 -11
  4. package/src/lib/utils/fetch/fetchWrapper.ts +64 -56
package/dist/utils/fetch/fetchWrapper.js CHANGED
@@ -53,134 +53,168 @@ var FetchWrapper = (function () {
53
53
  if (isBlobInReturn === void 0) { isBlobInReturn = false; }
54
54
  if (additionalParams === void 0) { additionalParams = []; }
55
55
  if (timeoutInMilli === void 0) { timeoutInMilli = 60000; }
56
- return _this.generic('GET', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, _this.apiVersion, additionalParams, timeoutInMilli);
56
+ return __awaiter(_this, void 0, void 0, function () {
57
+ return __generator(this, function (_a) {
58
+ return [2, this.generic('GET', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli)];
59
+ });
60
+ });
57
61
  };
58
62
  this.post = function (url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, additionalParams, timeoutInMilli) {
59
63
  if (isFile === void 0) { isFile = false; }
60
64
  if (isBlobInReturn === void 0) { isBlobInReturn = false; }
61
65
  if (additionalParams === void 0) { additionalParams = []; }
62
66
  if (timeoutInMilli === void 0) { timeoutInMilli = 60000; }
63
- return _this.generic('POST', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, _this.apiVersion, additionalParams, timeoutInMilli);
67
+ return __awaiter(_this, void 0, void 0, function () {
68
+ return __generator(this, function (_a) {
69
+ return [2, this.generic('POST', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli)];
70
+ });
71
+ });
64
72
  };
65
73
  this.put = function (url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, additionalParams, timeoutInMilli) {
66
74
  if (isFile === void 0) { isFile = false; }
67
75
  if (isBlobInReturn === void 0) { isBlobInReturn = false; }
68
76
  if (additionalParams === void 0) { additionalParams = []; }
69
77
  if (timeoutInMilli === void 0) { timeoutInMilli = 60000; }
70
- return _this.generic('PUT', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, _this.apiVersion, additionalParams, timeoutInMilli);
78
+ return __awaiter(_this, void 0, void 0, function () {
79
+ return __generator(this, function (_a) {
80
+ return [2, this.generic('PUT', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli)];
81
+ });
82
+ });
71
83
  };
72
84
  this.delete = function (url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, additionalParams, timeoutInMilli) {
73
85
  if (isFile === void 0) { isFile = false; }
74
86
  if (isBlobInReturn === void 0) { isBlobInReturn = false; }
75
87
  if (additionalParams === void 0) { additionalParams = []; }
76
88
  if (timeoutInMilli === void 0) { timeoutInMilli = 60000; }
77
- return _this.generic('DELETE', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, _this.apiVersion, additionalParams, timeoutInMilli);
89
+ return __awaiter(_this, void 0, void 0, function () {
90
+ return __generator(this, function (_a) {
91
+ return [2, this.generic('DELETE', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli)];
92
+ });
93
+ });
78
94
  };
79
95
  this.generic = function (method, url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, version, additionalParams, timeoutInMilli) {
80
96
  if (additionalParams === void 0) { additionalParams = []; }
81
97
  if (timeoutInMilli === void 0) { timeoutInMilli = 60000; }
82
- var abortController = new AbortController();
83
- var timeoutId = setTimeout(function () { return abortController.abort(); }, timeoutInMilli);
84
- var body;
85
- var headers = new Headers();
86
- headers.append('Cache-Control', 'no-cache, no-store, must-revalidate');
87
- headers.append('pragma', 'no-cache');
88
- headers.append('Expires', '0');
89
- headers.append('X-Content-Type-Options', 'nosniff');
90
- if (version)
91
- headers.append('api-version', version);
92
- if (applicationName)
93
- headers.append('ApplicationName', applicationName);
94
- if (token)
95
- headers.append('SessionToken', token);
96
- if (params) {
97
- if (isFile) {
98
- var formData = new FormData();
99
- formData.append('file', params);
100
- body = formData;
101
- if (additionalParams) {
102
- for (var index = 0; index < additionalParams.length; index++) {
103
- var element = additionalParams[index];
104
- formData.append(element.name, '' + element.value);
105
- }
106
- }
107
- }
108
- else {
109
- headers.append('Content-Type', 'application/json');
110
- body = JSON.stringify(params);
111
- }
112
- }
113
- var requestInit = {
114
- body: body,
115
- method: method,
116
- mode: 'cors',
117
- cache: 'no-cache',
118
- credentials: 'omit',
119
- headers: headers,
120
- signal: abortController.signal
121
- };
122
- var labels = _this.labels;
123
- var status_401 = _this.status_401;
124
- var status_403 = _this.status_403;
125
- return fetch(encodeURI(url), requestInit)
126
- .then(function (response) {
127
- if (response.status < 200 || response.status >= 300)
128
- throw response;
129
- return isBlobInReturn ? response.blob() : response.json();
130
- })
131
- .then(function (json) {
132
- return json;
133
- })
134
- .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
98
+ return __awaiter(_this, void 0, void 0, function () {
99
+ var abortController, timeoutId, body, headers, formData, index, element, requestInit, labels, status_401, status_403, error_1;
100
+ var _this = this;
135
101
  return __generator(this, function (_a) {
136
102
  switch (_a.label) {
137
103
  case 0:
138
- console.warn("Error on fetch url: ".concat(url), error);
139
- if (!error || (error === null || error === void 0 ? void 0 : error.message) === 'Failed to fetch')
140
- throw new Error(labels.errorServerNotAvailable);
141
- if (!(error.status === 401 && status_401)) return [3, 2];
142
- return [4, status_401()];
143
- case 1:
144
- _a.sent();
145
- return [3, 5];
146
- case 2:
147
- if (!(error.status === 403 && status_401)) return [3, 4];
148
- return [4, status_403()];
149
- case 3:
150
- _a.sent();
151
- return [3, 5];
152
- case 4:
153
- if (onGenericServerError) {
154
- onGenericServerError(error.status, error);
155
- }
156
- _a.label = 5;
157
- case 5:
158
- if (!error.text) {
159
- if (error.status === 400) {
160
- throw labels.errorBadRequest;
104
+ abortController = new AbortController();
105
+ timeoutId = setTimeout(function () { return abortController.abort(); }, timeoutInMilli);
106
+ headers = new Headers();
107
+ headers.append('Cache-Control', 'no-cache, no-store, must-revalidate');
108
+ headers.append('pragma', 'no-cache');
109
+ headers.append('Expires', '0');
110
+ headers.append('X-Content-Type-Options', 'nosniff');
111
+ if (version)
112
+ headers.append('api-version', version);
113
+ if (applicationName)
114
+ headers.append('ApplicationName', applicationName);
115
+ if (token)
116
+ headers.append('SessionToken', token);
117
+ if (params) {
118
+ if (isFile) {
119
+ formData = new FormData();
120
+ formData.append('file', params);
121
+ body = formData;
122
+ if (additionalParams) {
123
+ for (index = 0; index < additionalParams.length; index++) {
124
+ element = additionalParams[index];
125
+ formData.append(element.name, '' + element.value);
126
+ }
127
+ }
161
128
  }
162
- else if (error.status === 401 || error.status === 403) {
163
- throw labels.errorSessionExpired;
129
+ else {
130
+ headers.append('Content-Type', 'application/json');
131
+ body = JSON.stringify(params);
164
132
  }
165
133
  }
166
- else
167
- return [2, error.text()];
168
- if (error.message && error.message !== '')
169
- throw error.message;
170
- throw labels.errorGeneric;
134
+ requestInit = {
135
+ body: body,
136
+ method: method,
137
+ mode: 'cors',
138
+ cache: 'no-cache',
139
+ credentials: 'omit',
140
+ headers: headers,
141
+ signal: abortController.signal
142
+ };
143
+ labels = this.labels;
144
+ status_401 = this.status_401;
145
+ status_403 = this.status_403;
146
+ _a.label = 1;
147
+ case 1:
148
+ _a.trys.push([1, 3, , 4]);
149
+ return [4, fetch(encodeURI(url), requestInit)
150
+ .then(function (response) {
151
+ if (response.status < 200 || response.status >= 300)
152
+ throw response;
153
+ return isBlobInReturn ? response.blob() : response.json();
154
+ })
155
+ .then(function (json) {
156
+ return json;
157
+ })
158
+ .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
159
+ return __generator(this, function (_a) {
160
+ switch (_a.label) {
161
+ case 0:
162
+ console.warn("Error on fetch url: ".concat(url), error);
163
+ if (!error || (error === null || error === void 0 ? void 0 : error.message) === 'Failed to fetch')
164
+ throw new Error(labels.errorServerNotAvailable);
165
+ if (!(error.status === 401 && status_401)) return [3, 2];
166
+ return [4, status_401()];
167
+ case 1:
168
+ _a.sent();
169
+ return [3, 5];
170
+ case 2:
171
+ if (!(error.status === 403 && status_401)) return [3, 4];
172
+ return [4, status_403()];
173
+ case 3:
174
+ _a.sent();
175
+ return [3, 5];
176
+ case 4:
177
+ if (onGenericServerError) {
178
+ onGenericServerError(error.status, error);
179
+ }
180
+ _a.label = 5;
181
+ case 5:
182
+ if (!error.text) {
183
+ if (error.status === 400) {
184
+ throw labels.errorBadRequest;
185
+ }
186
+ else if (error.status === 401 || error.status === 403) {
187
+ throw labels.errorSessionExpired;
188
+ }
189
+ }
190
+ else
191
+ return [2, error.text()];
192
+ if (error.message && error.message !== '')
193
+ throw error.message;
194
+ throw labels.errorGeneric;
195
+ }
196
+ });
197
+ }); })
198
+ .then(function (finalMessage) {
199
+ var _a;
200
+ if (typeof (finalMessage) === 'object')
201
+ return finalMessage;
202
+ if (finalMessage)
203
+ throw finalMessage;
204
+ throw (_a = labels === null || labels === void 0 ? void 0 : labels.errorGeneric) !== null && _a !== void 0 ? _a : 'Error';
205
+ })
206
+ .finally(function () {
207
+ clearTimeout(timeoutId);
208
+ })];
209
+ case 2: return [2, _a.sent()];
210
+ case 3:
211
+ error_1 = _a.sent();
212
+ if (onGenericServerError)
213
+ onGenericServerError(error_1 === null || error_1 === void 0 ? void 0 : error_1.status, error_1);
214
+ throw error_1;
215
+ case 4: return [2];
171
216
  }
172
217
  });
173
- }); })
174
- .then(function (finalMessage) {
175
- var _a;
176
- if (typeof (finalMessage) === 'object')
177
- return finalMessage;
178
- if (finalMessage)
179
- throw finalMessage;
180
- throw (_a = labels === null || labels === void 0 ? void 0 : labels.errorGeneric) !== null && _a !== void 0 ? _a : 'Error';
181
- })
182
- .finally(function () {
183
- clearTimeout(timeoutId);
184
218
  });
185
219
  };
186
220
  this.apiVersion = apiVersion;
package/dist/utils/fetch/fetchWrapper.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,28 +1,28 @@
1
1
  {
2
2
  "name": "@firedesktop/react-base",
3
- "version": "1.84.0",
3
+ "version": "1.86.0",
4
4
  "license": "ISC",
5
5
  "main": "dist/index.js",
6
6
  "description": "This is the FireDesktop base package used to support every React Project in this Company.",
7
7
  "author": "alessandro.gambaro",
8
8
  "repository": "https://firedesktopDevOps@dev.azure.com/firedesktopDevOps/baseFEComponents/_git/baseFEComponents",
9
9
  "dependencies": {
10
- "@syncfusion/ej2-popups": "25.1.35",
10
+ "@syncfusion/ej2-popups": "25.1.41",
11
11
  "@syncfusion/ej2-react-notifications": "25.1.35"
12
12
  },
13
13
  "devDependencies": {
14
- "@babel/cli": "7.23.9",
15
- "@babel/core": "7.24.0",
14
+ "@babel/cli": "7.24.1",
15
+ "@babel/core": "7.24.4",
16
16
  "@babel/plugin-proposal-class-properties": "7.18.6",
17
- "@babel/plugin-transform-arrow-functions": "7.23.3",
18
- "@babel/preset-typescript": "7.23.3",
17
+ "@babel/plugin-transform-arrow-functions": "7.24.1",
18
+ "@babel/preset-typescript": "7.24.1",
19
19
  "@testing-library/jest-dom": "6.4.2",
20
- "@testing-library/react": "14.2.1",
20
+ "@testing-library/react": "15.0.4",
21
21
  "@testing-library/user-event": "14.5.2",
22
22
  "@types/jest": "29.5.12",
23
- "@types/node": "20.11.28",
24
- "@types/react": "18.2.66",
25
- "@types/react-dom": "18.2.22",
23
+ "@types/node": "20.12.7",
24
+ "@types/react": "18.2.79",
25
+ "@types/react-dom": "18.2.25",
26
26
  "@types/react-redux": "7.1.33",
27
27
  "babel-plugin-minify-builtins": "0.5.0",
28
28
  "babel-preset-minify": "0.5.2",
@@ -31,7 +31,7 @@
31
31
  "lodash": "4.17.21",
32
32
  "react": "18.2.0",
33
33
  "react-dom": "18.2.0",
34
- "react-redux": "9.1.0",
34
+ "react-redux": "9.1.1",
35
35
  "react-scripts": "5.0.1",
36
36
  "typescript": "4.9.4",
37
37
  "web-vitals": "3.5.2"
package/src/lib/utils/fetch/fetchWrapper.ts CHANGED
@@ -26,27 +26,27 @@ class FetchWrapper {
26
26
  this.labels = Constants.labels;
27
27
  }
28
28
 
29
- get = (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
29
+ get = async (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
30
30
  additionalParams: Types.AdditionalParamsType[] = [], timeoutInMilli: number = 60000) => {
31
31
  return this.generic('GET', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli);
32
32
  };
33
33
 
34
- post = (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
34
+ post = async (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
35
35
  additionalParams: Types.AdditionalParamsType[] = [], timeoutInMilli: number = 60000) => {
36
36
  return this.generic('POST', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli);
37
37
  };
38
38
 
39
- put = (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
39
+ put = async (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
40
40
  additionalParams: Types.AdditionalParamsType[] = [], timeoutInMilli: number = 60000) => {
41
41
  return this.generic('PUT', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli);
42
42
  };
43
43
 
44
- delete = (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
44
+ delete = async (url: string, applicationName?: string, token?: string, onGenericServerError?: (status: number, error?: any) => void, params?: Blob | any, isFile = false, isBlobInReturn = false,
45
45
  additionalParams: Types.AdditionalParamsType[] = [], timeoutInMilli: number = 60000) => {
46
46
  return this.generic('DELETE', url, applicationName, token, onGenericServerError, params, isFile, isBlobInReturn, this.apiVersion, additionalParams, timeoutInMilli);
47
47
  };
48
48
 
49
- generic = (method: string, url: string, applicationName: string | undefined, token: string | undefined,
49
+ generic = async (method: string, url: string, applicationName: string | undefined, token: string | undefined,
50
50
  onGenericServerError?: (status: number, error?: any) => void,
51
51
  params?: Blob | any, isFile?: boolean, isBlobInReturn?: boolean, version?: string,
52
52
  additionalParams: Types.AdditionalParamsType[] = [], timeoutInMilli: number = 60000) => {
@@ -103,59 +103,67 @@ class FetchWrapper {
103
103
  const status_401 = this.status_401;
104
104
  const status_403 = this.status_403;
105
105
 
106
- return fetch(encodeURI(url), requestInit)
107
- .then(response => {
108
- // Others Status Code
109
- if (response.status < 200 || response.status >= 300)
110
- throw response;
111
-
112
- return isBlobInReturn ? response.blob() : response.json();
113
- })
114
- .then(json => {
115
- return json;
116
- })
117
- .catch(async error => {
118
- console.warn(`Error on fetch url: ${url}`, error);
119
-
120
- if (!error || error?.message === 'Failed to fetch')
121
- throw new Error(labels.errorServerNotAvailable);
122
-
123
- // This is an error coming from BE
124
- if (error.status === 401 && status_401) {
125
- await status_401();
126
- } else if (error.status === 403 && status_401) {
127
- await status_403();
128
- } else if (onGenericServerError) {
129
- onGenericServerError(error.status, error);
130
- }
106
+ try {
107
+ return await fetch(encodeURI(url), requestInit)
108
+ .then(response => {
109
+ // Others Status Code
110
+ if (response.status < 200 || response.status >= 300)
111
+ throw response;
112
+
113
+ return isBlobInReturn ? response.blob() : response.json();
114
+ })
115
+ .then(json => {
116
+ return json;
117
+ })
118
+ .catch(async error => {
119
+ console.warn(`Error on fetch url: ${url}`, error);
120
+
121
+ if (!error || error?.message === 'Failed to fetch')
122
+ throw new Error(labels.errorServerNotAvailable);
123
+
124
+ // This is an error coming from BE
125
+ if (error.status === 401 && status_401) {
126
+ await status_401();
127
+ } else if (error.status === 403 && status_401) {
128
+ await status_403();
129
+ } else if (onGenericServerError) {
130
+ onGenericServerError(error.status, error);
131
+ }
131
132
 
132
- if (!error.text) {
133
- if (error.status === 400) {
134
- throw labels.errorBadRequest;
135
- } else if (error.status === 401 || error.status === 403) {
136
- throw labels.errorSessionExpired;
133
+ if (!error.text) {
134
+ if (error.status === 400) {
135
+ throw labels.errorBadRequest;
136
+ } else if (error.status === 401 || error.status === 403) {
137
+ throw labels.errorSessionExpired;
138
+ }
137
139
  }
138
- }
139
- else
140
- return error.text();
141
-
142
- if (error.message && error.message !== '')
143
- throw error.message;
144
-
145
- throw labels.errorGeneric;
146
- })
147
- .then(finalMessage => {
148
- if (typeof (finalMessage) === 'object')
149
- return finalMessage;
150
-
151
- if (finalMessage)
152
- throw finalMessage;
153
-
154
- throw labels?.errorGeneric ?? 'Error';
155
- })
156
- .finally(() => {
157
- clearTimeout(timeoutId);
158
- });
140
+ else
141
+ return error.text();
142
+
143
+ if (error.message && error.message !== '')
144
+ throw error.message;
145
+
146
+ throw labels.errorGeneric;
147
+ })
148
+ .then(finalMessage => {
149
+ if (typeof (finalMessage) === 'object')
150
+ return finalMessage;
151
+
152
+ if (finalMessage)
153
+ throw finalMessage;
154
+
155
+ throw labels?.errorGeneric ?? 'Error';
156
+ })
157
+ .finally(() => {
158
+ clearTimeout(timeoutId);
159
+ });
160
+ }
161
+ catch (error) {
162
+ if (onGenericServerError)
163
+ onGenericServerError(error?.status, error);
164
+
165
+ throw error;
166
+ }
159
167
  };
160
168
  }
161
169