wcz-layout 5.2.2 → 5.3.1

package/package.json

@@ -2,7 +2,7 @@
   "name": "wcz-layout",
   "license": "MIT",
   "author": "Dalibor Homola",
-  "version": "5.2.2",
+  "version": "5.3.1",
   "main": "dist/src/index.js",
   "module": "dist/src/index.js",
   "exports": {

package/src/contexts/LayoutContext.tsx

@@ -6,8 +6,8 @@ import I18NextHttpBackend from 'i18next-http-backend';
 import moment from 'moment';
 import { createContext, ReactNode, SyntheticEvent, useCallback, useEffect, useMemo, useState } from 'react';
 import { initReactI18next, useTranslation } from 'react-i18next';
-import Layout from '../components/Layout';
 import CenteredBox from '../components/common/CenteredBox';
+import Layout from '../components/Layout';
 import KeycloakExtendedConfig from '../models/KeycloakExtendedConfig';
 import { LeftDrawerItem } from '../models/LeftDrawerItem';
 import SnackbarModel from '../models/SnackbarModel';
@@ -39,7 +39,6 @@ i18next
     .use(I18NextHttpBackend)
     .init({ fallbackLng: 'en' });
 
-//Moment
 moment.defaultFormat = 'YYYY-MM-DD';
 
 declare module "moment" {
@@ -103,10 +102,11 @@ export function LayoutProvider(props: LayoutProviderProps) {
             queries: {
                 enabled: enabled,
                 refetchOnWindowFocus: false,
-                onError: message => setSnackbar({ message: String(message), severity: "error" })
+                onError: message => setSnackbar({ message: String(message), severity: "error" }),
+                retry: false
             },
             mutations: {
-                onError: message => setSnackbar({ message: String(message), severity: "error" })
+                onError: message => setSnackbar({ message: String(message), severity: "error" }),
             }
         });
     };

package/src/models/KeycloakExtendedConfig.ts

