react-admin-base-bootstrap 0.8.16 → 0.8.18

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/CRUD.js

@@ -20,7 +20,7 @@ var __rest = (this && this.__rest) || function (s, e) {
 };
 import React, { useCallback, useContext, useRef, useState } from 'react';
 import { ValidatorProvider } from "react-admin-base";
-import { FormattedMessage } from 'react-intl';
+import { FormattedMessage, useIntl } from 'react-intl';
 import { Navigate, Routes, useParams, Route } from 'react-router-dom';
 import { Alert, Button, Col, Form, ModalFooter, ModalHeader, Row } from "reactstrap";
 import LoadingButton from '../Components/LoadingButton';
@@ -60,10 +60,26 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
             }
         });
     }, [save, saved, error, onReload, url]);
+    const check = bsOptions.noCloseOnSave && dirty;
+    const intl = useIntl();
+    const checkConfirmText = intl.formatMessage({ id: 'CANCEL_ENTITY_SAVE' });
+    const onClose = useCallback(function () {
+        if (check) {
+            const ok = confirm(checkConfirmText);
+            if (!ok)
+                return;
+        }
+        if (url) {
+            setOpen(false);
+        }
+        else {
+            onReload(null);
+        }
+    }, [setOpen, onReload, url, check, checkConfirmText]);
     return React.createElement(React.Fragment, null,
         ((!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(BootstrapModal, { isOpen: true, size: size, toggle: onClose, fade: false },
+            title && React.createElement(ModalHeader, { toggle: onClose },
                 React.createElement("b", null, title)),
             React.createElement(ValidatorProvider, null,
                 React.createElement(Form, { onSubmit: onSubmit, disabled: !!loading || disabled },
@@ -81,7 +97,7 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                                     ' ',
                                     React.createElement(FormattedMessage, { id: "ENTITY.SAVE" }))),
                             React.createElement(Col, null,
-                                React.createElement(Button, { block: true, outline: true, color: "danger", onClick: (e) => { e.preventDefault(); (url ? setOpen(false) : onReload(null)); } },
+                                React.createElement(Button, { block: true, outline: true, color: "danger", onClick: (e) => { e.preventDefault(); onClose(); } },
                                     React.createElement("i", { className: "fas fa-times-circle" }),
                                     ' ',
                                     React.createElement(FormattedMessage, { id: "ENTITY.CANCEL" })))))))));

package/lib/esm/i18n/de.json

@@ -38,5 +38,6 @@
     "ACTIONS.DELETE.CONFIRM": "Ja, löschen!",
     "PLEASE_WAIT": "Warten Sie mal.",
     "AUTHORIZATION_CODE": "Zugangscode",
-    "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}"
+    "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}",
+    "CANCEL_ENTITY_SAVE": "Es gibt Änderungen auf der Seite. Sind Sie sicher, dass Sie sie rückgängig machen wollen?"
 }

package/lib/esm/i18n/en.json

@@ -40,5 +40,6 @@
     "ACTIONS.DELETE.CONFIRM": "Yes, delete it!",
     "PLEASE_WAIT": "Please wait.",
     "AUTHORIZATION_CODE": "Authorization Code",
-    "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}"
+    "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}",
+    "CANCEL_ENTITY_SAVE": "There are changes on the page. Are you sure you want to undo them?"
 }

package/lib/esm/i18n/tr.json

@@ -39,5 +39,6 @@
     "ACTIONS.DELETE.CONFIRM": "Evet, sil!",
     "PLEASE_WAIT": "Lütfen bekleyiniz.",
     "AUTHORIZATION_CODE": "Yetki Kodu",
-    "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}"
+    "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}",
+    "CANCEL_ENTITY_SAVE": "Sayfada değişiklikler var. Geri almak istediğinizden emin misiniz?"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.8.16",
+  "version": "0.8.18",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 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/CRUD.tsx

@@ -1,6 +1,6 @@
 import React, { useCallback, useContext, useRef, useState } from 'react';
 import { ValidatorProvider } from "react-admin-base";
-import { FormattedMessage } from 'react-intl';
+import {FormattedMessage, useIntl} from 'react-intl';
 import { Navigate, Routes, useParams, Route } from 'react-router-dom';
 import { Alert, Button, Col, Form, Modal, ModalFooter, ModalHeader, Row } from "reactstrap";
 import LoadingButton from '../Components/LoadingButton';
@@ -58,11 +58,28 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
         }
     }, [save, saved, error, onReload, url]);
 
+    const check = bsOptions.noCloseOnSave && dirty;
+    const intl = useIntl();
+    const checkConfirmText = intl.formatMessage({ id: 'CANCEL_ENTITY_SAVE' });
+    const onClose = useCallback(function() {
+        if (check) {
+            const ok = confirm(checkConfirmText);
+            if (!ok)
+                return ;
+        }
+
+        if (url) {
+            setOpen(false);
+        } else {
+            onReload(null);
+        }
+    }, [ setOpen, onReload, url, check, checkConfirmText ]);
+
     return <>
         { ((!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>
+        <BootstrapModal isOpen size={size} toggle={onClose} fade={false}>
+            { title && <ModalHeader toggle={onClose}>
+                <b>{ title }</b>
             </ModalHeader> }
             <ValidatorProvider>
                 <Form onSubmit={onSubmit} disabled={!!loading || disabled}>
@@ -79,7 +96,7 @@ export function ModalEntityEditor({ entity, title, size, url, onReload, disabled
                             </LoadingButton>
                         </Col>
                         <Col>
-                          <Button block outline color="danger" onClick={(e) => { e.preventDefault(); (url ? setOpen(false) : onReload(null)); }}>
+                          <Button block outline color="danger" onClick={(e) => { e.preventDefault(); onClose(); }}>
                               <i className="fas fa-times-circle" />{' '}<FormattedMessage id="ENTITY.CANCEL" />
                           </Button>
                         </Col>

package/src/i18n/de.json

@@ -38,5 +38,6 @@
   "ACTIONS.DELETE.CONFIRM": "Ja, löschen!",
   "PLEASE_WAIT": "Warten Sie mal.",
   "AUTHORIZATION_CODE": "Zugangscode",
-  "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}"
+  "RECORDS": "{count, plural, =0 {kein eintrag} one {# datensatz} other {# datensätze}}",
+  "CANCEL_ENTITY_SAVE": "Es gibt Änderungen auf der Seite. Sind Sie sicher, dass Sie sie rückgängig machen wollen?"
 }

package/src/i18n/en.json

@@ -40,5 +40,6 @@
   "ACTIONS.DELETE.CONFIRM": "Yes, delete it!",
   "PLEASE_WAIT": "Please wait.",
   "AUTHORIZATION_CODE": "Authorization Code",
-  "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}"
+  "RECORDS": "{count, plural, =0 {no records} one {# record} other {# records}}",
+  "CANCEL_ENTITY_SAVE": "There are changes on the page. Are you sure you want to undo them?"
 }

package/src/i18n/tr.json

@@ -39,5 +39,6 @@
   "ACTIONS.DELETE.CONFIRM": "Evet, sil!",
   "PLEASE_WAIT": "Lütfen bekleyiniz.",
   "AUTHORIZATION_CODE": "Yetki Kodu",
-  "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}"
+  "RECORDS": "{count, plural, =0 {Kayıt yok} one {# kayıt} other {# kayıt}}",
+  "CANCEL_ENTITY_SAVE": "Sayfada değişiklikler var. Geri almak istediğinizden emin misiniz?"
 }