react-admin-base-bootstrap 0.9.18 → 0.9.19

package/lib/esm/Components/BootstrapDataTable.js

@@ -144,7 +144,8 @@ export default function BootstrapTable({ url, bordered, noStrip, defaultParams,
                                 children[2],
                                 !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]),
+                            children[3],
+                            children[4]),
                         data === null ? React.createElement(Alert, { className: "text-center mb-0 mx-3 ", color: "warning" },
                             React.createElement("i", { className: "fas fa-spinner fa-spin" })) : !data.length ? React.createElement(Alert, { className: "text-center mx-3", color: "danger" },
                             React.createElement("i", { className: "far fa-times-circle" }),

package/lib/esm/Components/CRUD.js

@@ -19,7 +19,7 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React, { useCallback, useContext, useRef, useState } from 'react';
-import { ValidatorProvider } from "react-admin-base";
+import { useRefresh, ValidatorProvider } from "react-admin-base";
 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";
@@ -113,21 +113,16 @@ export function CRUDActions({ id, edit, del, children }) {
 function ComponentWrapper(_a) {
     var { Component } = _a, props = __rest(_a, ["Component"]);
     const { id } = useParams();
-    return React.createElement(Component, Object.assign({}, props, { id: id }));
+    const update = useRefresh();
+    return React.createElement(Component, Object.assign({}, props, { id: id, onReload: update }));
 }
 export default function CRUD(props) {
     const ref = useRef(null);
     const { url, apiUrl, Component, defaultParams, noAdd } = props;
-    const reload = useCallback(function () {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (ref.current) {
-                ref.current(params => (Object.assign({}, params)));
-            }
-        });
-    }, [ref]);
     return React.createElement(UrlContext.Provider, { value: url },
-        React.createElement(Routes, null,
-            !noAdd && React.createElement(Route, { path: "create", element: React.createElement(ComponentWrapper, Object.assign({ Component: Component, url: url, onReload: reload }, (defaultParams || {}))) }),
-            React.createElement(Route, { path: ":id/edit", element: React.createElement(ComponentWrapper, Object.assign({ Component: Component, url: url, onReload: reload }, (defaultParams || {}))) })),
-        React.createElement(BootstrapDataTable, Object.assign({ innerRef: ref, add: (!noAdd && "create") || undefined }, props, { url: apiUrl || url }), props.children));
+        React.createElement(BootstrapDataTable, Object.assign({ innerRef: ref, add: (!noAdd && "create") || undefined }, props, { url: apiUrl || url }),
+            props.children,
+            React.createElement(Routes, null,
+                !noAdd && React.createElement(Route, { path: "create", element: React.createElement(ComponentWrapper, Object.assign({ Component: Component, url: url }, (defaultParams || {}))) }),
+                React.createElement(Route, { path: ":id/edit", element: React.createElement(ComponentWrapper, Object.assign({ Component: Component, url: url }, (defaultParams || {}))) }))));
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-admin-base-bootstrap",
-  "version": "0.9.18",
+  "version": "0.9.19",
   "description": "",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

package/src/Components/BootstrapDataTable.tsx

@@ -189,6 +189,7 @@ export default function BootstrapTable({url, bordered, noStrip, defaultParams, a
                                 </Col>}
                             </Row>
                             {children[3]}
+                            {children[4]}
                         </CardHeader>
                             {data === null ? <Alert className="text-center mb-0 mx-3 " color="warning"><i className="fas fa-spinner fa-spin"></i></Alert> : !data.length ? <Alert className="text-center mx-3" color="danger">
                                 <i className="far fa-times-circle"></i> <FormattedMessage id="NO_DATA_IS_AVAILABLE"/>

package/src/Components/CRUD.tsx

@@ -1,5 +1,5 @@
 import React, { useCallback, useContext, useRef, useState } from 'react';
-import { ValidatorProvider } from "react-admin-base";
+import { useRefresh, ValidatorProvider } from "react-admin-base";
 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";
@@ -130,7 +130,8 @@ export function CRUDActions({ id, edit, del, children }: CrudActionProps) {
 
 function ComponentWrapper({ Component, ...props }) {
   const { id } = useParams();
-  return <Component {...props} id={id} />;
+  const update = useRefresh();
+  return <Component {...props} id={id} onReload={update} />;
 }
 
 interface CRUDProps extends BootstrapTableProps {
@@ -143,19 +144,13 @@ export default function CRUD(props: CRUDProps) {
     const ref = useRef(null as any);
     const { url, apiUrl, Component, defaultParams, noAdd } = props;
 
-    const reload = useCallback(async function() {
-        if (ref.current) {
-            ref.current(params => ({ ...params }));
-        }
-    }, [ref]);
-
     return <UrlContext.Provider value={url}>
-        <Routes>
-          { !noAdd && <Route path="create" element={<ComponentWrapper Component={Component} url={url} onReload={reload} {...(defaultParams || {})} />} /> }
-          <Route path=":id/edit" element={<ComponentWrapper Component={Component} url={url} onReload={reload} {...(defaultParams || {})} />} />
-        </Routes>
         <BootstrapDataTable innerRef={ref} add={(!noAdd && "create") || undefined} {...props} url={apiUrl || url}>
             {props.children}
+            <Routes>
+              { !noAdd && <Route path="create" element={<ComponentWrapper Component={Component} url={url} {...(defaultParams || {})} />} /> }
+              <Route path=":id/edit" element={<ComponentWrapper Component={Component} url={url} {...(defaultParams || {})} />} />
+            </Routes>
         </BootstrapDataTable>
     </UrlContext.Provider>;
 }