datastake-daf 0.6.843 → 0.6.844

package/dist/pages/index.js

@@ -62422,7 +62422,8 @@ const namespaceMap = {
   "armed-groups": "stakeholder",
   scl: "location",
   testimonials: 'event',
-  'corrective-actions': 'event'
+  'corrective-actions': 'event',
+  kyc: 'stakeholder'
 };
 
 const getColumns = ({
@@ -62682,7 +62683,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.844",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

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/ResetPassword/index.jsx

@@ -1,228 +1,228 @@
-// import React from "react";
-// import DafButton from "../../../Button/index.jsx";
-// import Loading from "../../../Loading/index.jsx";
-// import AuthForm from "../../../AuthForm/index.jsx";
-
-// const step = 1;
-
-// export default function ResetPassword({
-//   resetRequestSuccedded,
-//   resetRequestError,
-//   submitting,
-//   requestResetPassword,
-//   resetPassword,
-//   params: propParams = {},
-//   Layout,
-//   goTo,
-//   t,
-//   theme,
-//   errors,
-
-//   loginPath: loginPathProp,
-// }) {
-//   const { app, confirmationToken } = propParams;
-
-//   const getLogInLink = () => {
-//     if (loginPathProp) return loginPathProp;
-//     if (app) return `/${app}/login`;
-//     return "/login";
-//   };
-
-//   const handleGoToLogin = () => {
-//     const link = getLogInLink();
-//     if (goTo && typeof goTo === "function") {
-//       goTo(link);
-//     } else {
-//       window.location.href = link;
-//     }
-//   };
-
-//   const title = !confirmationToken
-//     ? resetRequestSuccedded
-//       ? "Thank you"
-//       : "Reset Password"
-//     : resetRequestSuccedded
-//       ? "Password updated"
-//       : "Create Password";
-
-//   const subTitle = !confirmationToken
-//     ? resetRequestSuccedded
-//       ? "A password reset link has been sent to your email address. If you can’t find the message in your inbox, please check your spam folder!"
-//       : "Please enter your email, to get a link and request a new password."
-//     : resetRequestSuccedded
-//       ? "Your password has been updated, click in the button below to log in."
-//       : "Please set up your new password.";
-
-//   const requestResetFields = [
-//     {
-//       name: "email",
-//       label: t("Email"),
-//       type: "input",
-//       required: true,
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::email should not be empty"),
-//         },
-//         {
-//           pattern:
-//             /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
-//           message: t("errors::email is not valid"),
-//         },
-//       ],
-//       placeholder: t("Email"),
-//     },
-//   ];
-
-//   const resetPasswordFields = [
-//     {
-//       name: "password",
-//       label: t("Enter password"),
-//       type: "password",
-//       required: true,
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::password should not be empty"),
-//         },
-//       ],
-//       placeholder: t("••••••••"),
-//     },
-//     {
-//       name: "confirmPassword",
-//       label: t("Confirm password"),
-//       type: "password",
-//       required: true,
-//       dependencies: ["password"],
-//       rules: [
-//         {
-//           required: true,
-//           message: t("errors::password should not be empty"),
-//         },
-//         ({ getFieldValue }) => ({
-//           validator(rule, value) {
-//             if (!value || getFieldValue("password") === value) {
-//               return Promise.resolve();
-//             }
-//             return Promise.reject(t("errors::passwordNotMatch"));
-//           },
-//         }),
-//       ],
-//       placeholder: t("••••••••"),
-//     },
-//   ];
-
-//   const handleRequestResetSubmit = (values) => {
-//     requestResetPassword(values);
-//   };
-
-//   const handleResetPasswordSubmit = (values) => {
-
-//     resetPassword({
-//       ...values,
-//       passConfirmationToken: confirmationToken,
-//     });
-//   };
-
-//   const currentTheme = theme || window.theme;
-
-//   const Content = (
-//     <>
-//       {!resetRequestSuccedded && !confirmationToken && (
-//         <>
-//           <AuthForm
-//             fields={requestResetFields}
-//             onSubmit={handleRequestResetSubmit}
-//             submitText={t("Get Link")}
-//             errors={errors}
-//             t={t}
-//             executeRecaptcha={() => Promise.resolve(true)}
-//             theme={currentTheme}
-//             submitButtonProps={{
-//               loading: submitting,
-//             }}
-//           />
-//           <div className="mt-4">
-//             <DafButton
-//               type="default"
-//               className="normal-br"
-//               style={
-//                 currentTheme
-//                   ? {
-//                       borderColor: currentTheme.colorPrimary,
-//                       color: currentTheme.colorPrimary,
-//                     }
-//                   : {}
-//               }
-//               onClick={handleGoToLogin}
-//             >
-//               {t("Back")}
-//             </DafButton>
-//           </div>
-
-//           {resetRequestError ? (
-//             <div
-//               className="ant-form-item-explain errors-cont no-pt mt-3"
-//               style={{ color: "#ff4d4f" }}
-//             >
-//               {t(resetRequestError)}
-//             </div>
-//           ) : null}
-//         </>
-//       )}
-
-//       {!resetRequestSuccedded && confirmationToken && (
-//         <AuthForm
-//           fields={resetPasswordFields}
-//           onSubmit={handleResetPasswordSubmit}
-//           submitText={t("Reset Password")}
-//           errors={errors}
-//           t={t}
-//           executeRecaptcha={() => Promise.resolve(true)}
-//           theme={currentTheme}
-//           submitButtonProps={{
-//             loading: submitting,
-//           }}
-//         />
-//       )}
-
-//       {resetRequestSuccedded && confirmationToken && (
-//         <div className="buttons">
-//           <DafButton
-//             type="primary"
-//             className="normal-br"
-//             style={
-//               currentTheme
-//                 ? {
-//                     backgroundColor: currentTheme.colorPrimary,
-//                     borderColor: currentTheme.colorPrimary,
-//                   }
-//                 : {}
-//             }
-//             onClick={handleGoToLogin}
-//           >
-//             {t("Log In")}
-//           </DafButton>
-//         </div>
-//       )}
-
-//       {resetRequestSuccedded && !confirmationToken && null}
-//     </>
-//   );
-
-//   if (Layout) {
-//     return (
-//       <Layout app={app} step={step} title={title} subTitle={subTitle}>
-//         {Content}
-//       </Layout>
-//     );
-//   }
-
-//   return (
-//     <div style={{ padding: 20, maxWidth: 400, margin: "0 auto" }}>
-//       <h2>{title}</h2>
-//       <p>{subTitle}</p>
-//       {Content}
-//     </div>
-//   );
-// }
+import React from "react";
+import DafButton from "../../../Button/index.jsx";
+import Loading from "../../../Loading/index.jsx";
+import AuthForm from "../../../AuthForm/index.jsx";
+
+const step = 1;
+
+export default function ResetPassword({
+  resetRequestSuccedded,
+  resetRequestError,
+  submitting,
+  requestResetPassword,
+  resetPassword,
+  params: propParams = {},
+  Layout,
+  goTo,
+  t,
+  theme,
+  errors,
+
+  loginPath: loginPathProp,
+}) {
+  const { app, confirmationToken } = propParams;
+
+  const getLogInLink = () => {
+    if (loginPathProp) return loginPathProp;
+    if (app) return `/${app}/login`;
+    return "/login";
+  };
+
+  const handleGoToLogin = () => {
+    const link = getLogInLink();
+    if (goTo && typeof goTo === "function") {
+      goTo(link);
+    } else {
+      window.location.href = link;
+    }
+  };
+
+  const title = !confirmationToken
+    ? resetRequestSuccedded
+      ? "Thank you"
+      : "Reset Password"
+    : resetRequestSuccedded
+      ? "Password updated"
+      : "Create Password";
+
+  const subTitle = !confirmationToken
+    ? resetRequestSuccedded
+      ? "A password reset link has been sent to your email address. If you can’t find the message in your inbox, please check your spam folder!"
+      : "Please enter your email, to get a link and request a new password."
+    : resetRequestSuccedded
+      ? "Your password has been updated, click in the button below to log in."
+      : "Please set up your new password.";
+
+  const requestResetFields = [
+    {
+      name: "email",
+      label: t("Email"),
+      type: "input",
+      required: true,
+      rules: [
+        {
+          required: true,
+          message: t("errors::email should not be empty"),
+        },
+        {
+          pattern:
+            /^[a-zA-Z0-9.!#$%&’*+/=?^_`{|}~-]+@[a-zA-Z0-9-]+(?:\.[a-zA-Z0-9-]+)*$/,
+          message: t("errors::email is not valid"),
+        },
+      ],
+      placeholder: t("Email"),
+    },
+  ];
+
+  const resetPasswordFields = [
+    {
+      name: "password",
+      label: t("Enter password"),
+      type: "password",
+      required: true,
+      rules: [
+        {
+          required: true,
+          message: t("errors::password should not be empty"),
+        },
+      ],
+      placeholder: t("••••••••"),
+    },
+    {
+      name: "confirmPassword",
+      label: t("Confirm password"),
+      type: "password",
+      required: true,
+      dependencies: ["password"],
+      rules: [
+        {
+          required: true,
+          message: t("errors::password should not be empty"),
+        },
+        ({ getFieldValue }) => ({
+          validator(rule, value) {
+            if (!value || getFieldValue("password") === value) {
+              return Promise.resolve();
+            }
+            return Promise.reject(t("errors::passwordNotMatch"));
+          },
+        }),
+      ],
+      placeholder: t("••••••••"),
+    },
+  ];
+
+  const handleRequestResetSubmit = (values) => {
+    requestResetPassword(values);
+  };
+
+  const handleResetPasswordSubmit = (values) => {
+
+    resetPassword({
+      ...values,
+      passConfirmationToken: confirmationToken,
+    });
+  };
+
+  const currentTheme = theme || window.theme;
+
+  const Content = (
+    <>
+      {!resetRequestSuccedded && !confirmationToken && (
+        <>
+          <AuthForm
+            fields={requestResetFields}
+            onSubmit={handleRequestResetSubmit}
+            submitText={t("Get Link")}
+            errors={errors}
+            t={t}
+            executeRecaptcha={() => Promise.resolve(true)}
+            theme={currentTheme}
+            submitButtonProps={{
+              loading: submitting,
+            }}
+          />
+          <div className="mt-4">
+            <DafButton
+              type="default"
+              className="normal-br"
+              style={
+                currentTheme
+                  ? {
+                      borderColor: currentTheme.colorPrimary,
+                      color: currentTheme.colorPrimary,
+                    }
+                  : {}
+              }
+              onClick={handleGoToLogin}
+            >
+              {t("Back")}
+            </DafButton>
+          </div>
+
+          {resetRequestError ? (
+            <div
+              className="ant-form-item-explain errors-cont no-pt mt-3"
+              style={{ color: "#ff4d4f" }}
+            >
+              {t(resetRequestError)}
+            </div>
+          ) : null}
+        </>
+      )}
+
+      {!resetRequestSuccedded && confirmationToken && (
+        <AuthForm
+          fields={resetPasswordFields}
+          onSubmit={handleResetPasswordSubmit}
+          submitText={t("Reset Password")}
+          errors={errors}
+          t={t}
+          executeRecaptcha={() => Promise.resolve(true)}
+          theme={currentTheme}
+          submitButtonProps={{
+            loading: submitting,
+          }}
+        />
+      )}
+
+      {resetRequestSuccedded && confirmationToken && (
+        <div className="buttons">
+          <DafButton
+            type="primary"
+            className="normal-br"
+            style={
+              currentTheme
+                ? {
+                    backgroundColor: currentTheme.colorPrimary,
+                    borderColor: currentTheme.colorPrimary,
+                  }
+                : {}
+            }
+            onClick={handleGoToLogin}
+          >
+            {t("Log In")}
+          </DafButton>
+        </div>
+      )}
+
+      {resetRequestSuccedded && !confirmationToken && null}
+    </>
+  );
+
+  if (Layout) {
+    return (
+      <Layout app={app} step={step} title={title} subTitle={subTitle}>
+        {Content}
+      </Layout>
+    );
+  }
+
+  return (
+    <div style={{ padding: 20, maxWidth: 400, margin: "0 auto" }}>
+      <h2>{title}</h2>
+      <p>{subTitle}</p>
+      {Content}
+    </div>
+  );
+}

package/src/@daf/pages/Template/components/LinkingTemplate/config.js

@@ -90,4 +90,5 @@ export const namespaceMap = {
 	scl: "location",
 	testimonials: 'event',
 	'corrective-actions': 'event',
+	kyc: 'stakeholder',
 }

package/src/@daf/pages/Template/components/LinkingTemplate/index.jsx

@@ -44,7 +44,9 @@ const LinkingTemplate = ({
 
     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 {

package/src/@daf/services/LinkedSubjects.js

@@ -60,6 +60,7 @@ class LinkedSubjectsService extends BaseService {
 			params: { authorId: sourceId, source, version },
 		});
 	}
+	
 
     getData(query, namespace) {
 		return this.apiGet({