@applica-software-guru/react-admin 1.4.226 → 1.5.230

package/src/playground/config.jsx

@@ -4,12 +4,14 @@ if (appUrl.endsWith(':3000/') || appUrl.indexOf(':51') !== -1) {
   appUrl = 'http://localhost:8080/';
   environment = 'DEVELOPER';
 }
-export const APP_NAME = 'RApplica';
-export const APP_URL = appUrl;
-export const API_URL = `${APP_URL}api`;
-export const ENVIRONMENT = environment;
+const APP_NAME = 'RApplica';
+const APP_URL = appUrl;
+const API_URL = `${APP_URL}api`;
+const ENVIRONMENT = environment;
 
-export const CONFIGURED_ROLES = [
+const ROLES = [
   { id: 'ROLE_ADMIN', name: 'Admin' },
   { id: 'ROLE_USER', name: 'User' }
 ];
+
+export { API_URL, APP_NAME, APP_URL, ENVIRONMENT, ROLES };

package/src/playground/entities/device.jsx

@@ -1,17 +1,22 @@
+import { DeviceForm, DeviceList } from '@/playground/components';
 import { Create, Edit } from '@applica-software-guru/react-admin';
-import { DeviceForm, DeviceList } from '../components';
-const DeviceCreate = () => (
-  <Create>
-    <DeviceForm />
-  </Create>
-);
-const DeviceEdit = () => (
-  <Edit>
-    <DeviceForm />
-  </Edit>
-);
 
-const config = {
+function DeviceCreate() {
+  return (
+    <Create>
+      <DeviceForm />
+    </Create>
+  );
+}
+function DeviceEdit() {
+  return (
+    <Edit>
+      <DeviceForm />
+    </Edit>
+  );
+}
+
+export const device = {
   list: DeviceList,
   edit: DeviceEdit,
   create: DeviceCreate,
@@ -19,5 +24,3 @@ const config = {
     group: 'control-panel'
   }
 };
-
-export default config;

package/src/playground/entities/i18n-message.jsx

@@ -1,28 +1,28 @@
-import { Create, Edit } from '@applica-software-guru/react-admin';
-import { I18nMessageForm, I18nMessageList } from '../components';
-
+import { I18nMessageForm, I18nMessageList } from '@/playground/components';
 import { FlagOutlined } from '@ant-design/icons';
+import { Create, Edit } from '@applica-software-guru/react-admin';
 
-const MessageCreate = () => (
-  <Create>
-    <I18nMessageForm />
-  </Create>
-);
+function MessageCreate() {
+  return (
+    <Create>
+      <I18nMessageForm />
+    </Create>
+  );
+}
 
-const MessageEdit = () => (
-  <Edit>
-    <I18nMessageForm />
-  </Edit>
-);
+function MessageEdit() {
+  return (
+    <Edit>
+      <I18nMessageForm />
+    </Edit>
+  );
+}
 
-const config = {
+export const i18nMessage = {
   list: I18nMessageList,
   edit: MessageEdit,
   create: MessageCreate,
   options: {
-    group: 'control-panel',
-    icon: FlagOutlined
+    group: 'control-panel'
   }
 };
-
-export default config;

package/src/playground/entities/index.jsx

@@ -1,4 +1,4 @@
-export { default as user } from './user';
-export { default as notification } from './notification';
-export { default as i18nMessage } from './i18n-message';
-export { default as device } from './device';
+export * from './device';
+export * from './i18n-message';
+export * from './notification';
+export * from './user';

package/src/playground/entities/notification.jsx

@@ -1,16 +1,15 @@
 import { NotificationList as BaseNotificationList, List } from '@applica-software-guru/react-admin';
 
-import React from 'react';
-
-const NotificationList = () => (
-  <List>
-    <BaseNotificationList />
-  </List>
-);
-const config = {
+function NotificationList() {
+  return (
+    <List>
+      <BaseNotificationList />
+    </List>
+  );
+}
+export const notification = {
   list: NotificationList,
   options: {
     group: 'dashboard'
   }
 };
-export default config;

package/src/playground/entities/user.jsx

@@ -1,28 +1,27 @@
-import { Create, Edit } from '@applica-software-guru/react-admin';
-import { UserForm, UserList } from '../components';
-
-import { CONFIGURED_ROLES } from '../config';
+import { UserForm, UserList } from '@/playground/components';
+import { ROLES } from '@/playground/config';
 import { UserOutlined } from '@ant-design/icons';
+import { Create, Edit } from '@applica-software-guru/react-admin';
 
-const UserCreate = () => (
-  <Create>
-    <UserForm configuredRoles={CONFIGURED_ROLES} />
-  </Create>
-);
-const UserEdit = () => (
-  <Edit mutationMode="pessimistic">
-    <UserForm configuredRoles={CONFIGURED_ROLES} />
-  </Edit>
-);
-
-const config = {
-  list: <UserList configuredRoles={CONFIGURED_ROLES} />,
+function UserCreate() {
+  return (
+    <Create>
+      <UserForm roles={ROLES} />
+    </Create>
+  );
+}
+function UserEdit() {
+  return (
+    <Edit mutationMode="pessimistic">
+      <UserForm roles={ROLES} />
+    </Edit>
+  );
+}
+export const user = {
+  list: <UserList roles={ROLES} />,
   edit: UserEdit,
   create: UserCreate,
   options: {
-    icon: UserOutlined,
     group: 'control-panel'
   }
 };
-
-export default config;

package/src/playground/index.jsx

@@ -1,6 +1,5 @@
 import App from './App';
 import { createRoot } from 'react-dom/client';
-import reportWebVitals from './reportWebVitals';
 
 const container = document.getElementById('root');
 const root = createRoot(container);

package/src/playground/menu.jsx

@@ -1,6 +1,6 @@
 import { DashboardOutlined, FlagOutlined, NotificationOutlined, TableOutlined, UserOutlined } from '@ant-design/icons';
 
-const config = [
+export const menu = [
   {
     id: 'dashboard',
     title: 'Dashboard AA',
@@ -76,5 +76,3 @@ const config = [
     ]
   }
 ];
-
-export default config;

package/src/playground/theme.jsx

@@ -1,3 +1,5 @@
-const theme = () => ({});
+function theme() {
+  return {};
+}
 
-export default theme;
+export { theme };

package/src/tests/example.test.js

@@ -0,0 +1,11 @@
+import { ApplicaDataProvider } from '@applica-software-guru/crud-client';
+import { describe, expect, test } from 'vitest';
+
+describe('dataProvider', () => {
+  var dataProvider = new ApplicaDataProvider({
+    apiUrl: 'http://baseurl.com'
+  });
+  test('should return an array of objects', () => {
+    expect(dataProvider.getOne).toBeDefined();
+  });
+});

package/src/themes/{getColors.jsx → getColors.ts}

@@ -1,4 +1,6 @@
-const getColors = (theme, color) => {
+import { ThemeProps } from '@/themes/types';
+
+function getColors(theme: ThemeProps, color: 'primary' | 'secondary' | 'error' | 'warning' | 'info' | 'success') {
   switch (color) {
     case 'secondary':
       return theme.palette.secondary;
@@ -13,6 +15,6 @@ const getColors = (theme, color) => {
     default:
       return theme.palette.primary;
   }
-};
+}
 
-export default getColors;
+export { getColors };

package/src/themes/{getShadow.jsx → getShadow.ts}

@@ -1,6 +1,21 @@
-import PropTypes from 'prop-types';
+import { ThemeProps } from '@/themes/types';
 
-const getShadow = (theme, shadow) => {
+function getShadow(
+  theme: ThemeProps,
+  shadow:
+    | 'primary'
+    | 'secondary'
+    | 'error'
+    | 'warning'
+    | 'info'
+    | 'success'
+    | 'primaryButton'
+    | 'secondaryButton'
+    | 'errorButton'
+    | 'warningButton'
+    | 'infoButton'
+    | 'successButton'
+) {
   switch (shadow) {
     case 'secondary':
       return theme.customShadows.secondary;
@@ -27,11 +42,6 @@ const getShadow = (theme, shadow) => {
     default:
       return theme.customShadows.primary;
   }
-};
+}
 
-getShadow.propTypes = {
-  theme: PropTypes.object,
-  shadow: PropTypes.string
-};
-
-export default getShadow;
+export { getShadow };

package/src/themes/{index.jsx → index.tsx}

@@ -1,26 +1,27 @@
-import _ from 'lodash';
+import { getColors } from './getColors';
+import { getShadow } from './getShadow';
+import { ComponentsOverrides } from './overrides';
+import { Palette } from './palette';
+import { CustomShadows } from './shadows';
+import { Typography } from './typography';
+import { useThemeConfig } from '@/components/Layout/ThemeProvider';
+import { ThemeProps } from '@/themes/types';
 import { CssBaseline, StyledEngineProvider } from '@mui/material';
 import { ThemeProvider, createTheme } from '@mui/material/styles';
+import _ from 'lodash';
+import { PropsWithChildren, useMemo } from 'react';
 
-import CustomShadows from './shadows';
-import Palette from './palette';
-import PropTypes from 'prop-types';
-import Typography from './typography';
-import componentsOverride from './overrides';
-import getColors from './getColors';
-import getShadow from './getShadow';
-import { useMemo } from 'react';
-import { useThemeConfig } from '../hooks';
+type ThemeCustomizationProps = PropsWithChildren<{ themeOverrides: unknown }>;
 
-const ThemeCustomization = ({ themeOverrides, children }) => {
-  const _themeConfig = useThemeConfig(1);
+function ThemeCustomization({ themeOverrides, children }: ThemeCustomizationProps) {
+  const _themeConfig = useThemeConfig();
   const { themeDirection, mode, presetColor, fontFamily } = _themeConfig;
 
   const theme = useMemo(() => Palette(mode, presetColor), [mode, presetColor]);
 
   // eslint-disable-next-line react-hooks/exhaustive-deps
   const themeTypography = useMemo(() => Typography(fontFamily), [fontFamily]);
-  const themeCustomShadows = useMemo(() => CustomShadows(theme), [theme]);
+  const themeCustomShadows = useMemo(() => CustomShadows(theme as ThemeProps), [theme]);
 
   const themeOptions = useMemo(
     () =>
@@ -64,10 +65,10 @@ const ThemeCustomization = ({ themeOverrides, children }) => {
     [themeDirection, theme, themeTypography, themeCustomShadows, themeOverrides]
   );
 
-  const themes = createTheme(themeOptions),
-    currentComponents = _.cloneDeep(themes.components ?? {});
+  const themes = createTheme(themeOptions);
+  const currentComponents = _.cloneDeep(themes.components ?? {});
 
-  themes.components = _.merge(componentsOverride(themes), currentComponents);
+  themes.components = _.merge(ComponentsOverrides(themes), currentComponents);
 
   return (
     <StyledEngineProvider injectFirst>
@@ -77,11 +78,6 @@ const ThemeCustomization = ({ themeOverrides, children }) => {
       </ThemeProvider>
     </StyledEngineProvider>
   );
-};
-
-ThemeCustomization.propTypes = {
-  children: PropTypes.node,
-  themeOverrides: PropTypes.oneOfType([PropTypes.object, PropTypes.func])
-};
+}
 
 export { ThemeCustomization, getColors as getThemeColor, getShadow as getThemeShadow };

package/src/themes/overrides/{Accordion.jsx → Accordion.ts}

@@ -1,6 +1,4 @@
-// ==============================|| OVERRIDES - ALERT TITLE ||============================== //
-
-export default function Accordion(theme) {
+function Accordion(theme: any): any {
   return {
     MuiAccordion: {
       defaultProps: {
@@ -25,3 +23,5 @@ export default function Accordion(theme) {
     }
   };
 }
+
+export { Accordion };

package/src/themes/overrides/{AccordionDetails.jsx → AccordionDetails.ts}

@@ -1,6 +1,4 @@
-// ==============================|| OVERRIDES - ALERT TITLE ||============================== //
-
-export default function AccordionDetails(theme) {
+function AccordionDetails(theme: any): any {
   return {
     MuiAccordionDetails: {
       styleOverrides: {
@@ -12,3 +10,5 @@ export default function AccordionDetails(theme) {
     }
   };
 }
+
+export { AccordionDetails };

package/src/themes/overrides/{AccordionSummary.jsx → AccordionSummary.tsx}

@@ -1,9 +1,6 @@
-// assets
 import { RightOutlined } from '@ant-design/icons';
 
-// ==============================|| OVERRIDES - ALERT TITLE ||============================== //
-
-export default function AccordionSummary(theme) {
+function AccordionSummary(theme: any): any {
   const { palette, spacing } = theme;
 
   return {
@@ -31,3 +28,5 @@ export default function AccordionSummary(theme) {
     }
   };
 }
+
+export { AccordionSummary };

package/src/themes/overrides/{Alert.jsx → Alert.ts}

@@ -1,10 +1,15 @@
+import { getColors } from '@/themes/getColors';
 import { alpha } from '@mui/material/styles';
-import getColors from '../getColors';
 
-// ==============================|| ALERT - COLORS ||============================== //
-
-function getColorStyle({ color, theme }) {
+function getColorStyle({
+  color,
+  theme
+}: {
+  color: 'primary' | 'secondary' | 'error' | 'warning' | 'info' | 'success';
+  theme: any;
+}): any {
   const colors = getColors(theme, color);
+  // @ts-ignore
   const { lighter, light, main } = colors;
 
   return {
@@ -16,9 +21,7 @@ function getColorStyle({ color, theme }) {
   };
 }
 
-// ==============================|| OVERRIDES - ALERT ||============================== //
-
-export default function Alert(theme) {
+function Alert(theme: any): any {
   const primaryDashed = getColorStyle({ color: 'primary', theme });
 
   return {
@@ -70,3 +73,5 @@ export default function Alert(theme) {
     }
   };
 }
+
+export { Alert };

package/src/themes/overrides/{AlertTitle.jsx → AlertTitle.ts}

@@ -1,6 +1,4 @@
-// ==============================|| OVERRIDES - ALERT TITLE ||============================== //
-
-export default function AlertTitle() {
+function AlertTitle(): any {
   return {
     MuiAlertTitle: {
       styleOverrides: {
@@ -13,3 +11,5 @@ export default function AlertTitle() {
     }
   };
 }
+
+export { AlertTitle };

package/src/themes/overrides/{Autocomplete.jsx → Autocomplete.ts}

@@ -1,6 +1,4 @@
-// ==============================|| OVERRIDES - AUTOCOMPLETE ||============================== //
-
-export default function Autocomplete(theme) {
+function Autocomplete(theme: any): any {
   return {
     MuiAutocomplete: {
       styleOverrides: {
@@ -24,3 +22,5 @@ export default function Autocomplete(theme) {
     }
   };
 }
+
+export { Autocomplete };

package/src/themes/overrides/{Badge.jsx → Badge.ts}

@@ -1,7 +1,14 @@
-import getColors from '../getColors';
+import { getColors } from '@/themes/getColors';
 
-function getColorStyle({ color, theme }) {
+function getColorStyle({
+  color,
+  theme
+}: {
+  color: 'primary' | 'secondary' | 'error' | 'warning' | 'info' | 'success';
+  theme: any;
+}): any {
   const colors = getColors(theme, color);
+  // @ts-ignore
   const { lighter, main } = colors;
 
   return {
@@ -10,7 +17,7 @@ function getColorStyle({ color, theme }) {
   };
 }
 
-export default function Badge(theme) {
+function Badge(theme: any): any {
   const defaultLightBadge = getColorStyle({ color: 'primary', theme });
 
   return {
@@ -34,3 +41,5 @@ export default function Badge(theme) {
     }
   };
 }
+
+export { Badge };

package/src/themes/overrides/{Button.jsx → Button.ts}

@@ -1,13 +1,22 @@
+import { getColors } from '@/themes/getColors';
+import { getShadow } from '@/themes/getShadow';
 import { alpha } from '@mui/material/styles';
-import getColors from '../getColors';
-import getShadow from '../getShadow';
 
-function getColorStyle({ variant, color, theme }) {
+function getColorStyle({
+  variant,
+  color,
+  theme
+}: {
+  variant: 'contained' | 'shadow' | 'outlined' | 'dashed' | 'text';
+  color: 'primary' | 'secondary' | 'error' | 'warning' | 'info' | 'success';
+  theme: any;
+}): any {
   const colors = getColors(theme, color);
+  // @ts-ignore
   const { lighter, main, dark, contrastText } = colors;
 
   const buttonShadow = `${color}Button`;
-  const shadows = getShadow(theme, buttonShadow);
+  const shadows = getShadow(theme, buttonShadow as any);
 
   const commonShadow = {
     '&::after': {
@@ -74,9 +83,7 @@ function getColorStyle({ variant, color, theme }) {
   }
 }
 
-// ==============================|| OVERRIDES - BUTTON ||============================== //
-
-export default function Button(theme) {
+function Button(theme: any): any {
   const primaryDashed = getColorStyle({ variant: 'dashed', color: 'primary', theme });
   const primaryShadow = getColorStyle({ variant: 'shadow', color: 'primary', theme });
 
@@ -227,3 +234,5 @@ export default function Button(theme) {
     }
   };
 }
+
+export { Button };

package/src/themes/overrides/ButtonBase.ts

@@ -0,0 +1,12 @@
+function ButtonBase(): any {
+  return {
+    MuiButtonBase: {
+      defaultProps: {
+        disableRipple: true,
+        size: 'medium'
+      }
+    }
+  };
+}
+
+export { ButtonBase };

package/src/themes/overrides/ButtonGroup.ts

@@ -0,0 +1,11 @@
+function ButtonGroup(): any {
+  return {
+    MuiButtonGroup: {
+      defaultProps: {
+        disableRipple: true
+      }
+    }
+  };
+}
+
+export { ButtonGroup };

package/src/themes/overrides/{CardContent.jsx → CardContent.ts}

@@ -1,6 +1,4 @@
-// ==============================|| OVERRIDES - CARD CONTENT ||============================== //
-
-export default function CardContent() {
+function CardContent(): any {
   return {
     MuiCardContent: {
       styleOverrides: {
@@ -14,3 +12,5 @@ export default function CardContent() {
     }
   };
 }
+
+export { CardContent };

package/src/themes/overrides/{Checkbox.jsx → Checkbox.tsx}

@@ -1,10 +1,16 @@
+import { getColors } from '@/themes/getColors';
 import { CheckSquareFilled, MinusSquareFilled } from '@ant-design/icons';
-
 import { Box } from '@mui/material';
-import getColors from '../getColors';
 
-function getColorStyle({ color, theme }) {
+function getColorStyle({
+  color,
+  theme
+}: {
+  color: 'primary' | 'secondary' | 'error' | 'warning' | 'info' | 'success';
+  theme: any;
+}): any {
   const colors = getColors(theme, color);
+  // @ts-ignore
   const { lighter, main, dark } = colors;
 
   return {
@@ -21,7 +27,7 @@ function getColorStyle({ color, theme }) {
   };
 }
 
-function getSizeStyle(size) {
+function getSizeStyle(size: 'small' | 'medium' | 'large'): any {
   switch (size) {
     case 'small':
       return { size: 16, fontSize: 1, position: 1 };
@@ -33,7 +39,7 @@ function getSizeStyle(size) {
   }
 }
 
-function checkboxStyle(size) {
+function checkboxStyle(size: 'small' | 'medium' | 'large'): any {
   const sizes = getSizeStyle(size);
 
   return {
@@ -49,7 +55,7 @@ function checkboxStyle(size) {
   };
 }
 
-export default function Checkbox(theme) {
+function Checkbox(theme: any): any {
   const { palette } = theme;
 
   return {
@@ -123,3 +129,5 @@ export default function Checkbox(theme) {
     }
   };
 }
+
+export { Checkbox };