react-admin-base-bootstrap 0.8.22 → 0.9.0

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/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.22",
+  "version": "0.9.0",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
@@ -27,32 +27,28 @@
   "peerDependencies": {
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
-    "react-intl": "^6.2.10",
-    "react-router-dom": "^6.18.0"
+    "react-intl": "^6.6.1",
+    "react-router-dom": "^6.21.3"
   },
   "dependencies": {
-    "@emotion/react": "^11.11.1",
-    "@fortawesome/fontawesome-free": "^6.4.0",
-    "bootstrap": "^5.3.0",
+    "@emotion/react": "^11.11.3",
+    "@fortawesome/fontawesome-free": "^6.5.1",
+    "bootstrap": "^5.3.2",
     "file-dialog": "^0.0.8",
     "modal-cropper": "^1.2.3",
     "nprogress": "^0.2.0",
     "prettysize": "^2.0.0",
-    "react-admin-base": "^0.8.12",
+    "react-admin-base": "^0.9.0",
     "react-dnd": "^16.0.1",
     "react-dnd-html5-backend": "^16.0.1",
     "react-password-strength-bar": "^0.4.1",
     "react-responsive": "^9.0.2",
-    "react-select": "^5.7.3",
-    "reactstrap": "^9.2.0",
-    "rewire": "^6.0.0",
-    "sweetalert2": "^11.7.12"
+    "react-select": "^5.8.0",
+    "reactstrap": "^9.2.2",
+    "sweetalert2": "^11.10.4"
   },
   "devDependencies": {
-    "@types/react": "^18.2.12",
-    "cross-env": "^7.0.3",
-    "nodemon": "^2.0.22",
-    "react-intl": "^6.4.4",
-    "typescript": "^5.1.3"
+    "nodemon": "^3.0.3",
+    "typescript": "^5.3.3"
   }
 }

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/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?"
 }

package/build.js

@@ -1,24 +0,0 @@
-
-const rewire = require('rewire');
-const webpackConfig = rewire('react-scripts/scripts/build');
-const config = webpackConfig.__get__('config');
-
-addLazyLoadingStyleLoader(config.module);
-	
-function addLazyLoadingStyleLoader(config) {
-	const cssLoader = config.rules[1].oneOf[5];
-	
-	config.rules[1].oneOf.splice(5, 2, {
-		...cssLoader,
-		use: [
-			{
-				loader: require.resolve('style-loader'),
-				options: {
-					injectType: 'lazyStyleTag'
-				}
-			},
-			cssLoader.use[1],
-			cssLoader.use[2]
-		]
-	});
-}

package/watch.js

@@ -1,58 +0,0 @@
-
-const rewire = require('rewire');
-const webpackConfig = rewire('react-scripts/scripts/start');
-const oldConfigFactory = webpackConfig.__get__('configFactory');
-const ModuleScopePlugin = require('react-dev-utils/ModuleScopePlugin');
-const fs = require('fs');
-const path = require('path');
-
-webpackConfig.__set__('configFactory', function(env) {
-	const config = oldConfigFactory(env);
-	
-	// disable use modules outside of src
-	config.resolve.plugins = config.resolve.plugins.filter(plugin => !(plugin instanceof ModuleScopePlugin));
-	
-	// disable local node_modules/ path
-	config.resolve.modules.shift();
-	
-	// add aliased packages from /opt/packages
-	for (const alias of find_custom_packages('/opt/packages')){
-		config.resolve.alias[alias.name] = alias.path;
-	}
-
-	addLazyLoadingStyleLoader(config.module);
-	
-	console.log(config);
-	//process.exit(0);
-	
-	return config;
-});
-
-function* find_custom_packages(location) {
-	const dir = fs.opendirSync(location, { withFileTypes: true });
-	let dirent;
-	while ((dirent = dir.readSync()) !== null) {
-	  if (dirent.isSymbolicLink()) {
-		  yield {name: dirent.name, path: fs.realpathSync(path.join(location, dirent.name))};
-	  }
-	}
-	dir.closeSync();
-}
-
-function addLazyLoadingStyleLoader(config) {
-	const cssLoader = config.rules[1].oneOf[5];
-	
-	config.rules[1].oneOf.splice(5, 2, {
-		...cssLoader,
-		use: [
-			{
-				loader: cssLoader.use[0],
-				options: {
-					injectType: 'lazyStyleTag'
-				}
-			},
-			cssLoader.use[1],
-			cssLoader.use[2]
-		]
-	});
-}