@firedesktop/react-base 1.84.0 → 1.85.0

package/dist/utils/fetch/fetchWrapper.js

@@ -122,66 +122,73 @@ var FetchWrapper = (function () {
             var labels = _this.labels;
             var status_401 = _this.status_401;
             var status_403 = _this.status_403;
-            return fetch(encodeURI(url), requestInit)
-                .then(function (response) {
-                if (response.status < 200 || response.status >= 300)
-                    throw response;
-                return isBlobInReturn ? response.blob() : response.json();
-            })
-                .then(function (json) {
-                return json;
-            })
-                .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
-                return __generator(this, function (_a) {
-                    switch (_a.label) {
-                        case 0:
-                            console.warn("Error on fetch url: ".concat(url), error);
-                            if (!error || (error === null || error === void 0 ? void 0 : error.message) === 'Failed to fetch')
-                                throw new Error(labels.errorServerNotAvailable);
-                            if (!(error.status === 401 && status_401)) return [3, 2];
-                            return [4, status_401()];
-                        case 1:
-                            _a.sent();
-                            return [3, 5];
-                        case 2:
-                            if (!(error.status === 403 && status_401)) return [3, 4];
-                            return [4, status_403()];
-                        case 3:
-                            _a.sent();
-                            return [3, 5];
-                        case 4:
-                            if (onGenericServerError) {
-                                onGenericServerError(error.status, error);
-                            }
-                            _a.label = 5;
-                        case 5:
-                            if (!error.text) {
-                                if (error.status === 400) {
-                                    throw labels.errorBadRequest;
+            try {
+                return fetch(encodeURI(url), requestInit)
+                    .then(function (response) {
+                    if (response.status < 200 || response.status >= 300)
+                        throw response;
+                    return isBlobInReturn ? response.blob() : response.json();
+                })
+                    .then(function (json) {
+                    return json;
+                })
+                    .catch(function (error) { return __awaiter(_this, void 0, void 0, function () {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
+                            case 0:
+                                console.warn("Error on fetch url: ".concat(url), error);
+                                if (!error || (error === null || error === void 0 ? void 0 : error.message) === 'Failed to fetch')
+                                    throw new Error(labels.errorServerNotAvailable);
+                                if (!(error.status === 401 && status_401)) return [3, 2];
+                                return [4, status_401()];
+                            case 1:
+                                _a.sent();
+                                return [3, 5];
+                            case 2:
+                                if (!(error.status === 403 && status_401)) return [3, 4];
+                                return [4, status_403()];
+                            case 3:
+                                _a.sent();
+                                return [3, 5];
+                            case 4:
+                                if (onGenericServerError) {
+                                    onGenericServerError(error.status, error);
                                 }
-                                else if (error.status === 401 || error.status === 403) {
-                                    throw labels.errorSessionExpired;
+                                _a.label = 5;
+                            case 5:
+                                if (!error.text) {
+                                    if (error.status === 400) {
+                                        throw labels.errorBadRequest;
+                                    }
+                                    else if (error.status === 401 || error.status === 403) {
+                                        throw labels.errorSessionExpired;
+                                    }
                                 }
-                            }
-                            else
-                                return [2, error.text()];
-                            if (error.message && error.message !== '')
-                                throw error.message;
-                            throw labels.errorGeneric;
-                    }
+                                else
+                                    return [2, error.text()];
+                                if (error.message && error.message !== '')
+                                    throw error.message;
+                                throw labels.errorGeneric;
+                        }
+                    });
+                }); })
+                    .then(function (finalMessage) {
+                    var _a;
+                    if (typeof (finalMessage) === 'object')
+                        return finalMessage;
+                    if (finalMessage)
+                        throw finalMessage;
+                    throw (_a = labels === null || labels === void 0 ? void 0 : labels.errorGeneric) !== null && _a !== void 0 ? _a : 'Error';
+                })
+                    .finally(function () {
+                    clearTimeout(timeoutId);
                 });
-            }); })
-                .then(function (finalMessage) {
-                var _a;
-                if (typeof (finalMessage) === 'object')
-                    return finalMessage;
-                if (finalMessage)
-                    throw finalMessage;
-                throw (_a = labels === null || labels === void 0 ? void 0 : labels.errorGeneric) !== null && _a !== void 0 ? _a : 'Error';
-            })
-                .finally(function () {
-                clearTimeout(timeoutId);
-            });
+            }
+            catch (error) {
+                if (onGenericServerError)
+                    onGenericServerError(error === null || error === void 0 ? void 0 : error.status, error);
+                throw error;
+            }
         };
         this.apiVersion = apiVersion;
         this.status_401 = status_401;

