@applica-software-guru/react-admin 1.3.129 → 1.3.131

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applica-software-guru/react-admin",
-  "version": "1.3.129",
+  "version": "1.3.131",
   "private": false,
   "repository": {
     "type": "git",

package/src/ApplicaAdmin.tsx

@@ -163,7 +163,7 @@ const ApplicaAdmin = ({
   useErrorEventCatcher({
     apiUrl,
     errorHandler,
-    catcherFn: (error: any): CatchResult => {
+    catcherFn: (error: ErrorEvent | string): CatchResult => {
       const errorMessage = error?.toString();
       const knownErrors = [
         // @see https://github.com/marmelab/react-admin/pull/8884
@@ -177,7 +177,7 @@ const ApplicaAdmin = ({
         catch: isKnowBug,
         display: !isKnowBug,
         log: !isKnowBug,
-        error
+        error: errorMessage
       });
       return result;
     }

package/src/components/ra-forms/LongForm/NavMenu.tsx

@@ -3,7 +3,7 @@ import { Avatar } from '../../@extended';
 import { Card, Collapse, List, ListItem, ListItemProps, ListItemIcon, ListItemText, ListItemButton, ListItemAvatar } from '@mui/material';
 import { useSetActiveItem, useSyncWithLocation } from './Provider';
 import { IItem } from './types';
-import { useCallback, useMemo, useState } from 'react';
+import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useChildren, useIsActive, useNavigateForm } from './hooks';
 import { ExpandLess, ExpandMore } from '@mui/icons-material';
 import { getLevel } from './utils';
@@ -57,6 +57,12 @@ function NavMenuItem(props: INavMenuItemProps) {
     hasIcon = icon !== undefined,
     listItemProps = _.omit(props, ['label', 'icon', 'selected', 'badge']);
 
+  useEffect(() => {
+    if (selected && !open) {
+      setOpen(selected);
+    }
+  }, [selected, open, setOpen]);
+
   return (
     <>
       <ListItem {...listItemProps} disablePadding>

package/src/components/ra-forms/LongForm/Provider.tsx

@@ -61,18 +61,15 @@ function reducer(state: IState, action: IAction): IState {
     case ActionType.SET_ACTIVE_ITEM:
       return _.includes(getItemsIds(state.items), payload) ? _.extend(newState, { activeItem: payload }) : newState;
     case ActionType.ADD_ITEM: {
-      const id = payload.id,
-        items = _.chain(newState.items)
+      const { id } = payload;
+      return _.extend(newState, {
+        items: _.chain(newState.items)
           .clone()
           .reject((item: IItem) => item.id === id)
           .concat([payload])
           .orderBy((item) => item.index)
-          .value();
-      _.extend(newState, { items: items });
-      if (newState.activeItem === undefined) {
-        _.extend(newState, { activeItem: payload.id });
-      }
-      return newState;
+          .value()
+      });
     }
     case ActionType.REMOVE_ITEM: {
       const id = _.isString(payload) ? payload : payload.id,

package/src/components/ra-forms/LongForm/hooks.tsx

@@ -6,7 +6,11 @@ import { useNavigate } from 'react-router';
 
 function useIsActive(id: string): boolean {
   const activeItem = useActiveItem();
-  return id === activeItem || isChild(id, activeItem ?? '');
+  if (activeItem === undefined) {
+    return false;
+  } else {
+    return id === activeItem || isChild(id, activeItem);
+  }
 }
 
 function useChildren(id?: string): Array<IItem> {

package/src/dev/useErrorEventCatcher.ts

@@ -26,23 +26,34 @@ const useErrorEventCatcher = ({
     }
     return new ErrorEventHandler({ apiUrl });
   }, [apiUrl, props.errorHandler]);
+  const consoleError = console.error;
   const handleError = React.useCallback(
-    function (event: ErrorEvent) {
-      const catchResult = catcherFn(event);
-
+    function (event: ErrorEvent | string, ...args: any[]) {
+      const catchResult = catcherFn(event instanceof ErrorEvent ? event : event.replace(/%s/g, () => args.shift()));
+      if (catchResult.isCatched()) {
+        return false;
+      }
       if (catchResult.logError()) {
-        errorHandler.handle(event);
+        if (event instanceof ErrorEvent) {
+          errorHandler.handle(event);
+        } else {
+          errorHandler.handle(new ErrorEvent('window.onerror', { error: event, message: event.toString() }));
+        }
       }
 
-      return !catchResult.isCatched() || catchResult.displayError();
+      if (catchResult.displayError()) {
+        consoleError.apply(console, arguments as any);
+      }
     },
     [apiUrl, loading, catcherFn, enabled, errorHandler]
   );
   React.useEffect(() => {
     window.removeEventListener('error', handleError);
     window.addEventListener('error', handleError);
+    console.error = handleError;
     return () => {
       window.removeEventListener('error', handleError);
+      console.error = consoleError;
     };
   }, [handleError]);
   return true;

package/src/i18n/createI18nProvider.tsx

@@ -36,10 +36,6 @@ function createI18nProvider(data: ICreateI18nProviderData): Promise<any> {
     getLanguages = (): Promise<Locale> => {
       return fetch(`${apiUrl}/i18n/languages`, { headers: headers, method: 'get' })
         .then((response) => response.json())
-        .then((response) => {
-          const { responseCode, locales } = response;
-          return responseCode !== 'ok' ? defaultLanguages : locales;
-        })
         .catch(() => {
           return Promise.resolve(defaultLanguages);
         });