tycho-components 0.9.4 → 0.10.0

package/dist/AppToast/AppToast.js

@@ -1,12 +1,14 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import CommonContext from '../configs/CommonContext';
-import { message } from '../configs/store/actions';
 import { useContext, useEffect } from 'react';
+import { useTranslation } from 'react-i18next';
 import ReactLoading from 'react-loading';
 import { ToastContainer, toast } from 'react-toastify';
 import 'react-toastify/dist/ReactToastify.css';
+import CommonContext from '../configs/CommonContext';
+import { message } from '../configs/store/actions';
 import { EMPTY_TOAST } from './ToastMessage';
 export default function AppToast() {
+    const { t } = useTranslation('common');
     const { dispatch, state } = useContext(CommonContext);
     const handleClose = () => {
         toast.dismiss();
@@ -15,7 +17,7 @@ export default function AppToast() {
     const handleClipboard = () => {
         navigator.clipboard.writeText(state.message.value);
     };
-    const getLoading = () => (_jsxs("div", { className: "d-flex", children: [_jsx(ReactLoading, { type: "spinningBubbles", color: "blue", height: 24, width: 24 }), _jsx("span", { className: "ms-3", children: "Loading..." })] }));
+    const getLoading = () => (_jsxs("div", { className: "d-flex", children: [_jsx(ReactLoading, { type: "spinningBubbles", color: "blue", height: 24, width: 24 }), _jsx("span", { className: "ms-3", children: state.toastLoadingText ?? t('generic.loading') })] }));
     const attachCloseToEscape = () => {
         const closeOnEscape = (e) => {
             if (e.keyCode === 27)
@@ -30,6 +32,7 @@ export default function AppToast() {
     useEffect(() => {
         if (state.toastLoading) {
             toast(getLoading(), {
+                toastId: 'loading',
                 position: 'top-right',
                 autoClose: false,
                 hideProgressBar: false,
@@ -43,7 +46,7 @@ export default function AppToast() {
         else {
             toast.dismiss();
         }
-    }, [state.toastLoading]);
+    }, [state.toastLoading, state.toastLoadingText]);
     useEffect(() => {
         if (state.message && state.message.value !== '') {
             switch (state.message.type) {

package/dist/configs/Localization.d.ts

@@ -69,6 +69,7 @@ export declare const commonResources: {
             'pagination.label.showing': string;
             'pagination.label.results': string;
             'pagination.label.total': string;
+            'generic.loading': string;
             'generic.placeholder': string;
             'generic.placeholder.comma.separated': string;
             'generic.placeholder.select': string;
@@ -337,6 +338,7 @@ export declare const commonResources: {
             'pagination.label.showing': string;
             'pagination.label.results': string;
             'pagination.label.total': string;
+            'generic.loading': string;
             'generic.placeholder': string;
             'generic.placeholder.select': string;
             'generic.placeholder.comma.separated': string;
@@ -604,6 +606,7 @@ export declare const commonResources: {
             'pagination.label.showing': string;
             'pagination.label.results': string;
             'pagination.label.total': string;
+            'generic.loading': string;
             'generic.placeholder': string;
             'generic.placeholder.select': string;
             'generic.placeholder.comma.separated': string;

package/dist/configs/localization/CommonTexts.d.ts

@@ -23,6 +23,7 @@ export declare const CommonTexts: {
         'pagination.label.showing': string;
         'pagination.label.results': string;
         'pagination.label.total': string;
+        'generic.loading': string;
         'generic.placeholder': string;
         'generic.placeholder.comma.separated': string;
         'generic.placeholder.select': string;
@@ -80,6 +81,7 @@ export declare const CommonTexts: {
         'pagination.label.showing': string;
         'pagination.label.results': string;
         'pagination.label.total': string;
+        'generic.loading': string;
         'generic.placeholder': string;
         'generic.placeholder.select': string;
         'generic.placeholder.comma.separated': string;
@@ -137,6 +139,7 @@ export declare const CommonTexts: {
         'pagination.label.showing': string;
         'pagination.label.results': string;
         'pagination.label.total': string;
+        'generic.loading': string;
         'generic.placeholder': string;
         'generic.placeholder.select': string;
         'generic.placeholder.comma.separated': string;

package/dist/configs/localization/CommonTexts.js

@@ -23,6 +23,7 @@ export const CommonTexts = {
         'pagination.label.showing': '',
         'pagination.label.results': 'results per page',
         'pagination.label.total': 'Total',
+        'generic.loading': 'Loading...',
         'generic.placeholder': 'Type here',
         'generic.placeholder.comma.separated': 'Type here separated by commas',
         'generic.placeholder.select': 'Select one here',
@@ -80,6 +81,7 @@ export const CommonTexts = {
         'pagination.label.showing': 'Exibindo',
         'pagination.label.results': 'resultados por página',
         'pagination.label.total': 'Total',
+        'generic.loading': 'Carregando...',
         'generic.placeholder': 'Digite aqui',
         'generic.placeholder.select': 'Selecione um aqui',
         'generic.placeholder.comma.separated': 'Digite aqui separado por vírgulas',
@@ -137,6 +139,7 @@ export const CommonTexts = {
         'pagination.label.showing': 'Mostrando',
         'pagination.label.results': 'risultati per pagina',
         'pagination.label.total': 'Totale',
+        'generic.loading': 'Caricamento...',
         'generic.placeholder': 'Scrivi qui',
         'generic.placeholder.select': 'Seleziona uno qui',
         'generic.placeholder.comma.separated': 'Scrivi qui separato per virgole',

package/dist/configs/store/actions.d.ts

@@ -5,6 +5,9 @@ import { StoreAction } from './types';
 export declare const corpus: (data: Corpus | undefined) => StoreAction;
 export declare const logged: (data: User | undefined) => StoreAction;
 export declare const message: (data: ToastMessage) => StoreAction;
-export declare const toastLoading: (data: boolean) => StoreAction;
+export declare const toastLoading: (data: boolean | {
+    loading: boolean;
+    text?: string;
+}) => StoreAction;
 export declare const silentLoading: (data: boolean) => StoreAction;
 export declare const tour: (data: boolean) => StoreAction;

package/dist/configs/store/reducer.js

@@ -17,9 +17,17 @@ function reducer(state, action) {
                 message: action.payload,
             };
         case types.TOAST_LOADING:
+            if (typeof action.payload === 'boolean') {
+                return {
+                    ...state,
+                    toastLoading: action.payload,
+                    toastLoadingText: undefined,
+                };
+            }
             return {
                 ...state,
-                toastLoading: action.payload,
+                toastLoading: action.payload.loading,
+                toastLoadingText: action.payload.text,
             };
         case types.SILENT_LOADING:
             return {

package/dist/configs/store/types.d.ts

@@ -6,12 +6,16 @@ export type UserStore = {
     logged: User | undefined;
     message: ToastMessage;
     toastLoading: boolean;
+    toastLoadingText?: string;
     silentLoading: boolean;
     tour: boolean;
 };
 export type StoreAction = {
     type: string;
-    payload?: Corpus | ToastMessage | boolean | User;
+    payload?: Corpus | ToastMessage | boolean | User | {
+        loading: boolean;
+        text?: string;
+    };
 };
 export declare const types: {
     CORPUS: string;

package/dist/configs/useMessageUtils.d.ts

@@ -1,4 +1,4 @@
-import { TFunction } from 'i18next';
+import { TFunction } from "i18next";
 type MessageDispatcher = {
     key: string;
     ns?: string;
@@ -10,7 +10,7 @@ type ErrorDispatcher = {
     key?: string;
 };
 export declare const useMessageUtils: () => {
-    dispatchLoading: (val: boolean) => void;
+    dispatchLoading: (val: boolean, text?: string) => void;
     dispatchError: ({ err, t, key }: ErrorDispatcher) => void;
     dispatchMessage: ({ key, ns, t }: MessageDispatcher) => void;
     dispatchMessageDirect: (value: string, type?: "success" | "error") => void;

package/dist/configs/useMessageUtils.js

@@ -1,6 +1,6 @@
-import { useContext } from 'react';
-import { message, silentLoading, toastLoading } from '../configs/store/actions';
-import CommonContext from './CommonContext';
+import { useContext } from "react";
+import { message, silentLoading, toastLoading } from "../configs/store/actions";
+import CommonContext from "./CommonContext";
 export const useMessageUtils = () => {
     const { state, dispatch } = useContext(CommonContext);
     const isSilentLoading = () => {
@@ -12,38 +12,41 @@ export const useMessageUtils = () => {
     const isLoading = () => {
         return state.toastLoading;
     };
-    const dispatchLoading = (val) => {
-        dispatch(toastLoading(val));
+    const dispatchLoading = (val, text) => {
+        dispatch(text !== undefined ? toastLoading({ loading: val, text }) : toastLoading(val));
     };
     const dispatchError = ({ err, t, key }) => {
         if (!err.response) {
-            const value = t(`${key ?? 'message'}:${err}`);
-            dispatch(message({ value, type: 'error' }));
+            const value = t(`${key ?? "message"}:${err}`);
+            dispatch(message({ value, type: "error" }));
             return;
         }
         if (err.response.status === 403) {
-            dispatch(message({ value: t('error.access.authorization'), type: 'error' }));
+            dispatch(message({ value: t("error.access.authorization"), type: "error" }));
             return;
         }
-        let errorKey = '';
-        if (err.response.data?.description) {
+        let errorKey = "";
+        if (err.response.data?.message) {
+            errorKey = err.response.data.message;
+        }
+        else if (err.response.data?.description) {
             errorKey = err.response.data.description;
         }
         else if (err.response.data?.errors?.length > 0) {
             errorKey = err.response.data.errors[0].description;
         }
         else {
-            key = 'common';
-            errorKey = 'internal.server.error';
+            key = "common";
+            errorKey = "internal.server.error";
         }
-        const value = t(`${key ?? 'message'}:${errorKey}`);
-        dispatch(message({ value, type: 'error' }));
+        const value = t(`${key ?? "message"}:${errorKey}`);
+        dispatch(message({ value, type: "error" }));
     };
     const dispatchMessage = ({ key, ns, t }) => {
         const entry = ns ? `${ns}:${key}` : `message:${key}`;
-        dispatch(message({ value: t(entry), type: 'success' }));
+        dispatch(message({ value: t(entry), type: "success" }));
     };
-    const dispatchMessageDirect = (value, type = 'success') => {
+    const dispatchMessageDirect = (value, type = "success") => {
         dispatch(message({ value, type }));
     };
     return {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "tycho-components",
   "private": false,
-  "version": "0.9.4",
+  "version": "0.10.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
   "exports": {