package/dist/utils/fetch/fetchWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IAAA;IAOA,CAAC;IANU,gBAAM,GAAG;QACZ,eAAe,EAAE,kCAAkC;QACnD,YAAY,EAAE,2CAA2C;QACzD,uBAAuB,EAAE,sBAAsB;QAC/C,mBAAmB,EAAE,yCAAyC;KAChD,CAAC;IACvB,gBAAC;CAAA,AAPD,IAOC;AAED;IAMI,sBAAY,UAAmB,EAAE,MAAsB,EAAE,UAAgC,EAAE,UAAgC;QAA3H,iBASC;QAED,QAAG,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACnL,gBAAmD,EAAE,cAA8B;YAD0D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACnL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACrK,CAAC,CAAC;QAEF,SAAI,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACpL,gBAAmD,EAAE,cAA8B;YAD2D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACpL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACtK,CAAC,CAAC;QAEF,QAAG,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACnL,gBAAmD,EAAE,cAA8B;YAD0D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACnL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACrK,CAAC,CAAC;QAEF,WAAM,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACtL,gBAAmD,EAAE,cAA8B;YAD6D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACtL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACxK,CAAC,CAAC;QAEF,YAAO,GAAG,UAAC,MAAc,EAAE,GAAW,EAAE,eAAmC,EAAE,KAAyB,EAClG,oBAA4D,EAC5D,MAAmB,EAAE,MAAgB,EAAE,cAAwB,EAAE,OAAgB,EACjF,gBAAmD,EAAE,cAA8B;YAAnF,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YAEnF,IAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;YAC9C,IAAM,SAAS,GAAG,UAAU,CAAC,cAAM,OAAA,eAAe,CAAC,KAAK,EAAE,EAAvB,CAAuB,EAAE,cAAc,CAAC,CAAC;YAG5E,IAAI,IAAc,CAAC;YACnB,IAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAE9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,qCAAqC,CAAC,CAAC;YACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACrC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;YAEpD,IAAI,OAAO;gBACP,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAC3C,IAAI,eAAe;gBACf,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACvD,IAAI,KAAK;gBACL,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YAI1C,IAAI,MAAM,EAAE;gBACR,IAAI,MAAM,EAAE;oBACR,IAAI,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAC9B,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAChC,IAAI,GAAG,QAAQ,CAAC;oBAChB,IAAI,gBAAgB,EAAE;wBAClB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;4BAC1D,IAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;4BACxC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;yBACrD;qBACJ;iBACJ;qBAAM;oBACH,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;oBACnD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;iBACjC;aACJ;YAED,IAAM,WAAW,GAAG;gBAChB,IAAI,MAAA;gBACJ,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,MAAM;gBACnB,OAAO,SAAA;gBACP,MAAM,EAAE,eAAe,CAAC,MAAM;aAClB,CAAC;YAEjB,IAAM,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC;YAC3B,IAAM,UAAU,GAAG,KAAI,CAAC,UAAU,CAAC;YACnC,IAAM,UAAU,GAAG,KAAI,CAAC,UAAU,CAAC;YAEnC,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;iBACpC,IAAI,CAAC,UAAA,QAAQ;gBAEV,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG;oBAC/C,MAAM,QAAQ,CAAC;gBAEnB,OAAO,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;YAC9D,CAAC,CAAC;iBACD,IAAI,CAAC,UAAA,IAAI;gBACN,OAAO,IAAI,CAAC;YAChB,CAAC,CAAC;iBACD,KAAK,CAAC,UAAM,KAAK;;;;4BACd,OAAO,CAAC,IAAI,CAAC,8BAAuB,GAAG,CAAE,EAAE,KAAK,CAAC,CAAC;4BAElD,IAAI,CAAC,KAAK,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,MAAK,iBAAiB;gCAC9C,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;iCAGhD,CAAA,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAA,EAAlC,cAAkC;4BAClC,WAAM,UAAU,EAAE,EAAA;;4BAAlB,SAAkB,CAAC;;;iCACZ,CAAA,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAA,EAAlC,cAAkC;4BACzC,WAAM,UAAU,EAAE,EAAA;;4BAAlB,SAAkB,CAAC;;;4BAChB,IAAI,oBAAoB,EAAE;gCAC7B,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;6BAC7C;;;4BAED,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;gCACb,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;oCACtB,MAAM,MAAM,CAAC,eAAe,CAAC;iCAChC;qCAAM,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;oCACrD,MAAM,MAAM,CAAC,mBAAmB,CAAC;iCACpC;6BACJ;;gCAEG,WAAO,KAAK,CAAC,IAAI,EAAE,EAAC;4BAExB,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE;gCACrC,MAAM,KAAK,CAAC,OAAO,CAAC;4BAExB,MAAM,MAAM,CAAC,YAAY,CAAC;;;iBAC7B,CAAC;iBACD,IAAI,CAAC,UAAA,YAAY;;gBACd,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,QAAQ;oBAClC,OAAO,YAAY,CAAC;gBAExB,IAAI,YAAY;oBACZ,MAAM,YAAY,CAAC;gBAEvB,MAAM,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,OAAO,CAAC;YAC1C,CAAC,CAAC;iBACD,OAAO,CAAC;gBACL,YAAY,CAAC,SAAS,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;QACX,CAAC,CAAC;QA5IE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,MAAM,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,uBAAuB,IAAI,MAAM,CAAC,mBAAmB;YAChH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;;YAErB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACvC,CAAC;IAqIL,mBAAC;AAAD,CAAC,AApJD,IAoJC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA;IAAA;IAOA,CAAC;IANU,gBAAM,GAAG;QACZ,eAAe,EAAE,kCAAkC;QACnD,YAAY,EAAE,2CAA2C;QACzD,uBAAuB,EAAE,sBAAsB;QAC/C,mBAAmB,EAAE,yCAAyC;KAChD,CAAC;IACvB,gBAAC;CAAA,AAPD,IAOC;AAED;IAMI,sBAAY,UAAmB,EAAE,MAAsB,EAAE,UAAgC,EAAE,UAAgC;QAA3H,iBASC;QAED,QAAG,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACnL,gBAAmD,EAAE,cAA8B;YAD0D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACnL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACrK,CAAC,CAAC;QAEF,SAAI,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACpL,gBAAmD,EAAE,cAA8B;YAD2D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACpL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,MAAM,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACtK,CAAC,CAAC;QAEF,QAAG,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACnL,gBAAmD,EAAE,cAA8B;YAD0D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACnL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACrK,CAAC,CAAC;QAEF,WAAM,GAAG,UAAC,GAAW,EAAE,eAAwB,EAAE,KAAc,EAAE,oBAA4D,EAAE,MAAmB,EAAE,MAAc,EAAE,cAAsB,EACtL,gBAAmD,EAAE,cAA8B;YAD6D,uBAAA,EAAA,cAAc;YAAE,+BAAA,EAAA,sBAAsB;YACtL,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YACnF,OAAO,KAAI,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,EAAE,eAAe,EAAE,KAAK,EAAE,oBAAoB,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAAE,KAAI,CAAC,UAAU,EAAE,gBAAgB,EAAE,cAAc,CAAC,CAAC;QACxK,CAAC,CAAC;QAEF,YAAO,GAAG,UAAC,MAAc,EAAE,GAAW,EAAE,eAAmC,EAAE,KAAyB,EAClG,oBAA4D,EAC5D,MAAmB,EAAE,MAAgB,EAAE,cAAwB,EAAE,OAAgB,EACjF,gBAAmD,EAAE,cAA8B;YAAnF,iCAAA,EAAA,qBAAmD;YAAE,+BAAA,EAAA,sBAA8B;YAEnF,IAAM,eAAe,GAAG,IAAI,eAAe,EAAE,CAAC;YAC9C,IAAM,SAAS,GAAG,UAAU,CAAC,cAAM,OAAA,eAAe,CAAC,KAAK,EAAE,EAAvB,CAAuB,EAAE,cAAc,CAAC,CAAC;YAG5E,IAAI,IAAc,CAAC;YACnB,IAAM,OAAO,GAAG,IAAI,OAAO,EAAE,CAAC;YAE9B,OAAO,CAAC,MAAM,CAAC,eAAe,EAAE,qCAAqC,CAAC,CAAC;YACvE,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC;YACrC,OAAO,CAAC,MAAM,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;YAC/B,OAAO,CAAC,MAAM,CAAC,wBAAwB,EAAE,SAAS,CAAC,CAAC;YAEpD,IAAI,OAAO;gBACP,OAAO,CAAC,MAAM,CAAC,aAAa,EAAE,OAAO,CAAC,CAAC;YAC3C,IAAI,eAAe;gBACf,OAAO,CAAC,MAAM,CAAC,iBAAiB,EAAE,eAAe,CAAC,CAAC;YACvD,IAAI,KAAK;gBACL,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,KAAK,CAAC,CAAC;YAI1C,IAAI,MAAM,EAAE;gBACR,IAAI,MAAM,EAAE;oBACR,IAAI,QAAQ,GAAG,IAAI,QAAQ,EAAE,CAAC;oBAC9B,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;oBAChC,IAAI,GAAG,QAAQ,CAAC;oBAChB,IAAI,gBAAgB,EAAE;wBAClB,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,gBAAgB,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;4BAC1D,IAAM,OAAO,GAAG,gBAAgB,CAAC,KAAK,CAAC,CAAC;4BACxC,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC;yBACrD;qBACJ;iBACJ;qBAAM;oBACH,OAAO,CAAC,MAAM,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;oBACnD,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;iBACjC;aACJ;YAED,IAAM,WAAW,GAAG;gBAChB,IAAI,MAAA;gBACJ,MAAM,EAAE,MAAM;gBACd,IAAI,EAAE,MAAM;gBACZ,KAAK,EAAE,UAAU;gBACjB,WAAW,EAAE,MAAM;gBACnB,OAAO,SAAA;gBACP,MAAM,EAAE,eAAe,CAAC,MAAM;aAClB,CAAC;YAEjB,IAAM,MAAM,GAAG,KAAI,CAAC,MAAM,CAAC;YAC3B,IAAM,UAAU,GAAG,KAAI,CAAC,UAAU,CAAC;YACnC,IAAM,UAAU,GAAG,KAAI,CAAC,UAAU,CAAC;YAEnC,IAAI;gBACA,OAAO,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,WAAW,CAAC;qBACpC,IAAI,CAAC,UAAA,QAAQ;oBAEV,IAAI,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,QAAQ,CAAC,MAAM,IAAI,GAAG;wBAC/C,MAAM,QAAQ,CAAC;oBAEnB,OAAO,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC;gBAC9D,CAAC,CAAC;qBACD,IAAI,CAAC,UAAA,IAAI;oBACN,OAAO,IAAI,CAAC;gBAChB,CAAC,CAAC;qBACD,KAAK,CAAC,UAAM,KAAK;;;;gCACd,OAAO,CAAC,IAAI,CAAC,8BAAuB,GAAG,CAAE,EAAE,KAAK,CAAC,CAAC;gCAElD,IAAI,CAAC,KAAK,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,MAAK,iBAAiB;oCAC9C,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,CAAC;qCAGhD,CAAA,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAA,EAAlC,cAAkC;gCAClC,WAAM,UAAU,EAAE,EAAA;;gCAAlB,SAAkB,CAAC;;;qCACZ,CAAA,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,UAAU,CAAA,EAAlC,cAAkC;gCACzC,WAAM,UAAU,EAAE,EAAA;;gCAAlB,SAAkB,CAAC;;;gCAChB,IAAI,oBAAoB,EAAE;oCAC7B,oBAAoB,CAAC,KAAK,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;iCAC7C;;;gCAED,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE;oCACb,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;wCACtB,MAAM,MAAM,CAAC,eAAe,CAAC;qCAChC;yCAAM,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,KAAK,GAAG,EAAE;wCACrD,MAAM,MAAM,CAAC,mBAAmB,CAAC;qCACpC;iCACJ;;oCAEG,WAAO,KAAK,CAAC,IAAI,EAAE,EAAC;gCAExB,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,KAAK,EAAE;oCACrC,MAAM,KAAK,CAAC,OAAO,CAAC;gCAExB,MAAM,MAAM,CAAC,YAAY,CAAC;;;qBAC7B,CAAC;qBACD,IAAI,CAAC,UAAA,YAAY;;oBACd,IAAI,OAAO,CAAC,YAAY,CAAC,KAAK,QAAQ;wBAClC,OAAO,YAAY,CAAC;oBAExB,IAAI,YAAY;wBACZ,MAAM,YAAY,CAAC;oBAEvB,MAAM,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,YAAY,mCAAI,OAAO,CAAC;gBAC1C,CAAC,CAAC;qBACD,OAAO,CAAC;oBACL,YAAY,CAAC,SAAS,CAAC,CAAC;gBAC5B,CAAC,CAAC,CAAC;aACV;YACD,OAAO,KAAK,EAAE;gBACV,IAAI,oBAAoB;oBACpB,oBAAoB,CAAC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,EAAE,KAAK,CAAC,CAAC;gBAE/C,MAAM,KAAK,CAAC;aACf;QACL,CAAC,CAAC;QApJE,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAE7B,IAAI,MAAM,IAAI,MAAM,KAAK,IAAI,IAAI,MAAM,CAAC,YAAY,IAAI,MAAM,CAAC,uBAAuB,IAAI,MAAM,CAAC,mBAAmB;YAChH,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;;YAErB,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,MAAM,CAAC;IACvC,CAAC;IA6IL,mBAAC;AAAD,CAAC,AA5JD,IA4JC;AAED,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,28 +1,28 @@
 {
   "name": "@firedesktop/react-base",
-  "version": "1.84.0",
+  "version": "1.85.0",
   "license": "ISC",
   "main": "dist/index.js",
   "description": "This is the FireDesktop base package used to support every React Project in this Company.",
   "author": "alessandro.gambaro",
   "repository": "https://firedesktopDevOps@dev.azure.com/firedesktopDevOps/baseFEComponents/_git/baseFEComponents",
   "dependencies": {
-    "@syncfusion/ej2-popups": "25.1.35",
+    "@syncfusion/ej2-popups": "25.1.41",
     "@syncfusion/ej2-react-notifications": "25.1.35"
   },
   "devDependencies": {
-    "@babel/cli": "7.23.9",
-    "@babel/core": "7.24.0",
+    "@babel/cli": "7.24.1",
+    "@babel/core": "7.24.4",
     "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-transform-arrow-functions": "7.23.3",
-    "@babel/preset-typescript": "7.23.3",
+    "@babel/plugin-transform-arrow-functions": "7.24.1",
+    "@babel/preset-typescript": "7.24.1",
     "@testing-library/jest-dom": "6.4.2",
-    "@testing-library/react": "14.2.1",
+    "@testing-library/react": "15.0.4",
     "@testing-library/user-event": "14.5.2",
     "@types/jest": "29.5.12",
-    "@types/node": "20.11.28",
-    "@types/react": "18.2.66",
-    "@types/react-dom": "18.2.22",
+    "@types/node": "20.12.7",
+    "@types/react": "18.2.79",
+    "@types/react-dom": "18.2.25",
     "@types/react-redux": "7.1.33",
     "babel-plugin-minify-builtins": "0.5.0",
     "babel-preset-minify": "0.5.2",
@@ -31,7 +31,7 @@
     "lodash": "4.17.21",
     "react": "18.2.0",
     "react-dom": "18.2.0",
-    "react-redux": "9.1.0",
+    "react-redux": "9.1.1",
     "react-scripts": "5.0.1",
     "typescript": "4.9.4",
     "web-vitals": "3.5.2"

package/src/lib/utils/fetch/fetchWrapper.ts

@@ -103,59 +103,67 @@ class FetchWrapper {
         const status_401 = this.status_401;
         const status_403 = this.status_403;
 
-        return fetch(encodeURI(url), requestInit)
-            .then(response => {
-                // Others Status Code
-                if (response.status < 200 || response.status >= 300)
-                    throw response;
-
-                return isBlobInReturn ? response.blob() : response.json();
-            })
-            .then(json => {
-                return json;
-            })
-            .catch(async error => {
-                console.warn(`Error on fetch url: ${url}`, error);
-
-                if (!error || error?.message === 'Failed to fetch')
-                    throw new Error(labels.errorServerNotAvailable);
-
-                // This is an error coming from BE
-                if (error.status === 401 && status_401) {
-                    await status_401();
-                } else if (error.status === 403 && status_401) {
-                    await status_403();
-                } else if (onGenericServerError) {
-                    onGenericServerError(error.status, error);
-                }
+        try {
+            return fetch(encodeURI(url), requestInit)
+                .then(response => {
+                    // Others Status Code
+                    if (response.status < 200 || response.status >= 300)
+                        throw response;
+
+                    return isBlobInReturn ? response.blob() : response.json();
+                })
+                .then(json => {
+                    return json;
+                })
+                .catch(async error => {
+                    console.warn(`Error on fetch url: ${url}`, error);
+
+                    if (!error || error?.message === 'Failed to fetch')
+                        throw new Error(labels.errorServerNotAvailable);
+
+                    // This is an error coming from BE
+                    if (error.status === 401 && status_401) {
+                        await status_401();
+                    } else if (error.status === 403 && status_401) {
+                        await status_403();
+                    } else if (onGenericServerError) {
+                        onGenericServerError(error.status, error);
+                    }
 
-                if (!error.text) {
-                    if (error.status === 400) {
-                        throw labels.errorBadRequest;
-                    } else if (error.status === 401 || error.status === 403) {
-                        throw labels.errorSessionExpired;
+                    if (!error.text) {
+                        if (error.status === 400) {
+                            throw labels.errorBadRequest;
+                        } else if (error.status === 401 || error.status === 403) {
+                            throw labels.errorSessionExpired;
+                        }
                     }
-                }
-                else
-                    return error.text();
-
-                if (error.message && error.message !== '')
-                    throw error.message;
-
-                throw labels.errorGeneric;
-            })
-            .then(finalMessage => {
-                if (typeof (finalMessage) === 'object')
-                    return finalMessage;
-
-                if (finalMessage)
-                    throw finalMessage;
-
-                throw labels?.errorGeneric ?? 'Error';
-            })
-            .finally(() => {
-                clearTimeout(timeoutId);
-            });
+                    else
+                        return error.text();
+
+                    if (error.message && error.message !== '')
+                        throw error.message;
+
+                    throw labels.errorGeneric;
+                })
+                .then(finalMessage => {
+                    if (typeof (finalMessage) === 'object')
+                        return finalMessage;
+
+                    if (finalMessage)
+                        throw finalMessage;
+
+                    throw labels?.errorGeneric ?? 'Error';
+                })
+                .finally(() => {
+                    clearTimeout(timeoutId);
+                });
+        }
+        catch (error) {
+            if (onGenericServerError)
+                onGenericServerError(error?.status, error);
+
+            throw error;
+        }
     };
 }