react-admin-base-bootstrap 0.8.21 → 0.8.23

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,11 +60,27 @@ 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 }),
         bsOptions.noCloseOnSave && saved && open && url && React.createElement(Navigate, { to: url + "/" + data.id + "/edit", 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 },

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

@@ -1,9 +1,10 @@
 import React from 'react';
-export default function ExcelExportButton({ name, header, params, size, map, extra }: {
+export default function ExcelExportButton({ name, header, params, size, transform, map, extra }: {
     name: any;
     header: any;
     params: any;
     size: any;
+    transform: any;
     map: any;
     extra: any;
 }): React.JSX.Element;

package/lib/esm/Components/ExcelExportButton.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import { useExporter } from 'react-admin-base';
 import { Button, Col } from "reactstrap";
-export default function ExcelExportButton({ name, header, params, size, map, extra }) {
-    const [handleExport, loading] = useExporter(header, params, map, extra);
+export default function ExcelExportButton({ name, header, params, size, transform, map, extra }) {
+    const [handleExport, loading] = useExporter(header, params, map, extra, transform);
     return React.createElement(Col, null,
         React.createElement(Button, { className: "w-100 d-block", type: "button", size: size, color: "success", outline: true, disabled: !!loading, onClick: () => handleExport(name) }, loading ? React.createElement("i", { className: "fas fa-spin fa-spinner" }) : React.createElement("i", { className: "fas fa-file-excel" })));
 }

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 sind noch nicht gespeicherte Änderungen vorhanden. Möchten Sie den Vorgang wirklich abbrechen?"
 }

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 unsaved changes, are you sure to cancel?"
 }

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": "Kaydedilmemiş değişiklikler var, iptal etmek istediğinizden emin misiniz?"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.8.21",
+  "version": "0.8.23",
   "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.10",
+    "react-admin-base": "^0.8.12",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-password-strength-bar": "^0.4.1",

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 />}
         { bsOptions.noCloseOnSave && saved && open && url && <Navigate to={url + "/" + data.id + "/edit"} replace />}
-        <BootstrapModal isOpen size={size} toggle={() => url ? setOpen(false) : onReload(null)} fade={false}>
-            { title && <ModalHeader toggle={() => url ? setOpen(false) : onReload(null)}>
+        <BootstrapModal isOpen size={size} toggle={onClose} fade={false}>
+            { title && <ModalHeader toggle={onClose}>
                 <b>{ title }</b>
             </ModalHeader> }
             <ValidatorProvider>

package/src/Components/ExcelExportButton.tsx

@@ -2,8 +2,8 @@ import React from 'react';
 import {useExporter} from 'react-admin-base';
 import {Button, Col} from "reactstrap";
 
-export default function ExcelExportButton({name, header, params, size, map, extra}) {
-    const [ handleExport, loading ] = useExporter(header, params, map, extra);
+export default function ExcelExportButton({name, header, params, size, transform, map, extra}) {
+    const [ handleExport, loading ] = useExporter(header, params, map, extra, transform);
 
     return <Col>
         <Button className="w-100 d-block" type="button" size={size} color="success" outline disabled={!!loading} onClick={() => handleExport(name)}>

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 sind noch nicht gespeicherte Änderungen vorhanden. Möchten Sie den Vorgang wirklich abbrechen?"
 }

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 unsaved changes, are you sure to cancel?"
 }

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": "Kaydedilmemiş değişiklikler var, iptal etmek istediğinizden emin misiniz?"
 }