@dashadmin/dash-admin 1.3.73 → 1.3.74-srcfree.1

package/src/templates/ResourceTemplate.tsx.original

@@ -1,396 +0,0 @@
-/* eslint-disable no-mixed-spaces-and-tabs */
-import { Resource } from 'react-admin';
-import { CustomRoutes } from 'react-admin/src';
-import { Route, useParams } from 'react-router-dom';
-//import { Outlet } from 'react-router';
-import {
-    IDashAutoAdminResourceConfig,
-    evalActionPermission,
-} from 'dash-auto-admin';
-import React, { PropsWithChildren, useMemo } from 'react';
-import MotionWrapper from '../layout/MotionWrapper';
-import Redirect from '../components/Redirect';
-import { ResourceTemplateCreate } from './ResourceTemplateCreate';
-import { ResourceTemplateEdit } from './ResourceTemplateEdit';
-import { ResourceTemplateList } from './ResourceTemplateList';
-import { ResourceTemplateShow } from './ResourceTemplateShow';
-import {DASHAdminSystemConstants} from '../config/DASHAdminSystemConstants';
-import TrashTemplate from './TrashTemplate';
-import { DashResourceProvider } from '../contexts/DashResourceContext';
-
-export interface IResourceTemplate {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}
-
-// Memoized Redirect component wrapper
-const MemoizedRedirect = React.memo(({
-    stateHashPattern,
-    method,
-    drawerMethod,
-    resourceConfig
-}: {
-    stateHashPattern: string;
-    method: string;
-    drawerMethod: string;
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <Redirect
-            stateHashPattern={stateHashPattern}
-            method={method}
-            drawerMethod={drawerMethod}
-            resourceConfig={resourceConfig}
-        />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return (
-        prevProps.stateHashPattern === nextProps.stateHashPattern &&
-        prevProps.method === nextProps.method &&
-        prevProps.drawerMethod === nextProps.drawerMethod &&
-        prevProps.resourceConfig === nextProps.resourceConfig
-    );
-});
-
-// Memoized template component wrappers
-const MemoizedTrashTemplate = React.memo(({
-    resourceConfig
-}: {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <TrashTemplate resourceConfig={resourceConfig} />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return prevProps.resourceConfig === nextProps.resourceConfig;
-});
-
-const MemoizedResourceTemplateList = React.memo(({
-    resourceConfig
-}: {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <ResourceTemplateList resourceConfig={resourceConfig} />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return prevProps.resourceConfig === nextProps.resourceConfig;
-});
-
-const MemoizedResourceTemplateCreate = React.memo(({
-    resourceConfig
-}: {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <ResourceTemplateCreate resourceConfig={resourceConfig} />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return prevProps.resourceConfig === nextProps.resourceConfig;
-});
-
-const MemoizedResourceTemplateShow = React.memo(({
-    resourceConfig
-}: {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <ResourceTemplateShow resourceConfig={resourceConfig} />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return prevProps.resourceConfig === nextProps.resourceConfig;
-});
-
-const MemoizedResourceTemplateEdit = React.memo(({
-    resourceConfig
-}: {
-    resourceConfig: IDashAutoAdminResourceConfig;
-}) => (
-    <DashResourceProvider resourceConfig={resourceConfig}>
-        <ResourceTemplateEdit resourceConfig={resourceConfig} />
-    </DashResourceProvider>
-), (prevProps, nextProps) => {
-    return prevProps.resourceConfig === nextProps.resourceConfig;
-});
-
-// Main ResourceTemplate component with memoization
-const ResourceTemplateComponent = (resourceConfig: IDashAutoAdminResourceConfig) => {
-    const debug = false;
-
-    // Memoize permission evaluations
-    const permissions = useMemo(() => {
-        const _create = evalActionPermission(resourceConfig, resourceConfig?.create);
-        const _edit = evalActionPermission(resourceConfig, resourceConfig?.edit);
-        const _view = evalActionPermission(resourceConfig, resourceConfig?.view);
-        const _list = evalActionPermission(resourceConfig, resourceConfig?.list);
-        const _delete = evalActionPermission(resourceConfig, resourceConfig?.delete);
-
-        return { _create, _edit, _view, _list, _delete };
-    }, [
-        resourceConfig,
-        resourceConfig?.create,
-        resourceConfig?.edit,
-        resourceConfig?.view,
-        resourceConfig?.list,
-        resourceConfig?.delete
-    ]);
-
-    const { _create, _edit, _view, _list, _delete } = permissions;
-
-    // Memoize constants
-    const constants = useMemo(() => {
-        const idParamName = resourceConfig?.idParamName || 'id';
-        const URL_PREFIX = DASHAdminSystemConstants.system.URL_PREFIX;
-        
-        return { idParamName, URL_PREFIX };
-    }, [resourceConfig?.idParamName]);
-
-    const { idParamName, URL_PREFIX } = constants;
-
-    // Memoize debug logging
-    useMemo(() => {
-        if (debug) {
-            console.info(`${resourceConfig.model} ResourceTemplate`, {
-                resourceConfig: resourceConfig,
-                evaluatedPermissions: permissions,
-            });
-        }
-    }, [debug, resourceConfig.model, resourceConfig, permissions]);
-
-    // Memoize drawer routes
-    const drawerRoutes = useMemo(() => {
-        if (!resourceConfig?.drawer) return [];
-
-        const routes = [];
-
-        // Create route
-        if (resourceConfig?.drawerOptions?.create !== false) {
-            routes.push(
-                <Route
-                    key="drawer-create-1"
-                    path={URL_PREFIX + resourceConfig.model + '/create'}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={URL_PREFIX + resourceConfig.model + '/inline/create'}
-                            method='list'
-                            drawerMethod='create'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-
-            routes.push(
-                <Route
-                    key="drawer-create-2"
-                    path={URL_PREFIX + resourceConfig.model + '/inline/create'}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={URL_PREFIX + resourceConfig.model + '/inline/create'}
-                            method='list'
-                            drawerMethod='create'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-        }
-
-        // Edit route
-        if (resourceConfig?.drawerOptions?.edit !== false) {
-            routes.push(
-                <Route
-                    key="drawer-edit-1"
-                    path={URL_PREFIX + resourceConfig.model + '/inline'}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={URL_PREFIX + resourceConfig.model + '/inline'}
-                            method='list'
-                            drawerMethod='edit'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-
-            routes.push(
-                <Route
-                    key="drawer-edit-2"
-                    path={URL_PREFIX + resourceConfig.model + '/inline/:' + idParamName + '/edit'}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={
-                                URL_PREFIX +
-                                resourceConfig.model +
-                                '/inline/:' +
-                                idParamName +
-                                '/:method'
-                            }
-                            method='list'
-                            drawerMethod='edit'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-        }
-
-        // View routes
-        if (resourceConfig?.drawerOptions?.view !== false) {
-            routes.push(
-                <Route
-                    key="drawer-view-1"
-                    path={URL_PREFIX + resourceConfig.model + '/inline/:' + idParamName}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={
-                                URL_PREFIX +
-                                resourceConfig.model +
-                                '/inline/:' +
-                                idParamName +
-                                '/:method'
-                            }
-                            method='list'
-                            drawerMethod='edit'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-
-            routes.push(
-                <Route
-                    key="drawer-view-2"
-                    path={URL_PREFIX + resourceConfig.model + '/inline/:' + idParamName + '/show'}
-                    element={
-                        <MemoizedRedirect
-                            stateHashPattern={
-                                URL_PREFIX +
-                                resourceConfig.model +
-                                '/inline/:' +
-                                idParamName +
-                                '/:method'
-                            }
-                            method='list'
-                            drawerMethod='show'
-                            resourceConfig={resourceConfig}
-                        />
-                    }
-                />
-            );
-        }
-
-        return routes;
-    }, [
-        resourceConfig?.drawer,
-        resourceConfig?.drawerOptions,
-        resourceConfig.model,
-        URL_PREFIX,
-        idParamName,
-        resourceConfig
-    ]);
-
-    // Memoize custom routes
-    const customRoutes = useMemo(() => {
-        return typeof resourceConfig.customRoutes === 'function' 
-            ? resourceConfig.customRoutes(resourceConfig) 
-            : <></>;
-    }, [resourceConfig, resourceConfig.customRoutes]);
-
-    // Memoize main routes
-    const mainRoutes = useMemo(() => {
-        const routes = [];
-
-        routes.push(
-            <Route 
-                key="trash" 
-                path="trash/*" 
-                element={<MemoizedTrashTemplate resourceConfig={resourceConfig} />} 
-            />
-        );
-
-        if (_list) {
-            routes.push(
-                <Route 
-                    key="list" 
-                    path={`/*`} 
-                    element={<MemoizedResourceTemplateList resourceConfig={resourceConfig} />} 
-                />
-            );
-        }
-
-        if (_create) {
-            routes.push(
-                <Route 
-                    key="create" 
-                    path={`create/*`} 
-                    element={<MemoizedResourceTemplateCreate resourceConfig={resourceConfig} />} 
-                />
-            );
-        }
-
-        if (_view) {
-            routes.push(
-                <Route 
-                    key="show" 
-                    path={`:id/show/*`} 
-                    element={<MemoizedResourceTemplateShow resourceConfig={resourceConfig} />} 
-                />
-            );
-        }
-
-        if (_edit) {
-            routes.push(
-                <Route 
-                    key="edit" 
-                    path={`:id/*`} 
-                    element={<MemoizedResourceTemplateEdit resourceConfig={resourceConfig} />} 
-                />
-            );
-        }
-
-        return routes;
-    }, [_list, _create, _view, _edit, resourceConfig]);
-
-    return (
-        <>
-            <CustomRoutes>
-                <Route element={<MotionWrapper />}>
-                    {customRoutes}
-                    {drawerRoutes}
-                </Route>
-            </CustomRoutes>
-
-            <Resource
-                options={{ label: resourceConfig.label, group: resourceConfig.group }}
-                name={resourceConfig.model}
-                recordRepresentation={resourceConfig?.recordRepresentation || "name"}
-                resourceConfig={resourceConfig}
-                // @ts-ignore Expected mismatch types, nevertheless compatible 
-                icon={resourceConfig?.icon || <></>}
-            >
-                {mainRoutes}
-            </Resource>
-        </>
-    );
-};
-
-// Memoize the entire ResourceTemplate function
-export const ResourceTemplate = React.memo(
-    ResourceTemplateComponent,
-    (prevResourceConfig, nextResourceConfig) => {
-        const isEqual = prevResourceConfig === nextResourceConfig;
-        
-        // Debug logging
-        if (!isEqual) {
-            console.log('ResourceTemplate re-rendering - resourceConfig changed:', {
-                prevModel: prevResourceConfig?.model,
-                nextModel: nextResourceConfig?.model,
-                same: prevResourceConfig === nextResourceConfig
-            });
-        }
-        
-        return isEqual;
-    }
-);
-
-export default ResourceTemplate;

package/src/templates/ResourceTemplateCreate.tsx

@@ -1,182 +0,0 @@
-/* eslint-disable no-mixed-spaces-and-tabs */
-
-import { useNotify, useTranslate } from 'react-admin';
-import { useRedirect } from 'react-admin';
-import { useRefresh } from 'react-admin';
-import { FC } from 'react';
-import { SimpleForm } from 'react-admin';
-import { Create } from 'react-admin';
-import {
-	DashAutoDrawer,
-	DashAutoCreate,
-} from 'dash-auto-admin';
-import { useDialog } from 'dash-dialog';
-import React from 'react';
-import ResourceLayout from '../layout/ResoureLayout';
-import { IResourceTemplate } from './ResourceTemplate';
-import { parseAxiosError } from '../helpers/parseAxiosError';
-import { useDashResource } from '../contexts/DashResourceContext';
-
-export const ResourceTemplateCreate: FC<IResourceTemplate> = (props) => {
-	//const {resourceConfig} = useDashResource()};
-    const {resourceConfig, locale} = props;
-	const notify = useNotify();
-	const translate = useTranslate();
-	const redirect = useRedirect();
-	const refresh = useRefresh();
-	//console.log("CREATE", resourceConfig)
-	const dialog = useDialog();
-
-	const _showNotifyAfterSubmit =
-		resourceConfig?.showNotifyAfterSubmit === false ? false : true;
-	const _showDialogAfterSubmit =
-		resourceConfig?.showDialogAfterSubmit === false ? false : true;
-
-	// @deprecated - removed currentAppPath logic that caused path duplication
-	const getRedirectPath = (path: string) => {
-		return `/${path}`.replace(/\/+/g, '/');
-	};
-
-	const onCreate = (data: any) => {
-
-		const translatedLabel = translate(resourceConfig.label, { _: resourceConfig.label });
-
-		if (_showNotifyAfterSubmit) {
-			notify('dash.resource.created', { type: 'success' });
-		}
-		if (_showDialogAfterSubmit) {
-			// A resource may override the success dialog to surface values the
-			// API returns exactly once (e.g. a generated secret that is never
-			// recoverable afterwards).
-			const successOverride = resourceConfig?.createSuccessDialog?.(data);
-
-			// A string title is treated as a translation key (with itself as
-			// fallback), matching how labels and menu titles behave elsewhere.
-			// JSX titles are rendered as-is.
-			const overrideTitle =
-				typeof successOverride?.title === 'string'
-					? translate(successOverride.title, { _: successOverride.title })
-					: successOverride?.title;
-
-			dialog({
-				variant: 'info',
-				title: overrideTitle ?? translate('dash.resource.created'),
-				content:
-					successOverride?.content ??
-					translate('dash.resource.created_message', { label: translatedLabel }),
-				onConfirm: () => {
-					switch (resourceConfig?.redirectAfterCreate) {
-						case false:
-							return;
-						case 'create':
-							redirect(getRedirectPath(`${resourceConfig.model}/create`));
-							break;
-						case 'view':
-							redirect(getRedirectPath(`${resourceConfig.model}/${data.id}/show`));
-							break;
-						case 'edit':
-							redirect(getRedirectPath(`${resourceConfig.model}/${data.id}`));
-							break;
-						case 'list':
-						default:
-							redirect(getRedirectPath(resourceConfig.model));
-							break;
-					}
-				},
-				onClose: () => {},
-			});
-		}
-
-		if (!_showDialogAfterSubmit && resourceConfig.redirectAfterCreate) {
-			switch (resourceConfig?.redirectAfterCreate) {
-				case 'create':
-					redirect(getRedirectPath(`${resourceConfig.model}/create`));
-					break;
-				case 'view':
-					redirect(getRedirectPath(`${resourceConfig.model}/${data.id}/show`));
-					break;
-				case 'edit':
-					redirect(getRedirectPath(`${resourceConfig.model}/${data.id}`));
-					break;
-				case 'list':
-				default:
-					redirect(getRedirectPath(resourceConfig.model));
-					break;
-			}
-		}
-
-		if (resourceConfig?.refreshAfter !== false) {
-			refresh();
-		}
-	};
-
-    const onError = (_error: any) => {
-        
-		if (resourceConfig.onError) {
-			resourceConfig.onError('create', _error);
-            return;
-		} 
-
-        const translatedLabel = translate(resourceConfig.label, { _: resourceConfig.label });
-
-        dialog({
-            variant: 'danger',
-            title: translate('dash.resource.error', { label: translatedLabel }),
-            content: `${parseAxiosError(_error)}`,
-            onConfirm: () => {},
-            onClose: () => {},
-        });
-
-	};
-	const onBeforeSubmit = (values: any) => {
-		return resourceConfig.beforeSubmit
-			? resourceConfig.beforeSubmit(values)
-			: values;
-	};
-
-	/*const ToolBar = () => (
-		<Toolbar>
-			<DashAutoAdminSaveButton
-				resourceConfig={resourceConfig}
-				onSubmit={onCreate}
-			/>
-		</Toolbar>
-	);*/
-
-	return resourceConfig.createComponent ? (
-		<ResourceLayout resourceConfig={resourceConfig} locale={locale}>
-			<Create>
-				<SimpleForm>
-					{resourceConfig.createComponent(resourceConfig)}
-				</SimpleForm>
-			</Create>
-			{resourceConfig.drawer && (
-				<DashAutoDrawer
-					resourceConfig={resourceConfig}
-					{...(resourceConfig.drawerProps && {
-						...resourceConfig.drawerProps,
-					})}
-				/>
-			)}
-		</ResourceLayout>
-	) : (
-		<ResourceLayout resourceConfig={resourceConfig} locale={locale}>
-			<DashAutoCreate
-				//toolbar={<ToolBar />}
-				onError={onError}
-				onSubmit={onCreate}
-				beforeSubmit={onBeforeSubmit}
-				resourceConfig={resourceConfig}
-				locale={locale}
-			/>
-			{resourceConfig.drawer && (
-				<DashAutoDrawer
-					resourceConfig={resourceConfig}
-					{...(resourceConfig.drawerProps && {
-						...resourceConfig.drawerProps,
-					})}
-				/>
-			)}
-		</ResourceLayout>
-	);
-};