datastake-daf 0.6.843 → 0.6.845

package/dist/pages/index.js

@@ -14265,6 +14265,8 @@ const getFiltersConfig$e = ({
     value: item.value,
     label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label
   }));
+  const merged = [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])];
+  const deduped = Array.from(new Map(merged.map(item => [item.value, item])).values());
   if (activeTab === 'stakeholder') {
     return [{
       label: t("Stakeholder type"),
@@ -14291,7 +14293,7 @@ const getFiltersConfig$e = ({
     key: "type",
     type: "select",
     ...value,
-    options: [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])] ?? []
+    options: deduped
   }];
 };
 
@@ -34207,10 +34209,14 @@ const inputTypeComponent$1 = {
         }
         return {
           label: o.label,
-          items: opts.filter(op => op.group === o.value)
+          items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
         };
       });
-      const notGrouped = opts.filter(op => !gKeys.includes(op.group));
+      const notGrouped = opts.filter(op => {
+        const filterValue = op?.filters?.[0]?.value;
+        if (!filterValue) return true;
+        return !gKeys.some(key => filterValue.includes(key));
+      });
       if (notGrouped.length) {
         groupOptions.unshift(...notGrouped);
       }
@@ -34374,20 +34380,19 @@ const inputTypeComponent$1 = {
         }
         return {
           label: o.label,
-          items: opts.filter(op => op.group === o.value)
+          items: opts.filter(op => op?.filters?.[0]?.value.includes(o.value))
         };
       });
-      const notGrouped = opts.filter(op => !gKeys.includes(op.group));
+      const notGrouped = opts.filter(op => {
+        const filterValue = op?.filters?.[0]?.value;
+        if (!filterValue) return true;
+        return !gKeys.some(key => filterValue.includes(key));
+      });
       if (notGrouped.length) {
         groupOptions.unshift(...notGrouped);
       }
       opts = groupOptions;
     }
