datastake-daf 0.6.377 → 0.6.378

package/dist/components/index.js

@@ -56904,7 +56904,8 @@ function NewUser({
   isOpen,
   onClose,
   defaultData,
-  userRoles = []
+  userRoles = [],
+  addUser = () => {}
 }) {
   const [MainForm] = antd.Form.useForm();
   const [accountUsed, setAccountUsed] = React.useState(false);
@@ -56918,8 +56919,25 @@ function NewUser({
   }, [defaultData]);
   const onSubmit = () => {
     MainForm.validateFields().then(val => {
-      console.log(val);
-      setAccountUsed(true);
+      // Create user object with the form data
+      const userData = {
+        firstName: val.firstName,
+        lastName: val.lastName,
+        email: val.email,
+        apps: {
+          sbg: {
+            role: val.role,
+            access: true
+          }
+        }
+      };
+
+      // Add user to local state
+      addUser(userData);
+
+      // Close modal and reset form
+      onClose();
+      MainForm.resetFields();
     }).catch(() => {});
   };
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
@@ -57235,6 +57253,7 @@ function Users({
   accountStatuses,
   deleteUser = () => {},
   updateUser = () => {},
+  addUser = () => {},
   transferAdmin = () => {}
 }) {
   const [hasError, setHasError] = React.useState(false);
@@ -57357,7 +57376,8 @@ function Users({
       t: t,
       isOpen: newUserModalVisible,
       onClose: () => setNewUserModalVisible(false),
-      userRoles: userRoles
+      userRoles: userRoles,
+      addUser: addUser
     })]
   });
 }
@@ -57593,6 +57613,18 @@ function Edit({
       })
     }));
   }, []);
+  const addUser = React.useCallback(userData => {
+    setIsChanged(true);
+    setData(prev => ({
+      ...prev,
+      users: [...(prev.users || []), {
+        ...userData,
+        id: Date.now(),
+        // Temporary ID
+        status: "unsaved"
+      }]
+    }));
+  }, []);
   const onSuspend = () => {
     antd.Modal.confirm({
       title: t("sbg-admin::suspend-title"),
@@ -57651,6 +57683,7 @@ function Edit({
         userRoles: userRoles,
         deleteUser: deleteUser,
         updateUser: updateUser,
+        addUser: addUser,
         goTo: goTo,
         accountStatuses: accountStatuses,
         transferAdmin: transferAdmin

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.377",
+	"version": "0.6.378",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/src/@daf/core/components/Screens/Admin/AdminModals/NewUser/index.jsx

@@ -2,7 +2,7 @@ import Modal from "../../../../Modal/index.jsx";
 import { Form, Select, Alert, Input } from "antd";
 import { useState, useEffect } from "react";
 
-export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [] }) {
+export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [], addUser = () => {} }) {
 	const [MainForm] = Form.useForm();
 	const [accountUsed, setAccountUsed] = useState(false);
 
@@ -18,8 +18,25 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 	const onSubmit = () => {
 		MainForm.validateFields()
 			.then((val) => {
-				console.log(val);
-				setAccountUsed(true);
+				// Create user object with the form data
+				const userData = {
+					firstName: val.firstName,
+					lastName: val.lastName,
+					email: val.email,
+					apps: {
+						sbg: {
+							role: val.role,
+							access: true
+						}
+					}
+				};
+				
+				// Add user to local state
+				addUser(userData);
+				
+				// Close modal and reset form
+				onClose();
+				MainForm.resetFields();
 			})
 			.catch(() => {});
 	};

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Edit/index.jsx

@@ -58,6 +58,18 @@ export default function Edit({
 		}));
 	}, []);
 
+	const addUser = useCallback((userData) => {
+		setIsChanged(true);
+		setData((prev) => ({
+			...prev,
+			users: [...(prev.users || []), {
+				...userData,
+				id: Date.now(), // Temporary ID
+				status: "unsaved"
+			}]
+		}));
+	}, []);
+
 	const onSuspend = () => {
 		Modal.confirm({
 			title: t("sbg-admin::suspend-title"),
@@ -118,6 +130,7 @@ console.log("good morning");
 					userRoles={userRoles}
 					deleteUser={deleteUser}
 					updateUser={updateUser}
+					addUser={addUser}
 					goTo={goTo}
 					accountStatuses={accountStatuses}
 					transferAdmin={transferAdmin}

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/index.jsx

@@ -29,6 +29,7 @@ export default function Users({
 	accountStatuses,
 	deleteUser = () => {},
 	updateUser = () => {},
+	addUser = () => {},
 	transferAdmin = () => {},
 }) {
 	const [hasError, setHasError] = useState(false);
@@ -177,6 +178,7 @@ export default function Users({
 				isOpen={newUserModalVisible}
 				onClose={() => setNewUserModalVisible(false)}
 				userRoles={userRoles}
+				addUser={addUser}
 			/>
 		</div>
 	);