authscape 1.0.257 → 1.0.259

package/index.js

@@ -974,6 +974,8 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
     columns = _ref.columns,
     _ref$isCellEditable = _ref.isCellEditable,
     _isCellEditable = _ref$isCellEditable === void 0 ? null : _ref$isCellEditable,
+    _ref$params = _ref.params,
+    params = _ref$params === void 0 ? null : _ref$params,
     _ref$onCellEdited = _ref.onCellEdited,
     onCellEdited = _ref$onCellEdited === void 0 ? null : _ref$onCellEdited,
     _ref$sx = _ref.sx,
@@ -1010,28 +1012,43 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (!(url != null)) {
-              _context.next = 7;
+              _context.next = 16;
               break;
             }
-            _context.next = 3;
+            response = null;
+            if (!(params == null)) {
+              _context.next = 8;
+              break;
+            }
+            _context.next = 5;
             return apiService().post(url, {
               offset: offset,
               length: pageSize
             });
-          case 3:
+          case 5:
+            response = _context.sent;
+            _context.next = 13;
+            break;
+          case 8:
+            params.offset = offset;
+            params.length = pageSize;
+            _context.next = 12;
+            return apiService().post(url, params);
+          case 12:
             response = _context.sent;
+          case 13:
             if (response != null && response.status == 200) {
               setTotalRows(response.data.recordsTotal);
               setRows(response.data.data);
             }
-            _context.next = 8;
+            _context.next = 17;
             break;
-          case 7:
+          case 16:
             if (rows != null) {
               setTotalRows(eRows.length);
               setRows(eRows);
             }
-          case 8:
+          case 17:
           case "end":
             return _context.stop();
         }