-    console.log({
-      maxWidth,
-      staticWidth,
-      fullWidth
-    });
     return /*#__PURE__*/jsxRuntime.jsx(antd.Select, {
       size: "medium",
       allowClear: true,
@@ -62422,7 +62427,8 @@ const namespaceMap = {
   "armed-groups": "stakeholder",
   scl: "location",
   testimonials: 'event',
-  'corrective-actions': 'event'
+  'corrective-actions': 'event',
+  kyc: 'stakeholder'
 };
 
 const getColumns = ({
@@ -62682,7 +62688,10 @@ const LinkingTemplate = ({
   }), [conf]);
   const id = conf.allData.id;
   const dataSource = conf?.linkingTemplateContextData?.[id];
-  const _namespace = namespaceMap[namespace];
+
+  // Derive namespace from conf.allData.form if not provided
+  const derivedNamespace = namespace || conf.allData?.form;
+  const _namespace = namespaceMap[derivedNamespace] || derivedNamespace;
   const changeData = async () => {
     try {
       const _data = await LinkedSubjectsService$1.getLinkedSubjects({

package/package.json

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

package/src/@daf/core/components/EditForm/helper.js

@@ -778,10 +778,15 @@ export const inputTypeComponent = {
 				}
 				return {
 					label: o.label,
-					items: opts.filter((op) => op.group === o.value),
+					items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
 				};
 			});
-			const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
+			const notGrouped = opts.filter((op) => {
+				const filterValue = op?.filters?.[0]?.value;
+				if (!filterValue) return true;
+				
+				return !gKeys.some(key => filterValue.includes(key));
+			});
 			if (notGrouped.length) {
 				groupOptions.unshift(...notGrouped);
 			}
@@ -975,18 +980,21 @@ export const inputTypeComponent = {
 				}
 				return {
 					label: o.label,
-					items: opts.filter((op) => op.group === o.value),
+					items: opts.filter((op) => op?.filters?.[0]?.value.includes(o.value)),
 				};
 			});
-			const notGrouped = opts.filter((op) => !gKeys.includes(op.group));
+			const notGrouped = opts.filter((op) => {
+				const filterValue = op?.filters?.[0]?.value;
+				if (!filterValue) return true;
+				
+				return !gKeys.some(key => filterValue.includes(key));
+			});
 			if (notGrouped.length) {
 				groupOptions.unshift(...notGrouped);
 			}
 			opts = groupOptions;
 		}
 
-		console.log({maxWidth, staticWidth, fullWidth});
-
 		return (
 			<Select
 				size="medium"

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

@@ -1,7 +1,7 @@
 import Modal from "../../../../Modal/index.jsx";
-import { Form, Select, Input, Alert } from "antd";
+import { Form, Select, Input, Alert, message } from "antd";
 import { useState, useEffect, useMemo } from "react";
-
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
 export default function NewAccount({
 	t,
 	isOpen,
@@ -12,26 +12,32 @@ export default function NewAccount({
 	inviteAccount,
 	isPending=false,
 	accountToEdit,
+	countries
 }) {
 	const [MainForm] = Form.useForm();
 	const [loading, setLoading] = useState(false);
 	const [accountUsed, setAccountUsed] = useState(false);
 
 
-
 	const isEdit = useMemo(() => accountToEdit && typeof accountToEdit === "object", [accountToEdit]);
 
+	const selectedCountry = useMemo(
+		() => findOptions(accountToEdit?.otherData?.country, countries),
+		[accountToEdit?.otherData?.country, countries]
+	);	
+	console.log(selectedCountry, "selectedCountry");
 	useEffect(() => {
 		if (accountToEdit && typeof accountToEdit === "object") {
 			MainForm.setFieldsValue({
 				name: accountToEdit.name,
 				email: accountToEdit.email,
 				type: accountToEdit?.otherData?.interface,
+				country: selectedCountry,
 			});
 		} else {
 			MainForm.resetFields();
 		}
-		}, [accountToEdit, MainForm]);
+	}, [accountToEdit, MainForm, selectedCountry]);
 
 	const onSubmit = async () => {
 		try {
@@ -45,6 +51,7 @@ export default function NewAccount({
 					data: val, 
 					isPending: accountToEdit.status === 'pending' || isPending 
 				});
+				message.success(t("Account successfully updated"));
 			} else {
 				if (!inviteAccount) {
 					throw new Error("inviteAccount function is required for creating new accounts");
@@ -80,7 +87,7 @@ export default function NewAccount({
 					<Input placeholder={t("Type")} />
 				</Form.Item>
 				
-			
+			{!isEdit && (
 					<Form.Item
 						name="email"
 						label={t("Email")}
@@ -88,7 +95,13 @@ export default function NewAccount({
 					>
 						<Input placeholder={t("Type")} />
 					</Form.Item>
-			
+				)}
+			{isEdit && (
+				<Form.Item name="country" label={t("Country")} rules={[{ required: true }]}>
+				<Select placeholder={t("Select")} options={countries} />
+			</Form.Item>
+				
+				)}
 				<Form.Item name="type" label={t("Type")} rules={[{ required: true }]}>
 					<Select placeholder={t("Select")} options={accountTypes || []} />
 				</Form.Item>

package/src/@daf/core/components/Screens/Admin/AdminScreens/Accounts.jsx

@@ -49,6 +49,7 @@ export default function AdminAccountsScreen({ config }) {
 	const query = useQuery ? useQuery() : { get: () => null };
 	const [addAccountVisible, setAddAccountVisible] = useState(!!query.get("create"));
 	const [accountToEdit, setAccountToEdit] = useState(null);
+	const [refetchTrigger, setRefetchTrigger] = useState(0);
 
 
 
@@ -102,6 +103,7 @@ function handleCopyInvitation(account) {
 				headerTitle="accounts"
 				actionButton={actionButtons}
 				getData={handleGetData}
+				refetchTrigger={refetchTrigger}
 				config={{
 					accountTypes,
 					addAccountVisible,
@@ -125,8 +127,9 @@ function handleCopyInvitation(account) {
 				setAccountToEdit(null);
 			}}
 			accountTypes={accountTypes}
-			countriesOptions={options?.countries}
+			countries={options?.countries}
 			fetchData={() => {
+				setRefetchTrigger((prev) => prev + 1);
 			}}
 			inviteAccount={(data) => AdminService.inviteAccount(data)}
 			updateAccount={({ data, id, isPending }) => AdminService.updateAccount({ data, id, isPending })}

package/src/@daf/core/components/Screens/Admin/AdminTables/AccountTable/index.jsx

@@ -33,6 +33,7 @@ export default function AccountTable({
 	defaultPageSize = 20,
 	actionButton,
 	inviteAccount,
+	refetchTrigger,
 }) {
 	const accountTypes = config?.accountTypes;
 	const [showFilters, setShowFilters] = useState(false);
@@ -61,6 +62,7 @@ export default function AccountTable({
 		getRedirectLink,
 		getData,
 		fetchPendingOnMount: true,
+		refetchTrigger,
 	});
 
 	const selectOptions = useMemo(() => {

package/src/@daf/pages/Dashboards/UserDashboard/components/MineSites/config.js

@@ -14,6 +14,15 @@ export const getFiltersConfig = ({t, filters, activeTab, options}) => {
 		label: typeof item.label === 'object' ? Object.values(item.label)[1] : item.label,
 	}))
 
+	const merged = [
+		...(options?.locationCategories || []),
+		...(options?.productionSiteCategories || [])
+	  ];
+	  
+	  const deduped = Array.from(
+		new Map(merged.map(item => [item.value, item])).values()
+	  );
+
 	if(activeTab === 'stakeholder') {
 		return [
 			{
@@ -47,7 +56,7 @@ export const getFiltersConfig = ({t, filters, activeTab, options}) => {
 			key: "type",
 			type: "select",
 			...value,
-			options: [...(options?.locationCategories || []), ...(options?.productionSiteCategories || [])] ?? [],
+			options: deduped
 		},
 	];
 }