react-admin-base-bootstrap 0.8.15 → 0.8.17

package/lib/esm/Components/BootstrapDataTable.d.ts

@@ -21,11 +21,12 @@ export interface BootstrapTableProps {
     add?: string;
     children: any;
     innerRef?: any;
+    noSearch?: boolean;
 }
 interface RowRendererProps<Row = any> {
     render: (row: Row) => React.ReactNode;
 }
 export declare function RowRenderer<Row = any>({ render }: RowRendererProps<Row>): React.JSX.Element;
 export declare function CustomRenderer<Row = any>({ render }: RowRendererProps<Row>): React.JSX.Element;
-export default function BootstrapTable({ url, bordered, noStrip, defaultParams, add, children, innerRef, body }: BootstrapTableProps): React.JSX.Element;
+export default function BootstrapTable({ url, bordered, noStrip, defaultParams, add, noSearch, children, innerRef, body }: BootstrapTableProps): React.JSX.Element;
 export {};

package/lib/esm/Components/BootstrapDataTable.js

@@ -90,7 +90,7 @@ export function CustomRenderer({ render }) {
     const rows = useContext(RowDatasContext);
     return React.createElement(React.Fragment, null, rows.map(render));
 }
-export default function BootstrapTable({ url, bordered, noStrip, defaultParams, add, children, innerRef, body }) {
+export default function BootstrapTable({ url, bordered, noStrip, defaultParams, add, noSearch = false, children, innerRef, body }) {
     const state = useState(Object.assign({ sort: 'id' }, defaultParams));
     const [params, setParams] = state;
     const [page, lastPage, setPage, data, itemPerPage, setItemPerPage, update, count] = useDataTable(url, params, body);
@@ -141,7 +141,7 @@ export default function BootstrapTable({ url, bordered, noStrip, defaultParams,
                                         React.createElement("option", { value: "200" }, "200"),
                                         React.createElement("option", { value: "-1" }, intl.formatMessage({ id: "ALL" })))),
                                 children[2],
-                                React.createElement(Col, { md: "3", className: "ms-auto" },
+                                !noSearch && React.createElement(Col, { md: "3", className: "ms-auto" },
                                     React.createElement(Input, { placeholder: intl.formatMessage({ id: "SEARCH" }), type: "text", value: params.query || '', onChange: e => setParams(Object.assign(Object.assign({}, params), { query: e.currentTarget.value })) }))),
                             children[3]),
                         data === null ? React.createElement(Alert, { className: "text-center mb-0 mx-3 ", color: "warning" },

package/lib/esm/Components/BootstrapOptions.d.ts

@@ -2,10 +2,12 @@ import React, { ReactNode } from "react";
 import BootstrapOptions from "./BootstrapOptions";
 interface BootstrapOptions {
     noCloseModal: boolean;
+    noCloseOnSave: boolean;
+    onlySaveOnDirty: boolean;
 }
 interface BootstrapOptionsProviderProps extends BootstrapOptions {
     children: ReactNode;
 }
 export declare function useBootstrapOptions(): BootstrapOptions;
-export default function BootstrapOptionsProvider({ children, noCloseModal }: BootstrapOptionsProviderProps): React.JSX.Element;
+export default function BootstrapOptionsProvider({ children, noCloseModal, noCloseOnSave, onlySaveOnDirty }: BootstrapOptionsProviderProps): React.JSX.Element;
 export {};

package/lib/esm/Components/BootstrapOptions.js

@@ -1,11 +1,13 @@
 import React, { createContext, useContext, useMemo } from "react";
 const BootstrapOptionsContext = createContext({
-    noCloseModal: false
+    noCloseModal: false,
+    noCloseOnSave: false,
+    onlySaveOnDirty: false
 });
 export function useBootstrapOptions() {
     return useContext(BootstrapOptionsContext);
 }
-export default function BootstrapOptionsProvider({ children, noCloseModal }) {
-    const options = useMemo(() => ({ noCloseModal }), [noCloseModal]);
+export default function BootstrapOptionsProvider({ children, noCloseModal, noCloseOnSave, onlySaveOnDirty }) {
+    const options = useMemo(() => ({ noCloseModal, noCloseOnSave, onlySaveOnDirty }), [noCloseModal, noCloseOnSave]);
     return React.createElement(BootstrapOptionsContext.Provider, { value: options }, children);
 }

package/lib/esm/Components/CRUD.js

@@ -26,8 +26,10 @@ import { Alert, Button, Col, Form, ModalFooter, ModalHeader, Row } from "reactst
 import LoadingButton from '../Components/LoadingButton';
 import BootstrapDataTable, { Actions } from './BootstrapDataTable';
 import BootstrapModal from './BootstrapModal';
+import { useBootstrapOptions } from "./BootstrapOptions";
 export function ModalEntityEditor({ entity, title, size, url, onReload, disabled, children }) {
-    const [, , save, loading] = entity;
+    const [, , save, loading, dirty] = entity;
+    const bsOptions = useBootstrapOptions();
     const [open, setOpen] = useState(true);
     const [saved, setSaved] = useState(false);
     const [error, setError] = useState(false);
@@ -59,7 +61,7 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
         });
     }, [save, saved, error, onReload, url]);
     return React.createElement(React.Fragment, null,
-        (saved || !open) && url && React.createElement(Navigate, { to: url, replace: true }),
+        ((!bsOptions.noCloseOnSave && saved) || !open) && url && React.createElement(Navigate, { to: url, replace: true }),
         React.createElement(BootstrapModal, { isOpen: true, size: size, toggle: () => url ? setOpen(false) : onReload(null), fade: false },
             title && React.createElement(ModalHeader, { toggle: () => url ? setOpen(false) : onReload(null) },
                 React.createElement("b", null, title)),
@@ -68,9 +70,13 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                     React.createElement("fieldset", { disabled: !!loading || !!disabled }, children),
                     React.createElement(ModalFooter, null,
                         error && React.createElement(Alert, { color: "danger", toggle: () => setError(null), style: { display: 'block', width: '100%' } }, error),
+                        bsOptions.noCloseOnSave && !dirty && saved && React.createElement(Alert, { color: "success", style: { display: 'block', width: '100%' } },
+                            React.createElement("i", { className: "fas fa-check-circle" }),
+                            " ",
+                            React.createElement(FormattedMessage, { id: "ENTITY.SAVED" })),
                         React.createElement(Row, { className: "w-100" },
                             React.createElement(Col, null,
-                                React.createElement(LoadingButton, { block: true, loading: loading, type: "submit", color: "primary" },
+                                React.createElement(LoadingButton, { block: true, loading: loading, disabled: bsOptions.onlySaveOnDirty && !dirty, type: "submit", color: "primary" },
                                     React.createElement("i", { className: "fas fa-save" }),
                                     ' ',
                                     React.createElement(FormattedMessage, { id: "ENTITY.SAVE" }))),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.8.15",
+  "version": "0.8.17",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -38,7 +38,7 @@
     "modal-cropper": "^1.2.3",
     "nprogress": "^0.2.0",
     "prettysize": "^2.0.0",
-    "react-admin-base": "^0.8.8",
+    "react-admin-base": "^0.8.10",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-password-strength-bar": "^0.4.1",

package/src/Components/BootstrapDataTable.tsx

@@ -101,6 +101,7 @@ export interface BootstrapTableProps {
     add?: string;
     children: any;
     innerRef?: any;
+    noSearch?: boolean;
 }
 
 interface RowRendererProps<Row = any> {
@@ -123,7 +124,7 @@ export function CustomRenderer<Row = any>({render}: RowRendererProps<Row>) {
     </>;
 }
 
-export default function BootstrapTable({url, bordered, noStrip, defaultParams, add, children, innerRef, body}: BootstrapTableProps) {
+export default function BootstrapTable({url, bordered, noStrip, defaultParams, add, noSearch = false, children, innerRef, body}: BootstrapTableProps) {
     const state = useState({sort: 'id', ...defaultParams});
     const [params, setParams] = state;
     const [page, lastPage, setPage, data, itemPerPage, setItemPerPage, update, count] = useDataTable(url, params, body);
@@ -178,13 +179,13 @@ export default function BootstrapTable({url, bordered, noStrip, defaultParams, a
                                     </Input>
                                 </Col>
                                 {children[2]}
-                                <Col md="3" className="ms-auto">
+                                {!noSearch && <Col md="3" className="ms-auto">
                                     <Input
                                         placeholder={intl.formatMessage({id: "SEARCH"})} type="text"
                                         value={params.query || ''}
                                         onChange={e => setParams({...params, query: e.currentTarget.value})}
                                     />
-                                </Col>
+                                </Col>}
                             </Row>
                             {children[3]}
                         </CardHeader>

package/src/Components/BootstrapOptions.tsx

@@ -3,6 +3,8 @@ import BootstrapOptions from "./BootstrapOptions";
 
 interface BootstrapOptions {
     noCloseModal: boolean;
+    noCloseOnSave: boolean;
+    onlySaveOnDirty: boolean;
 }
 
 interface BootstrapOptionsProviderProps extends BootstrapOptions {
@@ -10,15 +12,17 @@ interface BootstrapOptionsProviderProps extends BootstrapOptions {
 }
 
 const BootstrapOptionsContext = createContext<BootstrapOptions>({
-    noCloseModal: false
+    noCloseModal: false,
+    noCloseOnSave: false,
+    onlySaveOnDirty: false
 });
 
 export function useBootstrapOptions() {
     return useContext(BootstrapOptionsContext);
 }
 
-export default function BootstrapOptionsProvider({children,noCloseModal}: BootstrapOptionsProviderProps) {
-    const options = useMemo(() => ({noCloseModal}), [noCloseModal]);
+export default function BootstrapOptionsProvider({children,noCloseModal,noCloseOnSave, onlySaveOnDirty}: BootstrapOptionsProviderProps) {
+    const options = useMemo(() => ({noCloseModal,noCloseOnSave,onlySaveOnDirty}), [noCloseModal, noCloseOnSave]);
     return <BootstrapOptionsContext.Provider value={options}>
         { children }
     </BootstrapOptionsContext.Provider>;

package/src/Components/CRUD.tsx

@@ -19,7 +19,8 @@ type ModalEntityEditorParams = {
 }
 
 export function ModalEntityEditor({ entity, title, size, url, onReload, disabled, children } : ModalEntityEditorParams) {
-    const [ , , save, loading ] = entity;
+    const [ , , save, loading, dirty ] = entity;
+    const bsOptions = useBootstrapOptions();
 
     const [ open, setOpen ] = useState(true);
     const [ saved, setSaved ] = useState(false);
@@ -58,10 +59,10 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
     }, [save, saved, error, onReload, url]);
 
     return <>
-        { (saved || !open) && url && <Navigate to={url} replace />}
+        { ((!bsOptions.noCloseOnSave && saved) || !open) && url && <Navigate to={url} replace />}
         <BootstrapModal isOpen size={size} toggle={() => url ? setOpen(false) : onReload(null)} fade={false}>
             { title && <ModalHeader toggle={() => url ? setOpen(false) : onReload(null)}>
-                <b>{ title }</b>
+                    <b>{ title }</b>
             </ModalHeader> }
             <ValidatorProvider>
                 <Form onSubmit={onSubmit} disabled={!!loading || disabled}>
@@ -69,12 +70,13 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                         { children }
                     </fieldset>
                     <ModalFooter>
-                      { error && <Alert color="danger" toggle={() => setError(null)} style={{ display: 'block', width: '100%' }}>{ error }</Alert>}
+                        { error && <Alert color="danger" toggle={() => setError(null)} style={{ display: 'block', width: '100%' }}>{ error }</Alert>}
+                        { bsOptions.noCloseOnSave && !dirty && saved && <Alert color="success" style={{ display: 'block', width: '100%' }}><i className="fas fa-check-circle" /> <FormattedMessage id="ENTITY.SAVED" /></Alert>}
                       <Row className="w-100">
                         <Col>
-                          <LoadingButton block loading={loading} type="submit" color="primary">
-                              <i className="fas fa-save" />{' '}<FormattedMessage id="ENTITY.SAVE" />
-                          </LoadingButton>
+                            <LoadingButton block loading={loading} disabled={bsOptions.onlySaveOnDirty && !dirty} type="submit" color="primary">
+                                <i className="fas fa-save" />{' '}<FormattedMessage id="ENTITY.SAVE" />
+                            </LoadingButton>
                         </Col>
                         <Col>
                           <Button block outline color="danger" onClick={(e) => { e.preventDefault(); (url ? setOpen(false) : onReload(null)); }}>