@applica-software-guru/react-admin 1.5.258 → 1.5.260

package/package.json

@@ -115,5 +115,5 @@
   "type": "module",
   "types": "dist/index.d.ts",
   "typings": "dist/index.d.ts",
-  "version": "1.5.258"
+  "version": "1.5.260"
 }

package/src/components/ra-buttons/CreateInDialogButton.tsx

@@ -2,7 +2,7 @@ import { Button as RaButton } from './Button';
 import { Toolbar } from '@/components/ra-forms';
 import { PlusCircleOutlined } from '@ant-design/icons';
 import { Breakpoint, Button, Dialog, DialogContent } from '@mui/material';
-import { CreateBase, UseCreateMutateParams, useResourceContext, useTranslate } from 'ra-core';
+import { CreateBase, UseCreateMutateParams, useNotify, useResourceContext, useTranslate } from 'ra-core';
 import { ButtonProps, CreateButton, CreateButtonProps, CreateProps, SaveButton } from 'ra-ui-materialui';
 import React, { Children, PropsWithChildren, useCallback, useState } from 'react';
 import { FieldValues, useFormContext } from 'react-hook-form';
@@ -117,6 +117,7 @@ function CreateInDialogButton(props: CreateInDialogButtonProps) {
   const translate = useTranslate();
   const Child = Children.only(children);
   const [open, setOpen] = useState(false);
+  const notify = useNotify();
   const handleOpen = useCallback(() => setOpen(true), []);
   const handleClose = useCallback(() => setOpen(false), []);
   const handleSuccess = useCallback(
@@ -135,9 +136,10 @@ function CreateInDialogButton(props: CreateInDialogButtonProps) {
         updatedAt
       });
       handleClose();
+      notify('ra.notification.created', { messageArgs: { smart_count: 1 } });
       props?.mutationOptions?.onSuccess?.(data, params, context);
     },
-    [handleClose, props.mutationOptions, queryClient, resource]
+    [handleClose, notify, props.mutationOptions, queryClient, resource]
   );
 
   return (

package/src/components/ra-buttons/EditInDialogButton.tsx

@@ -1,7 +1,7 @@
 import { Button } from './Button';
 import { Toolbar } from '@/components/ra-forms';
 import { Breakpoint, Dialog, DialogContent } from '@mui/material';
-import { EditBase, UseUpdateMutateParams, useRecordContext } from 'ra-core';
+import { EditBase, UseUpdateMutateParams, useNotify, useRecordContext } from 'ra-core';
 import { EditButton, EditProps, SaveButton } from 'ra-ui-materialui';
 import React, { Children, PropsWithChildren, useCallback, useState } from 'react';
 import { FieldValues, useFormContext } from 'react-hook-form';
@@ -86,6 +86,7 @@ function EditInDialogButton(props: EditInDialogButtonProps): JSX.Element {
     scroll = 'paper',
     ...rest
   } = props;
+  const notify = useNotify();
   const [open, setOpen] = useState(false);
   const Child = Children.only(children);
   const handleOpen = useCallback(() => setOpen(true), []);
@@ -93,9 +94,13 @@ function EditInDialogButton(props: EditInDialogButtonProps): JSX.Element {
   const handleSuccess = useCallback(
     (data: any, params: UseUpdateMutateParams<any>, context: unknown) => {
       handleClose();
+      notify('ra.notification.updated', {
+        messageArgs: { smart_count: 1 },
+        undoable: props?.mutationMode === 'undoable'
+      });
       props?.mutationOptions?.onSuccess?.(data, params, context);
     },
-    [handleClose, props.mutationOptions]
+    [handleClose, notify, props.mutationOptions, props.mutationMode]
   );
   const record = useRecordContext();
   return (

package/src/components/ra-fields/AttachmentField.tsx

@@ -26,7 +26,7 @@ function AttachmentField({
       const entity = _resource || resource.replace('entities/', '');
       const entityId = _entityId || record?.id;
       const attachment = await dataProvider.getFile(
-        `/attachments/${entity}/${entityId || record?.id}/${property || props?.source}/${item?.id || record?.id}`
+        `/attachments/${entity}/${entityId}/${property || props?.source}/${item?.id || record?.id}`
       );
       const link = document.createElement('a');
       link.href = attachment;
@@ -92,8 +92,8 @@ type AttachmentFieldProps = BaseAttachmentFieldProps & {
    */
   showUser?: boolean;
   /**
-   * When the AttachmentInput is used inside a nested form, you can specify the root entity to use for the REST calls.
-   * If not specified, the default value is the current entity passed by context.
+   * When the AttachmentInput is used inside a nested form, you can specify the root resource to use for the REST calls.
+   * If not specified, the default value is the current resource passed by context.
    */
   resource?: string;
 };

package/src/components/ra-inputs/AttachmentInput.tsx

@@ -53,7 +53,7 @@ const StyledFileInput = styled(RaFileInput, { slot: 'root' })(
 function AttachmentInput({
   // @ts-ignore
   children = <AttachmentField title="name" source="path" />,
-  multiple = true,
+  multiple = false,
   disabled = false,
   type = 'attachment',
   ...props
@@ -68,7 +68,7 @@ function AttachmentInput({
       {/** @ts-ignore */}
       <StyledFileInput type={type} multiple={multiple} disabled={disabled}>
         {/* @ts-ignore */}
-        {React.cloneElement(children, { ...children.props, entityId, property })}
+        {React.cloneElement(children, { entityId, property, ...children.props })}
       </StyledFileInput>
     </LabeledInput>
   );

package/src/playground/components/ra-forms/CategoryForm.jsx

@@ -1,5 +1,12 @@
-import { BooleanInput, LocalizedTextInput, SimpleForm, required } from '@/';
-import { ArrayInput, SimpleFormIterator } from 'ra-ui-materialui';
+import {
+  ArrayInput,
+  AttachmentInput,
+  BooleanInput,
+  LocalizedTextInput,
+  SimpleForm,
+  SimpleFormIterator,
+  required
+} from '@/';
 
 function requiredAtLeastOneTranslation(message = 'ra.validation.at_least_one_translation') {
   return (value, values) => {
@@ -14,6 +21,13 @@ function CategoryForm(props) {
     <SimpleForm {...props}>
       <LocalizedTextInput source="description" fullWidth validate={requiredAtLeastOneTranslation()} />
       <BooleanInput source="active" />
+      <AttachmentInput source="attachment" fullWidth />
+      <AttachmentInput source="attachments" multiple fullWidth />
+      <ArrayInput source="subCategories" fullWidth>
+        <SimpleFormIterator divider>
+          <AttachmentInput label={false} source="attachments" multiple fullWidth />
+        </SimpleFormIterator>
+      </ArrayInput>
     </SimpleForm>
   );
 }

package/src/playground/components/ra-lists/CategoryList.jsx

@@ -1,8 +1,10 @@
 import { CategoryForm } from '@/playground/components';
 import {
   ActionsMenu,
+  BooleanField,
   CreateInDialogButton,
   Datagrid,
+  DeleteWithConfirmButton,
   EditInDialogButton,
   Empty,
   FilterButton,
@@ -53,12 +55,11 @@ function CategoryList() {
     >
       <Datagrid>
         <LocalizedTextField source="description" />
+        <BooleanField source="active" />
         <EditInDialogButton>
           <CategoryForm />
         </EditInDialogButton>
-        <EditInDialogButton label="Edit with Submit" onSubmit={console.log}>
-          <CategoryForm />
-        </EditInDialogButton>
+        <DeleteWithConfirmButton />
       </Datagrid>
     </List>
   );