@@ -1,12 +1,12 @@
-export default interface KeycloakExtendedConfig {
-    autoLogin?: boolean,
-    confidential?: Confidential,
-    realm: string,
-    "auth-server-url": string,
-    idpHint?: string
-}
-
-export interface Confidential {
-    client: string,
-    secret: string
+export default interface KeycloakExtendedConfig {
+    autoLogin?: boolean,
+    confidential?: Confidential,
+    realm: string,
+    "auth-server-url": string,
+    idpHint?: string
+}
+
+export interface Confidential {
+    client: string,
+    secret: string
 }

package/src/models/LeftDrawerItem.ts

@@ -1,6 +1,6 @@
-export interface LeftDrawerItem {
-    title: string,
-    path: string,
-    icon: React.ReactNode,
-    hidden?: boolean
-}
+export interface LeftDrawerItem {
+    title: string,
+    path: string,
+    icon: React.ReactNode,
+    hidden?: boolean
+}

package/src/models/SnackbarModel.ts

@@ -1,6 +1,6 @@
-import { AlertColor } from "@mui/material";
-
-export default interface SnackbarModel {
-    message: string,
-    severity?: AlertColor
+import { AlertColor } from "@mui/material";
+
+export default interface SnackbarModel {
+    message: string,
+    severity?: AlertColor
 }

package/src/models/User.ts

@@ -1,13 +1,13 @@
-import { KeycloakPromise } from "keycloak-js";
-
-export interface User {
-    id: string,
-    name: string,
-    department: string
-}
-
-export interface ExtendedUser extends User {
-    loggedIn: boolean,
-    login: () => KeycloakPromise<void, void>,
-    logout: () => KeycloakPromise<void, void> 
+import { KeycloakPromise } from "keycloak-js";
+
+export interface User {
+    id: string,
+    name: string,
+    department: string
+}
+
+export interface ExtendedUser extends User {
+    loggedIn: boolean,
+    login: () => KeycloakPromise<void, void>,
+    logout: () => KeycloakPromise<void, void> 
 }

package/src/utils/Fetches.ts

@@ -1,92 +1,92 @@
-import { getToken } from "./UserService";
-
-export const fetchGet = async (url: string, signal: AbortSignal | undefined): Promise<any> => {
-    const initReq: RequestInit = await getRequestInit("GET", null, signal);
-
-    const response: Response = await fetch(url, initReq);
-    if (!response.ok)
-        throw await getQueryErrorMessage(response);
-
-    return response.json();
-};
-
-export const fetchFileGet = async (url: string, signal: AbortSignal | undefined): Promise<Blob> => {
-    const initReq: RequestInit = await getRequestInit("GET", null, signal);
-
-    const response: Response = await fetch(url, initReq);
-    if (!response.ok)
-        throw await getQueryErrorMessage(response);
-
-    return response.blob();
-};
-
-export const fetchPost = async (url: string, data: unknown): Promise<any> => {
-    const initReq: RequestInit = await getRequestInit("POST", data);
-
-    const response: Response = await fetch(url, initReq);
-    if (!response.ok)
-        throw await getQueryErrorMessage(response);
-
-    return response.json();
-};
-
-export const fetchPut = async (url: string, data: unknown): Promise<Response> => {
-    const initReq: RequestInit = await getRequestInit("PUT", data);
-
-    const response: Response = await fetch(url, initReq);
-    if (!response.ok)
-        throw await getQueryErrorMessage(response);
-
-    return response;
-};
-
-export const fetchDelete = async (url: string): Promise<Response> => {
-    const initReq: RequestInit = await getRequestInit("DELETE");
-
-    const response: Response = await fetch(url, initReq);
-    if (!response.ok)
-        throw await getQueryErrorMessage(response);
-
-    return response;
-};
-
-const getRequestInit = async (method: string, data?: unknown, signal?: AbortSignal): Promise<RequestInit> => {
-    const request: RequestInit = {
-        method: method,
-        signal: signal,
-        credentials: 'include'
-    };
-
-    if (data) {
-        if (data instanceof FormData)
-            request.body = data;
-        else
-            request.body = JSON.stringify(data);
-    }
-
-    if (data instanceof FormData)
-        request.headers = {
-            'Authorization': `Bearer ${await getToken()}`
-        };
-    else {
-        request.headers = {
-            'Content-Type': 'application/json',
-            'Authorization': `Bearer ${await getToken()}`
-        };
-    }
-
-    return request;
-};
-
-const getQueryErrorMessage = async (response: Response): Promise<string> => {
-    let message: string = `Error connecting to server`;
-
-    const detailMessage: string | undefined = await response.json()
-        .then(data => data.message ?? data.title)
-        .catch(() => (message));
-
-    if (detailMessage)
-        message = detailMessage;
-
-    return message;
+import { getToken } from "./UserService";
+
+export const fetchGet = async (url: string, signal: AbortSignal | undefined): Promise<any> => {
+    const initReq: RequestInit = await getRequestInit("GET", null, signal);
+
+    const response: Response = await fetch(url, initReq);
+    if (!response.ok)
+        throw await getQueryErrorMessage(response);
+
+    return response.json();
+};
+
+export const fetchFileGet = async (url: string, signal: AbortSignal | undefined): Promise<Blob> => {
+    const initReq: RequestInit = await getRequestInit("GET", null, signal);
+
+    const response: Response = await fetch(url, initReq);
+    if (!response.ok)
+        throw await getQueryErrorMessage(response);
+
+    return response.blob();
+};
+
+export const fetchPost = async (url: string, data: unknown): Promise<any> => {
+    const initReq: RequestInit = await getRequestInit("POST", data);
+
+    const response: Response = await fetch(url, initReq);
+    if (!response.ok)
+        throw await getQueryErrorMessage(response);
+
+    return response.json();
+};
+
+export const fetchPut = async (url: string, data: unknown): Promise<Response> => {
+    const initReq: RequestInit = await getRequestInit("PUT", data);
+
+    const response: Response = await fetch(url, initReq);
+    if (!response.ok)
+        throw await getQueryErrorMessage(response);
+
+    return response;
+};
+
+export const fetchDelete = async (url: string): Promise<Response> => {
+    const initReq: RequestInit = await getRequestInit("DELETE");
+
+    const response: Response = await fetch(url, initReq);
+    if (!response.ok)
+        throw await getQueryErrorMessage(response);
+
+    return response;
+};
+
+const getRequestInit = async (method: string, data?: unknown, signal?: AbortSignal): Promise<RequestInit> => {
+    const request: RequestInit = {
+        method: method,
+        signal: signal,
+        credentials: 'include'
+    };
+
+    if (data) {
+        if (data instanceof FormData)
+            request.body = data;
+        else
+            request.body = JSON.stringify(data);
+    }
+
+    if (data instanceof FormData)
+        request.headers = {
+            'Authorization': `Bearer ${await getToken()}`
+        };
+    else {
+        request.headers = {
+            'Content-Type': 'application/json',
+            'Authorization': `Bearer ${await getToken()}`
+        };
+    }
+
+    return request;
+};
+
+const getQueryErrorMessage = async (response: Response): Promise<string> => {
+    let message: string = `[${response.status}] ${response.statusText}`;
+
+    const detailMessage: string | undefined = await response.json()
+        .then(data => `[${response.status}] ${data.message}`)
+        .catch(() => (message));
+
+    if (detailMessage)
+        message = detailMessage;
+
+    return message;
 };

package/src/utils/Helpers.ts

@@ -1,8 +1,8 @@
-import { Guid } from "guid-ts";
-
-export const isAndroid: boolean = /(android)/i.test(navigator.userAgent);
-export const isMobile: boolean = /(android|iphone)/i.test(navigator.userAgent);
-
-export const isDevelopment: boolean = window.location.href.includes(".dev") || window.location.href.includes("localhost");
-
-export const newGuid = (): string => Guid.newGuid().toString();
+import { Guid } from "guid-ts";
+
+export const isAndroid: boolean = /(android)/i.test(navigator.userAgent);
+export const isMobile: boolean = /(android|iphone)/i.test(navigator.userAgent);
+
+export const isDevelopment: boolean = window.location.href.includes(".dev") || window.location.href.includes("localhost");
+
+export const newGuid = (): string => Guid.newGuid().toString();