@firedesktop/react-base 1.16.0 → 1.16.1

package/dist/utils/fetch/Types.d.ts

@@ -1,4 +1,5 @@
 export interface ILabels {
+    errorBadRequest: string;
     errorGeneric: string;
     errorServerNotAvailable: string;
     errorSessionExpired: string;

package/dist/utils/fetch/fetchWrapper.d.ts

@@ -2,12 +2,13 @@ import * as Types from './Types';
 declare class FetchWrapper {
     apiVersion?: string;
     labels?: Types.ILabels;
-    status_401_403?: () => void;
-    constructor(apiVersion?: string, labels?: Types.ILabels, status_401_403?: () => void);
-    get: (url: string, token?: string, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
-    post: (url: string, token?: string, params?: Blob | any, isFile?: boolean, isBlob?: boolean, additionalParams?: Types.AdditionalParamsType[]) => Promise<any>;
-    put: (url: string, token?: string, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
-    delete: (url: string, token?: string, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
-    generic: (method: string, url: string, token?: string, params?: Blob | any, isFile?: boolean, isBlob?: boolean, version?: string, additionalParams?: Types.AdditionalParamsType[]) => Promise<any>;
+    status_401?: () => void;
+    status_403?: () => void;
+    constructor(apiVersion?: string, labels?: Types.ILabels, status_401?: () => void, status_403?: () => void);
+    get: (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
+    post: (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile?: boolean, isBlob?: boolean, additionalParams?: Types.AdditionalParamsType[]) => Promise<any>;
+    put: (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
+    delete: (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile?: boolean, isBlob?: boolean) => Promise<any>;
+    generic: (method: string, url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile?: boolean, isBlob?: boolean, version?: string, additionalParams?: Types.AdditionalParamsType[]) => Promise<any>;
 }
 export default FetchWrapper;

package/dist/utils/fetch/fetchWrapper.js

@@ -2,6 +2,7 @@ var Constants = (function () {
     function Constants() {
     }
     Constants.labels = {
+        errorBadRequest: 'Request is not in a valid format',
         errorGeneric: 'Sorry we have errors on the remote server',
         errorServerNotAvailable: 'Server not available',
         errorSessionExpired: 'Your session has expired, please login.',
@@ -9,30 +10,30 @@ var Constants = (function () {
     return Constants;
 }());
 var FetchWrapper = (function () {
-    function FetchWrapper(apiVersion, labels, status_401_403) {
+    function FetchWrapper(apiVersion, labels, status_401, status_403) {
         var _this = this;
-        this.get = function (url, token, params, isFile, isBlob) {
+        this.get = function (url, token, onGenericServerError, params, isFile, isBlob) {
             if (isFile === void 0) { isFile = false; }
             if (isBlob === void 0) { isBlob = false; }
-            return _this.generic('GET', url, token, params, isFile, isBlob);
+            return _this.generic('GET', url, token, onGenericServerError, params, isFile, isBlob);
         };
-        this.post = function (url, token, params, isFile, isBlob, additionalParams) {
+        this.post = function (url, token, onGenericServerError, params, isFile, isBlob, additionalParams) {
             if (isFile === void 0) { isFile = false; }
             if (isBlob === void 0) { isBlob = false; }
             if (additionalParams === void 0) { additionalParams = []; }
-            return _this.generic('POST', url, token, params, isFile, isBlob, _this.apiVersion, additionalParams);
+            return _this.generic('POST', url, token, onGenericServerError, params, isFile, isBlob, _this.apiVersion, additionalParams);
         };
-        this.put = function (url, token, params, isFile, isBlob) {
+        this.put = function (url, token, onGenericServerError, params, isFile, isBlob) {
             if (isFile === void 0) { isFile = false; }
             if (isBlob === void 0) { isBlob = false; }
-            return _this.generic('PUT', url, token, params, isFile, isBlob);
+            return _this.generic('PUT', url, token, onGenericServerError, params, isFile, isBlob);
         };
-        this.delete = function (url, token, params, isFile, isBlob) {
+        this.delete = function (url, token, onGenericServerError, params, isFile, isBlob) {
             if (isFile === void 0) { isFile = false; }
             if (isBlob === void 0) { isBlob = false; }
-            return _this.generic('DELETE', url, token, params, isFile, isBlob);
+            return _this.generic('DELETE', url, token, onGenericServerError, params, isFile, isBlob);
         };
-        this.generic = function (method, url, token, params, isFile, isBlob, version, additionalParams) {
+        this.generic = function (method, url, token, onGenericServerError, params, isFile, isBlob, version, additionalParams) {
             if (isFile === void 0) { isFile = false; }
             if (isBlob === void 0) { isBlob = false; }
             if (version === void 0) { version = _this.apiVersion; }
@@ -70,7 +71,8 @@ var FetchWrapper = (function () {
                 headers: headers
             };
             var labels = _this.labels;
-            var status_401_403 = _this.status_401_403;
+            var status_401 = _this.status_401;
+            var status_403 = _this.status_403;
             return fetch(url, requestInit)
                 .then(function (response) {
                 if (response.status < 200 || response.status >= 300)
@@ -84,14 +86,25 @@ var FetchWrapper = (function () {
                 console.error("Error on fetch url: " + url);
                 if (!error || error.message === 'Failed to fetch')
                     throw new Error(labels.errorServerNotAvailable);
-                if (error.text) {
-                    if ((error.status === 401 || error.status === 403) && status_401_403) {
-                        status_401_403();
+                if (error.status === 401 && status_401) {
+                    status_401();
+                }
+                else if (error.status === 403 && status_401) {
+                    status_403();
+                }
+                else if (error.status === 400 && onGenericServerError) {
+                    onGenericServerError(error.status);
+                }
+                if (!error.text) {
+                    if (error.status === 400) {
+                        throw new Error(labels.errorBadRequest);
+                    }
+                    else if (error.status === 401 || error.status === 403) {
                         throw new Error(labels.errorSessionExpired);
                     }
-                    else
-                        return error.text();
                 }
+                else
+                    return error.text();
                 if (error.message && error.message !== '')
                     throw error.message;
                 throw new Error(labels.errorGeneric);
@@ -105,7 +118,8 @@ var FetchWrapper = (function () {
             });
         };
         this.apiVersion = apiVersion;
-        this.status_401_403 = status_401_403;
+        this.status_401 = status_401;
+        this.status_403 = status_403;
         if (labels && labels !== null && labels.errorGeneric && labels.errorServerNotAvailable && labels.errorSessionExpired)
             this.labels = labels;
         else

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

@@ -1 +1 @@
-{"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"fetchWrapper.js","sourceRoot":"","sources":["../../../src/lib/utils/fetch/fetchWrapper.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@firedesktop/react-base",
-  "version": "1.16.0",
+  "version": "1.16.1",
   "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": "^18.3.47",
+    "@syncfusion/ej2-popups": "^18.3.50",
     "react": "^16.14.0",
     "react-dom": "^16.14.0",
     "react-redux": "^7.2.1"
@@ -36,7 +36,7 @@
   "peerDependencies": {},
   "scripts": {
     "distribute_not_working": "rmdir /s /q dist & mkdir dist && npx babel src/lib --out-dir dist --extensions \".js,.ts,.tsx\" --source-maps inline",
-    "start": "react-scripts start && copy ./src/lib/styles/* ./dist/styles/ && tsc",
+    "start": "react-scripts start",
     "distribute": "rmdir /s /q dist & mkdir dist\\styles && tsc && copyfiles -f src/lib/styles/* dist/styles"
   },
   "eslintConfig": {

package/src/App.tsx

@@ -31,14 +31,24 @@ function App() {
   const [options, setOptions] = useState<{ value: string }[]>([]);
   const [spinning, setSpinning] = useState(false);
 
-  function status_401_403() {
-    alert('Log Out');
+
+  function onGenericServerError(status: number) {
+    alert(`Error, Status: ${status}`);
+  }
+
+  function status_401() {
+    alert('Log Out 401');
+  }
+
+  function status_403() {
+    alert('Log Out 403');
   }
 
   const textFetch = () => {
     const labels = { errorGeneric: 'Errore generiro', errorServerNotAvailable: 'No serviziooo', errorSessionExpired: 'Sessione scadurta' } as Utils.Fetch.Types.ILabels;
 
-    const runner = new Utils.Fetch.FetchWrapper(null, labels, status_401_403);
+    const runner = new Utils.Fetch.FetchWrapper(null, labels, status_401, status_403);
+
     setSpinning(true);
     runner.get('https://my-json-server.typicode.com/typicode/demo/posts', null, null, false, false).then(response => {
       // @ts-ignore
@@ -53,6 +63,33 @@ function App() {
         console.log(errorMessage);
     });
 
+
+    // setSpinning(true);
+
+    // 401
+    // runner.get('https://gammafd1.northeurope.cloudapp.azure.com:9136/flowbot/CustomCode', null, null, false, false).then(response => {
+    //   setSpinning(false);
+    //   debugger;
+    //   alert('OK');
+    // }).catch(errorMessage => {
+    //   debugger;
+    //   if (errorMessage && errorMessage.message)
+    //     alert(errorMessage.message);
+    //   setSpinning(false);
+    // });
+
+    // 400
+    // runner.delete('https://gammafd1.northeurope.cloudapp.azure.com:9126/flowbot/Dossier/24/Procedure/78', null, onGenericServerError, null, false, false).then(response => {
+    //   setSpinning(false);
+    //   debugger;
+    //   alert('Ok');
+    // }).catch(errorMessage => {
+    //   debugger;
+    //   if (errorMessage && errorMessage.message)
+    //     alert(errorMessage.message);
+    //   setSpinning(false);
+    // });
+
   };
 
   const updateAppState = (name: string, value: object) => {

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

@@ -1,4 +1,5 @@
 export interface ILabels {
+    errorBadRequest: string,
     errorGeneric: string;
     errorServerNotAvailable: string;
     errorSessionExpired: string;

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

@@ -2,6 +2,7 @@ import * as Types from './Types';
 
 class Constants {
     static labels = {
+        errorBadRequest: 'Request is not in a valid format',
         errorGeneric: 'Sorry we have errors on the remote server',
         errorServerNotAvailable: 'Server not available',
         errorSessionExpired: 'Your session has expired, please login.',
@@ -11,11 +12,13 @@ class Constants {
 class FetchWrapper {
     apiVersion?: string;
     labels?: Types.ILabels;
-    status_401_403?: () => void;
+    status_401?: () => void;
+    status_403?: () => void;
 
-    constructor(apiVersion?: string, labels?: Types.ILabels, status_401_403?: () => void) {
+    constructor(apiVersion?: string, labels?: Types.ILabels, status_401?: () => void, status_403?: () => void) {
         this.apiVersion = apiVersion;
-        this.status_401_403 = status_401_403;
+        this.status_401 = status_401;
+        this.status_403 = status_403;
 
         if (labels && labels !== null && labels.errorGeneric && labels.errorServerNotAvailable && labels.errorSessionExpired)
             this.labels = labels;
@@ -23,23 +26,23 @@ class FetchWrapper {
             this.labels = Constants.labels;
     }
 
-    get = (url: string, token?: string, params?: Blob | any, isFile = false, isBlob = false) => {
-        return this.generic('GET', url, token, params, isFile, isBlob);
+    get = (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile = false, isBlob = false) => {
+        return this.generic('GET', url, token, onGenericServerError, params, isFile, isBlob);
     }
 
-    post = (url: string, token?: string, params?: Blob | any, isFile = false, isBlob = false, additionalParams: Types.AdditionalParamsType[] = []) => {
-        return this.generic('POST', url, token, params, isFile, isBlob, this.apiVersion, additionalParams);
+    post = (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile = false, isBlob = false, additionalParams: Types.AdditionalParamsType[] = []) => {
+        return this.generic('POST', url, token, onGenericServerError, params, isFile, isBlob, this.apiVersion, additionalParams);
     }
 
-    put = (url: string, token?: string, params?: Blob | any, isFile = false, isBlob = false) => {
-        return this.generic('PUT', url, token, params, isFile, isBlob);
+    put = (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile = false, isBlob = false) => {
+        return this.generic('PUT', url, token, onGenericServerError, params, isFile, isBlob);
     }
 
-    delete = (url: string, token?: string, params?: Blob | any, isFile = false, isBlob = false) => {
-        return this.generic('DELETE', url, token, params, isFile, isBlob);
+    delete = (url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile = false, isBlob = false) => {
+        return this.generic('DELETE', url, token, onGenericServerError, params, isFile, isBlob);
     }
 
-    generic = (method: string, url: string, token?: string, params?: Blob | any, isFile = false, isBlob = false, version = this.apiVersion, additionalParams: Types.AdditionalParamsType[] = []) => {
+    generic = (method: string, url: string, token?: string, onGenericServerError?: (status: number) => void, params?: Blob | any, isFile = false, isBlob = false, version = this.apiVersion, additionalParams: Types.AdditionalParamsType[] = []) => {
         // Headers & Body
         let body: BodyInit;
         const headers = new Headers();
@@ -76,7 +79,8 @@ class FetchWrapper {
         } as RequestInit;
 
         const labels = this.labels;
-        const status_401_403 = this.status_401_403;
+        const status_401 = this.status_401;
+        const status_403 = this.status_403;
 
         return fetch(url, requestInit)
             .then(response => {
@@ -95,15 +99,24 @@ class FetchWrapper {
                 if (!error || error.message === 'Failed to fetch')
                     throw new Error(labels.errorServerNotAvailable);
 
-                // This is an error coming from then
-                if (error.text) {
-                    if ((error.status === 401 || error.status === 403) && status_401_403) {
-                        status_401_403();
+                // This is an error coming from BE
+                if (error.status === 401 && status_401) {
+                    status_401();
+                } else if (error.status === 403 && status_401) {
+                    status_403();
+                } else if (error.status === 400 && onGenericServerError) {
+                    onGenericServerError(error.status);
+                }
+
+                if (!error.text) {
+                    if (error.status === 400) {
+                        throw new Error(labels.errorBadRequest);
+                    } else if (error.status === 401 || error.status === 403) {
                         throw new Error(labels.errorSessionExpired);
                     }
-                    else
-                        return error.text();
                 }
+                else
+                    return error.text();
 
                 if (error.message && error.message !== '')
                     throw error.message;

package/debug.log

@@ -1,2 +0,0 @@
-[1118/091940.733:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
-[1118/100751.068:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)