@@ -1043,12 +1060,12 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
   }();
   var handleCellEditCommit = _react["default"].useCallback(function () {
     return /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(params) {
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(dataParams) {
         var id, field, value, editedRow;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
-              id = params.id, field = params.field, value = params.value;
+              id = dataParams.id, field = dataParams.field, value = dataParams.value;
               editedRow = {
                 id: id,
                 field: field,
@@ -1086,9 +1103,9 @@ var EditableDatagrid = function EditableDatagrid(_ref) {
     rowsPerPageOptions: rowsPerPage,
     disableSelectionOnClick: true,
     onCellEditCommit: handleCellEditCommit(),
-    isCellEditable: function isCellEditable(params) {
+    isCellEditable: function isCellEditable(data) {
       if (_isCellEditable != null) {
-        _isCellEditable(params);
+        _isCellEditable(data);
       }
       return true;
     }
@@ -2538,8 +2555,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RichTextEditor = void 0;
+var _react = _interopRequireWildcard(require("react"));
 var _draftJs = require("draft-js");
-var _react = require("react");
 var _draftjsToHtml = _interopRequireDefault(require("draftjs-to-html"));
 var _dynamic = _interopRequireDefault(require("next/dynamic"));
 var _material = require("@mui/material");
@@ -2572,10 +2589,6 @@ var RichTextEditor = function RichTextEditor(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     editorState = _useState2[0],
     setEditorState = _useState2[1];
-  var _useState3 = (0, _react.useState)(),
-    _useState4 = _slicedToArray(_useState3, 2),
-    text = _useState4[0],
-    setText = _useState4[1];
   var onEditorStateChange = function onEditorStateChange(editorState) {
     setEditorState(editorState);
   };
@@ -2589,7 +2602,7 @@ var RichTextEditor = function RichTextEditor(_ref) {
       }
     }
   }, [html]);
-  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Editor, {
+  return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(Editor, {
     editorState: editorState,
     toolbarClassName: "toolbarClassName",
     wrapperClassName: "wrapperClassName",
@@ -2612,11 +2625,11 @@ var RichTextEditor = function RichTextEditor(_ref) {
     //     { text: "HONEYDEW", value: "honeydew", url: "honeydew" }
     //   ]
     // }}
-  }), /*#__PURE__*/React.createElement("hr", null), /*#__PURE__*/React.createElement(_material.Box, {
+  }), /*#__PURE__*/_react["default"].createElement("hr", null), /*#__PURE__*/_react["default"].createElement(_material.Box, {
     sx: {
       textAlign: "right"
     }
-  }, /*#__PURE__*/React.createElement(_material.Button, {
+  }, /*#__PURE__*/_react["default"].createElement(_material.Button, {
     variant: "contained",
     onClick: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.257",
+  "version": "1.0.259",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -32,6 +32,8 @@
     "@stripe/react-stripe-js": "^1.9.0",
     "@stripe/stripe-js": "^1.32.0",
     "axios": "^0.27.2",
+    "draft-js": "^0.11.7",
+    "draftjs-to-html": "^0.9.1",
     "eslint-config-next": "^13.3.2",
     "ga-4-react": "^0.1.281",
     "html2canvas": "^1.4.1",
@@ -43,6 +45,7 @@
     "react-color": "^2.19.3",
     "react-cool-onclickoutside": "^1.7.0",
     "react-data-table-component": "^7.5.2",
+    "react-draft-wysiwyg": "^1.15.0",
     "react-hook-form": "^7.44.2",
     "react-toastify": "^9.1.3",
     "use-places-autocomplete": "^4.0.0"

package/src/components/EditableDatagrid.js

@@ -2,7 +2,7 @@ import React, {useEffect, useState} from 'react';
 import { DataGrid, GridActionsCellItem } from "@mui/x-data-grid";
 import { Box } from '@mui/material';
 
-export const EditableDatagrid = ({loadedUser, url = null, eRows = null, columns, isCellEditable = null, onCellEdited = null, sx = {}, height="50vh", pageSize = 50, rowsPerPage  = [25, 50, 100], rowHeight = 70}) => {
+export const EditableDatagrid = ({loadedUser, url = null, eRows = null, columns, isCellEditable = null, params = null, onCellEdited = null, sx = {}, height="50vh", pageSize = 50, rowsPerPage  = [25, 50, 100], rowHeight = 70}) => {
 
     const [rows, setRows] = useState([]);
     const [totalRows, setTotalRows] = useState(0);
@@ -22,11 +22,22 @@ export const EditableDatagrid = ({loadedUser, url = null, eRows = null, columns,
 
         if (url != null)
         {
-            let response = await apiService().post(url,
+            let response = null;
+            if (params == null)
             {
-                offset: offset,
-                length: pageSize
-            });
+                response = await apiService().post(url,
+                {
+                    offset: offset,
+                    length: pageSize
+                });
+            }
+            else
+            {
+                params.offset = offset;
+                params.length = pageSize;
+
+                response = await apiService().post(url, params);
+            }
 
             if (response != null && response.status == 200)
             {
@@ -41,9 +52,9 @@ export const EditableDatagrid = ({loadedUser, url = null, eRows = null, columns,
         }
     }
 
-    const handleCellEditCommit = React.useCallback(() => async (params) => {
+    const handleCellEditCommit = React.useCallback(() => async (dataParams) => {
 
-        const { id, field, value } = params;
+        const { id, field, value } = dataParams;
         const editedRow = { id, field, value };
 
         onCellEdited(editedRow);
@@ -66,11 +77,11 @@ export const EditableDatagrid = ({loadedUser, url = null, eRows = null, columns,
                 rowsPerPageOptions={rowsPerPage}
                 disableSelectionOnClick={true}
                 onCellEditCommit={handleCellEditCommit()}
-                isCellEditable={(params) => {
+                isCellEditable={(data) => {
 
                     if (isCellEditable != null)
                     {
-                        isCellEditable(params);
+                        isCellEditable(data);
                     }
                     return true;
                 }}

package/src/components/RichTextEditor.js

@@ -1,9 +1,8 @@
-import { convertToRaw, EditorState, ContentState } from "draft-js";
-import { useState, useEffect } from "react";
+import React, { useState, useEffect } from "react";
+import { convertToRaw, EditorState, ContentState, convertFromHTML } from "draft-js";
 import draftToHtml from "draftjs-to-html";
 import dynamic from 'next/dynamic';
 import { Box, Button } from "@mui/material";
-import { convertFromHTML } from 'draft-js';
 
 const Editor = dynamic(
     () => import('react-draft-wysiwyg').then(mod => mod.Editor),
@@ -13,7 +12,6 @@ const Editor = dynamic(
   export const RichTextEditor = ({html, onSave}) => {
     
   const [editorState, setEditorState] = useState(EditorState.createEmpty());
-  const [text, setText] = useState();
   const onEditorStateChange = function (editorState) {
     setEditorState(editorState);
   };