datastake-daf 0.6.754 → 0.6.756

package/package.json

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

package/src/@daf/core/components/Graphs/components/BaseGraph.jsx

@@ -54,9 +54,10 @@ const BaseGraph = forwardRef(function BaseGraph(
 
 		requestAnimationFrame(() => {
 			fitView({
-				padding: 0.1,
+				padding: 0.4,
 				nodes: [...nodesToFit],
 				duration: withDuration ? 300 : undefined,
+				maxZoom: 0.8,
 			});
 		});
 	}, [JSON.stringify(nodesToFit), withDuration]);
@@ -82,8 +83,9 @@ const BaseGraph = forwardRef(function BaseGraph(
 					minZoom={minZoom}
 					maxZoom={maxZoom}
 					attributionPosition="top-left"
+					fitView={true} // zoom out on default
 					fitViewOptions={{
-						padding: 0.1,
+						padding: 0.2, //zoom out on default
 						duration: withDuration ? 300 : undefined,
 					}}
 					{...props}

package/src/@daf/core/components/Icon/configs/ClockPlus.js

@@ -0,0 +1,14 @@
+const config = {
+	viewBox: "0 0 19 19",
+	children: (
+		<path 
+            d="M17.3506 10.1375C17.3942 9.79224 17.4167 9.44041 17.4167 9.08333C17.4167 4.48096 13.6857 0.75 9.08333 0.75C4.48096 0.75 0.75 4.48096 0.75 9.08333C0.75 13.6857 4.48096 17.4167 9.08333 17.4167C9.44617 17.4167 9.80359 17.3935 10.1542 17.3485M9.08333 4.08333V9.08333L12.1986 10.641M14.9167 17.4167V12.4167M12.4167 14.9167H17.4167" 
+            stroke="currentColor" 
+            strokeWidth="1.5" 
+            strokeLinecap="round" 
+            strokeLinejoin="round"
+        />
+	),
+};
+
+export default config;

package/src/@daf/core/components/Icon/configs/WaziDarkIcon.js

@@ -0,0 +1,15 @@
+const config = {
+    viewBox: '0 0 25 26',
+    children: (
+        <path 
+            d="M12.5001 0C19.4037 2.39999e-07 25.0001 5.59644 25.0001 12.5C25.0001 19.0635 19.941 24.4456 13.5099 24.96C13.1457 24.9946 12.7787 25.0126 12.4103 25.0146H12.1056C5.42401 25.0146 0.00713129 19.5985 0.00695801 12.917C0.00242724 12.7787 0.000122101 12.6394 0.00012207 12.5C0.00012207 5.59644 5.59656 0 12.5001 0ZM12.1642 5.32715C8.53558 5.32715 5.65747 8.46702 5.65735 12.2588V13.4951C5.65735 17.287 8.5355 20.4268 12.1642 20.4268C15.7926 20.4264 18.671 17.2868 18.671 13.4951V12.2588C18.6709 8.46722 15.7925 5.32748 12.1642 5.32715ZM12.1642 6.42676C15.1149 6.42709 17.5703 9.00217 17.5704 12.2588V13.4951C17.5704 16.7518 15.115 19.3268 12.1642 19.3271C9.21313 19.3271 6.75696 16.7521 6.75696 13.4951V12.2588C6.75708 9.00197 9.21321 6.42676 12.1642 6.42676ZM11.7618 9.40918L8.86145 12.5166L8.51086 12.8926L8.86145 13.2676L11.7618 16.375L12.1642 16.8057L12.5665 16.375L15.4669 13.2676L15.8175 12.8926L15.4669 12.5166L12.5665 9.40918L12.1642 8.97852L11.7618 9.40918ZM13.798 13.4424L12.1632 15.1924L10.5294 13.4424H13.798ZM13.798 12.3418H10.5294L12.1632 10.5908L13.798 12.3418Z" 
+            fill="currentColor"
+        />
+    ),
+    tag: ['logo']
+  }
+  
+  export default config;
+  
+  
+  

package/src/@daf/core/components/Icon/configs/index.js

@@ -222,6 +222,8 @@ import Aid from "./Aid";
 import Bear from "./Bear";
 import Security from "./Security";
 import Minus from "./Minus";
+import ClockPlus from "./ClockPlus";
+import WaziDarkIcon from "./WaziDarkIcon";
 
 const config = {
 	AppAdmin,
@@ -448,6 +450,8 @@ const config = {
 	Bear,
 	Security,
 	Minus,
+	ClockPlus,
+	WaziDarkIcon,
 };
 
 export default config;

package/src/@daf/core/components/Screens/BaseScreen/index.jsx

@@ -104,8 +104,8 @@ const BaseScreen = ({
 	});
 
 	useEffect(() => {
-		if (typeof data?.meta?.total === "number") {
-			setPagination((prev) => ({ ...prev, total: data?.meta?.total }));
+		if (typeof (data?.meta?.total || data?.totalItems) === "number") {
+			setPagination((prev) => ({ ...prev, total: (data?.meta?.total || data?.totalItems) }));
 		}
 	}, [data]);
 
@@ -161,7 +161,7 @@ const BaseScreen = ({
 						goNext={goNext}
 						canGoNext={canGoNext}
 						canGoPrev={canGoPrev}
-						totalItems={pagination.total}
+						totalItems={pagination.total || pagination.pageSize}
 						doTotalItems
 						onChangePagination={(val) => {
 							onTableChange({ ...pagination, current: 1, pageSize: val });

package/src/@daf/core/components/Screens/Users/columns.js

@@ -0,0 +1,216 @@
+import React from 'react';
+import { Modal, Tag, Typography, message ,Tooltip} from "antd";
+
+import { renderDateFormatted } from '../../../../../helpers/Forms.js';
+import MoreMenu from '../../../../core/components/Table/MoreMenu/index.jsx';
+const getLinkValue = (value, linkingObject) => {
+  if(linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+}
+
+export const getColumns = ({t, goTo, user, 	removeUser = () => {},
+resendInvite = () => {},
+setUserToEdit = () => {},
+userRoles = [],
+company = {},
+canCreate = false,
+app}) => [
+    // {
+    //     dataIndex: 'datastakeId',
+    //     title: t('ID'),
+    //     ellipsis: true,
+    //     show: true,
+    //     render: (v, all) => {
+    //       if (all.empty) {
+    //         return <div className="daf-default-cell" />
+    //       }
+    
+    //       return <Tooltip title={v}>{v}</Tooltip>;
+    //     },
+    // },
+    {
+        dataIndex: 'firstName',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },     
+    {
+        dataIndex: 'lastName',
+        title: t('Last Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+      
+            return <Tooltip title={v}>{v}</Tooltip>;
+          },
+      },     
+    {
+        dataIndex: 'email',
+        title: t('Email'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+            if (all.empty) {
+              return <div className="daf-default-cell" />
+            }
+      
+            return <Tooltip title={v}>{v}</Tooltip>;
+          },
+   
+        },
+        {
+          title: t("Status"),
+          dataIndex: "status",
+          key: "status",
+          width: 150,
+          ellipsis: false,
+          show: true,
+          render: (status, users) => {
+            if (users.empty) {
+              return null;
+            }
+    
+            if (status === "inactive") {
+              return (
+                <Tag color="red" style={{ width: 100, textAlign: "center" }}>
+                  {t("Blocked")}
+                </Tag>
+              );
+            }
+    
+            if (status === "active") {
+              return (
+                <Tag color="green" style={{ width: 100, textAlign: "center" }}>
+                  {t("Active")}
+                </Tag>
+              );
+            }
+    
+            return (
+              <Tag color="orange" style={{ width: 100, textAlign: "center" }}>
+                {t("Pending")}
+              </Tag>
+            );
+          },
+        },
+    {
+        title: t("Last Login"),
+        dataIndex: "lastLogin",
+        key: "lastLogin",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
+   {
+    title: t("User Role"),
+    dataIndex: "roleName",
+    key: "role",
+    show: true,
+    render: (val, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />;
+        }
+
+        // Display role name if available, fallback to role ID
+        const displayValue = val || all.role;
+        return <Tooltip title={displayValue}>{displayValue}</Tooltip>;
+      },
+    },
+    {
+			title: t(""),
+			key: "actions",
+			width: 60,
+			show: removeUser || setUserToEdit,
+			render: (row, all) => {
+				if (all.empty) {
+					return <div className="daf-default-cell" />;
+				}
+
+				const _v = userRoles?.find((r) => r.value === all.role);
+
+				const items = [
+					removeUser
+						? {
+								key: "removeUser",
+								onClick: () => {
+									Modal.confirm({
+										title: t(
+											"Are you sure you want to remove this user from your organisation?",
+										),
+										onOk: () => removeUser(all.id),
+										cancelText: t("No"),
+										okText: "Yes",
+										closable: true,
+									});
+								},
+								label: t("Remove User"),
+						  }
+						: null,
+            setUserToEdit						? {
+								key: "editPermission",
+								onClick: () => setUserToEdit(all),
+								disabled: all.isAdmin || _v?.isForAppAdmin,
+								label: t("Edit Permissions"),
+						  }
+						: null,
+					all.invitationToken && canCreate
+						? {
+								key: "copyLink",
+								onClick: () => {
+									if (location.pathname.includes(`/${APP}`)) {
+										navigator.clipboard.writeText(
+											`${window.location.host}/${app}/r/${company.inviteToken}/${all.invitationToken}`,
+										);
+									} else {
+										navigator.clipboard.writeText(
+											`${window.location.host}/r/${company.inviteToken}/${all.invitationToken}`,
+										);
+									}
+									message.info({ content: t("Invitation link copied") });
+								},
+								label: t("Copy Invitation Link"),
+						  }
+						: null,
+					all.invitationToken && canCreate
+						? {
+								key: "resendInvite",
+								onClick: () => {
+									Modal.confirm({
+										title: t(
+											"Are you sure you want to invite this user again? This user will receive a new notification",
+										),
+										onOk: () => resendInvite(all.id),
+										cancelText: t("No"),
+										okText: "Yes",
+										closable: true,
+									});
+								},
+								label: t("Resend Invite"),
+						  }
+						: null,
+				];
+
+				return <MoreMenu items={items} />;
+			},
+			client: false,
+		},
+].filter((column) => column.show !== false);

package/src/@daf/core/components/Screens/Users/config.js

@@ -0,0 +1,174 @@
+export const checkboxConfig = {
+	name: 'Name',
+	datastakeId: 'ID'
+}
+
+export const getFiltersConfig = ({t}) => {
+    return {
+		email: {
+		  type: 'text',
+		  label: 'Email',
+		  placeholder: (t) => `${t('Filter by')} ${t('Email').toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+
+
+		status: {
+		  type: "select",
+		  label: "Status",
+		  placeholder: (t) => `${t("Filter by")} ${t("Status").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { fley: 1 },
+		  getLabel: (option) => option.label,
+		  getValue: (option) => option.value,
+		},
+		timeframe: {
+		  type: "timeframe",
+		  label: "Timeframe",
+		  placeholder: (t) => `${t("Filter by")} ${t("Timeframe").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+		userRole: {
+		  type: "select",
+		  label: "User Role",
+		  placeholder: (t) => `${t("Filter by")} ${t("User Role").toLowerCase()}`,
+		  style: { flex: 1 },
+		  labelStyle: { flex: 1 },
+		},
+	}
+}
+
+export const filtersConfig = {
+	name: '',
+	datastakeId: '',
+};
+
+export const getFilterOptions = (options, t) => {
+	const {
+		emailOptions = [],
+		statusOptions = [],
+		timeframeOptions = [],
+		userRoleOptions = [],
+	  } = options || {};
+	console.log({options})
+
+	const _default  = {
+  timeframe: timeframeOptions,
+  email: emailOptions,
+  status: statusOptions,
+  userRole: userRoleOptions,
+		status: [
+			{
+				value: "active",
+				label: "Active",
+			},
+			{
+				value: "pending",
+				label: "Pending",
+			},
+		],
+	}
+
+	return _default;
+}
+
+export const getUserForm = ({ t, userRoles = [], APP }) => {
+	return {
+		user: {
+			position: 0,
+			firstName: {
+				group: "user",
+				section: "user",
+				moduleScope: {
+					cadd: ["scoping", "new", "linking-extra"],
+					pme: ["scoping", "new", "linking-extra"],
+				},
+				label: t("First Name"),
+				comment: false,
+				type: "text",
+				rules: [
+					{
+						required: true,
+						message: "This field is required",
+					},
+				],
+				mergeStrategy: "simple",
+				position: 1,
+			},
+			lastName: {
+				group: "user",
+				section: "user",
+				moduleScope: {
+					cadd: ["scoping", "new", "linking-extra"],
+					pme: ["scoping", "new", "linking-extra"],
+				},
+				label: t("Last Name"),
+				comment: false,
+				type: "text",
+				rules: [
+					{
+						required: true,
+						message: "This field is required",
+					},
+				],
+				mergeStrategy: "simple",
+				position: 2,
+			},
+			email: {
+				group: "user",
+				section: "user",
+				moduleScope: {
+					cadd: ["scoping", "new", "linking-extra"],
+					pme: ["scoping", "new", "linking-extra"],
+				},
+				label: t("Email"),
+				comment: false,
+				type: "text",
+				rules: [
+					{
+						required: true,
+						message: "This field is required",
+					},
+					{
+						type: "email",
+						message: "errors::field must be email",
+					},
+				],
+				mergeStrategy: "simple",
+				position: 3,
+			},
+			role: {
+				group: "user",
+				section: "user",
+				moduleScope: {
+					cadd: ["scoping", "new", "linking", "linking-extra", "admin"],
+					pme: ["scoping", "new", "linking", "linking-extra", "admin"],
+				},
+				label: t("User Role"),
+				placeholder: t("User Role"),
+				comment: false,
+				type: "select",
+				options: userRoles
+					.filter((r) => r.canBeAssignedToSubUsers && r.app === APP)
+					.map((v) => ({
+						label: t(v.label),
+						value: v.value,
+					})),
+				optionsName: "userRoles",
+				// tooltip: <UserRolePopover t={t} />,
+				sortOptions: true,
+				rules: [
+					{
+						required: true,
+						message: "This field is required",
+					},
+				],
+				position: 4,
+			},
+		},
+	};
+};

package/src/@daf/core/components/Screens/Users/create.jsx

@@ -0,0 +1,63 @@
+import React, { useMemo } from 'react'
+import { getUserForm } from './config.js';
+import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
+
+const UsersCreate = ({
+    onSubmitted = () => {}, 
+    onCancel = () => {}, 
+    user = {}, 
+    APP, 
+    query, 
+    goTo = () => {}, 
+    t = () => {}, 
+    ajaxForms = {}, 
+    changeAjaxForms = () => {}, 
+    ajaxOptions = {}, 
+    changeAjaxOptions = () => {}, 
+    getAppHeader = () => {},
+    getApiBaseUrl = () => {}, 
+    userToEdit = null,
+    userRoles = [],
+}) => {
+    const disabledInputs = useMemo(() => !userToEdit ? [] : ['firstName', 'lastName', 'email'], [userToEdit]);
+    const data = useMemo(() => ({ ...(userToEdit || {}), userRole: userToEdit?.role }), [userToEdit]);
+    const form = useMemo(() => getUserForm({ t, userRoles, APP }), [t, userRoles, APP]);
+
+    return (
+        <div className="daf-create-form">
+            <DynamicForm 
+                form={form}
+                data={data}
+                showSaveAndNext={false}
+                module={APP}
+                onCancel={onCancel}
+                isCreate
+                t={t}
+                user={user}
+                ajaxForms={ajaxForms}
+                ajaxOptions={ajaxOptions}
+                getAppHeader={getAppHeader}
+                getApiBaseUrl={getApiBaseUrl}
+                changeAjaxOptions={changeAjaxOptions}
+                app={APP}
+                query={query}
+                goTo={goTo}
+                changeAjaxForms={changeAjaxForms}
+                disabledInputs={disabledInputs}
+                submit={(payload) => {
+                    onSubmitted({
+                        ...payload,
+                        apps: {
+                            [APP]: {
+                                ...((userToEdit?.apps || {})[APP] || {}),
+                                role: payload.role,
+                            },
+                        },
+                    });
+                }}
+            />
+        </div>
+    )
+}
+
+export default UsersCreate