datastake-daf 0.6.376 → 0.6.378

package/dist/components/index.js

@@ -54050,6 +54050,7 @@ function AddUserModal({
       setAccountUsed(true);
     }).catch(() => {});
   };
+  console.log("hellooooooooooooooooooooooooo");
   return /*#__PURE__*/jsxRuntime.jsx(Modal, {
     open: isOpen,
     title: "admin::edit-user",
@@ -54093,13 +54094,6 @@ function AddUserModal({
             }
           }
         })
-      }), accountUsed && /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
-        message: t("FB00001"),
-        type: "error",
-        className: "mb-2",
-        showIcon: true,
-        closable: true,
-        onClose: () => setAccountUsed(false)
       }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "role",
         label: t("Role"),
@@ -56910,7 +56904,8 @@ function NewUser({
   isOpen,
   onClose,
   defaultData,
-  userRoles = []
+  userRoles = [],
+  addUser = () => {}
 }) {
   const [MainForm] = antd.Form.useForm();
   const [accountUsed, setAccountUsed] = React.useState(false);
@@ -56924,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, {
@@ -56971,13 +56983,6 @@ function NewUser({
             }
           }
         })
-      }), accountUsed && /*#__PURE__*/jsxRuntime.jsx(antd.Alert, {
-        message: t("FB00001"),
-        type: "error",
-        className: "mb-2",
-        showIcon: true,
-        closable: true,
-        onClose: () => setAccountUsed(false)
       }), /*#__PURE__*/jsxRuntime.jsx(antd.Form.Item, {
         name: "role",
         label: t("Role"),
@@ -57248,6 +57253,7 @@ function Users({
   accountStatuses,
   deleteUser = () => {},
   updateUser = () => {},
+  addUser = () => {},
   transferAdmin = () => {}
 }) {
   const [hasError, setHasError] = React.useState(false);
@@ -57370,7 +57376,8 @@ function Users({
       t: t,
       isOpen: newUserModalVisible,
       onClose: () => setNewUserModalVisible(false),
-      userRoles: userRoles
+      userRoles: userRoles,
+      addUser: addUser
     })]
   });
 }
@@ -57606,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"),
@@ -57652,6 +57671,7 @@ function Edit({
       onCancel: () => {}
     });
   };
+  console.log("good morning");
   const renderItem = item => {
     if (item.type === "users") {
       return /*#__PURE__*/jsxRuntime.jsx(Users, {
@@ -57663,6 +57683,7 @@ function Edit({
         userRoles: userRoles,
         deleteUser: deleteUser,
         updateUser: updateUser,
+        addUser: addUser,
         goTo: goTo,
         accountStatuses: accountStatuses,
         transferAdmin: transferAdmin

package/dist/style/datastake/mapbox-gl.css

@@ -0,0 +1,330 @@
+/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
+
+/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
+.mapbox-gl-scope .mapboxgl-map {
+  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
+  overflow: hidden;
+  position: relative;
+  -webkit-tap-highlight-color: rgb(0 0 0/0);
+}
+
+.mapbox-gl-scope .mapboxgl-canvas {
+  left: 0;
+  position: absolute;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-canary {
+  background-color: salmon;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
+  cursor: grab;
+  -webkit-user-select: none;
+  user-select: none;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
+  cursor: pointer;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
+.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
+  cursor: grabbing;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
+  touch-action: pan-x pan-y;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: pinch-zoom;
+}
+
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
+.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
+  touch-action: none;
+}
+
+/* Control positioning */
+.mapbox-gl-scope .mapboxgl-ctrl-bottom,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
+.mapbox-gl-scope .mapboxgl-ctrl-left,
+.mapbox-gl-scope .mapboxgl-ctrl-right,
+.mapbox-gl-scope .mapboxgl-ctrl-top,
+.mapbox-gl-scope .mapboxgl-ctrl-top-left,
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  pointer-events: none;
+  position: absolute;
+  z-index: 2;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left {
+  left: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top {
+  left: 50%;
+  top: 0;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right {
+  right: 0;
+  top: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-right {
+  right: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
+  bottom: 0;
+  right: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom {
+  bottom: 0;
+  left: 50%;
+  transform: translateX(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
+  bottom: 0;
+  left: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-left {
+  left: 0;
+  top: 50%;
+  transform: translateY(-50%);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl {
+  clear: both;
+  pointer-events: auto;
+  transform: translate(0);
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0 0 10px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
+  float: right;
+  margin: 10px 10px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
+  float: right;
+  margin: 0 10px 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
+  float: left;
+  margin: 10px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
+.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
+  float: left;
+  margin: 0 0 10px 10px;
+}
+
+/* Control group styling */
+.mapbox-gl-scope .mapboxgl-ctrl-group {
+  background: #fff;
+  border-radius: 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
+  box-shadow: 0 0 0 2px #0000001a;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button {
+  background-color: initial;
+  border: 0;
+  box-sizing: border-box;
+  cursor: pointer;
+  display: block;
+  height: 29px;
+  outline: none;
+  overflow: hidden;
+  padding: 0;
+  width: 29px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
+  border-top: 1px solid #ddd;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
+  background-position: 50%;
+  background-repeat: no-repeat;
+  display: block;
+  height: 100%;
+  width: 100%;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
+.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
+  box-shadow: 0 0 2px 2px #0096ff;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
+  cursor: not-allowed;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
+  opacity: .25;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
+  border-radius: 4px 4px 0 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
+  border-radius: 0 0 4px 4px;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
+  border-radius: inherit;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
+  background-color: #0000000d;
+}
+
+/* Marker styles */
+.mapbox-gl-scope .mapboxgl-marker {
+  position: absolute;
+  z-index: 1;
+}
+
+.mapbox-gl-scope .mapboxgl-marker svg {
+  display: block;
+}
+
+/* Popup styles */
+.mapbox-gl-scope .mapboxgl-popup {
+  position: absolute;
+  text-align: center;
+  margin-bottom: 20px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
+  padding: 1px;
+  text-align: left;
+  border-radius: 12px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content {
+  margin: 13px 24px 13px 20px;
+  line-height: 1.3;
+  font-size: 13px;
+  min-height: 1px;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content p {
+  margin: 17px 0;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip-container {
+  width: 40px;
+  height: 20px;
+  position: absolute;
+  left: 50%;
+  margin-top: -1px;
+  margin-left: -20px;
+  overflow: hidden;
+  pointer-events: none;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  width: 17px;
+  height: 17px;
+  padding: 1px;
+  margin: -10px auto 0;
+  pointer-events: auto;
+  -webkit-transform: rotate(45deg);
+  -moz-transform: rotate(45deg);
+  -ms-transform: rotate(45deg);
+  transform: rotate(45deg);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
+.mapbox-gl-scope .mapboxgl-popup-tip {
+  background: white;
+  color: #333;
+  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button {
+  position: absolute;
+  top: 0;
+  right: 0;
+  border: none;
+  text-align: center;
+  width: 24px;
+  height: 24px;
+  font: 16px/24px Tahoma, Verdana, sans-serif;
+  color: #757575;
+  text-decoration: none;
+  background: transparent;
+}
+
+.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
+.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
+  color: #585858;
+}
+
+/* Attribution */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  background: #fff;
+  background: rgba(255, 255, 255, 0.8);
+  margin: 0;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution,
+.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
+  padding: 0 5px;
+  color: #333;
+  line-height: 1.4;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
+  text-decoration: none;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
+.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
+  text-decoration: underline;
+}
+
+/* Hide attribution by default */
+.mapbox-gl-scope .mapboxgl-ctrl-attribution {
+  display: none !important;
+}
+
+.mapbox-gl-scope .mapboxgl-ctrl-logo {
+  display: none !important;
+}

package/package.json

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

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

@@ -24,6 +24,8 @@ export default function AddUserModal({ isOpen, defaultData = {}, userRoles = [],
 			.catch(() => {});
 	};
 
+	console.log("hellooooooooooooooooooooooooo");
+
 	return (
 		<Modal
 			open={isOpen}
@@ -55,7 +57,7 @@ export default function AddUserModal({ isOpen, defaultData = {}, userRoles = [],
 						}}
 					/>
 				</Form.Item>
-				{accountUsed && (
+				{/* {accountUsed && (
 					<Alert
 						message={t("FB00001")}
 						type="error"
@@ -64,7 +66,7 @@ export default function AddUserModal({ isOpen, defaultData = {}, userRoles = [],
 						closable
 						onClose={() => setAccountUsed(false)}
 					/>
-				)}
+				)} */}
 
 				<Form.Item name="role" label={t("Role")} rules={[{ required: true }]}>
 					<Select

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(() => {});
 	};
@@ -45,7 +62,7 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 						}}
 					/>
 				</Form.Item>
-				{accountUsed && (
+				{/* {accountUsed && (
 					<Alert
 						message={t("FB00001")}
 						type="error"
@@ -54,7 +71,7 @@ export default function NewUser({ t, isOpen, onClose, defaultData, userRoles = [
 						closable
 						onClose={() => setAccountUsed(false)}
 					/>
-				)}
+				)} */}
 
 				<Form.Item name="role" label={t("Role")} rules={[{ required: true }]}>
 					<Select

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"),
@@ -105,7 +117,7 @@ export default function Edit({
 			onCancel: () => {},
 		});
 	};
-
+console.log("good morning");
 	const renderItem = (item) => {
 		if (item.type === "users") {
 			return (
@@ -118,6 +130,7 @@ export default function Edit({
 					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>
 	);