datastake-daf 0.6.819 → 0.6.821

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

@@ -1,30 +1,30 @@
 import React, { useState, useEffect } from "react";
-import { Checkbox, Form, Input, message } from 'antd';
+import { Checkbox, message } from 'antd';
 import DafButton from '../../../Button/index.jsx';
 import Loading from "../../../Loading/index.jsx";
+import AuthForm from "../../../AuthForm/index.jsx";
 
+
+
+const theme = window.theme;
 export default function AppInvitation({
-  // Redux State
   errors,
   user,
   invitationSuccess,
-  // Actions
   confirmInvitation,
   getUserFromInvitation,
-  // Configuration
+  theme,
   Layout,
   redirectPath = "/",
   loginPath = "/login",
   appRedirectPath = "/app",
   params: propParams = {},
+  goTo,
+  isMobile = false,
+  t,
 }) {
-  const { t } = useTranslation();
-  const routeParams = useParams();
-  const { app, companyCode, userCode } = { ...routeParams, ...propParams };
-  const [passwords] = Form.useForm();
+  const { app, companyCode, userCode } = propParams;
   const [checking, setChecking] = useState(true);
-  const goTo = useNavigate();
-  const [termsAgreed, setTermsAgreed] = useState(false);
   const [passwordReseted, setPasswordReseted] = useState(false);
 
   useEffect(() => {
@@ -46,36 +46,125 @@ export default function AppInvitation({
             localStorage.setItem('token', data.token);
           }
           message.success(t('Invitation accepted'));
-          // Fix: ensure we don't rely on a variable from useParams that might not exist
-          // Just use the configured redirectPath
-          goTo(redirectPath);
+          if (goTo && typeof goTo === 'function') {
+            goTo(redirectPath);
+          } else {
+            window.location.href = redirectPath;
+          }
         },
         { companyCode, userCode }
       );
     }
   }, [invitationSuccess, user, confirmInvitation, goTo, redirectPath, companyCode, userCode, t]);
 
-  const displayError = (name) => {
-    return errors && errors[name] && errors[name].length > 0 && {
-      help: errors[name][0],
-      validateStatus: 'error',
-    };
-  };
+
+  useEffect(() => {
+
+    const isInInvitationFlow = checking || 
+      (invitationSuccess && user && user.inviteToken) || 
+      (invitationSuccess && user && !user.inviteToken);
+    
+    if (!isInInvitationFlow) {
+      if (user) {
+        if (goTo && typeof goTo === 'function') {
+          goTo(appRedirectPath);
+        } else {
+          window.location.href = appRedirectPath;
+        }
+      } else {
+        if (goTo && typeof goTo === 'function') {
+          goTo(redirectPath);
+        } else {
+          window.location.href = redirectPath;
+        }
+      }
+    }
+  }, [user, goTo, appRedirectPath, redirectPath, checking, invitationSuccess]);
 
   const subTitle = !passwordReseted ? 'Set up your password and agree with out terms and conditions.' :
     isMobile ? 'Your account has been successfully set up. To log in use a desktop device.'
       : 'Your account has been successfully set up. Please click the button below to log in.';
   const title = passwordReseted ? 'Thank You!' : undefined;
 
+  const fields = [
+    {
+      name: 'email',
+      label: t("Email"),
+      type: 'input',
+      disabled: true,
+    },
+    {
+      name: 'password',
+      label: t("Password"),
+      type: 'password',
+      required: true,
+      rules: [{
+        required: true,
+        message: t("errors::password should not be empty")
+      }],
+      placeholder: t("Password"),
+    },
+    {
+      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("Confirm Password"),
+    },
+    {
+      name: 'mailUpdates',
+      type: 'custom',
+      valuePropName: 'checked',
+      component: <Checkbox>{t("Sign up to receive updates")}</Checkbox>,
+    },
+    {
+      name: 'agreeTerms',
+      type: 'custom',
+      valuePropName: 'checked',
+      rules: [{ 
+        validator: (_, value) => value ? Promise.resolve() : Promise.reject(new Error(t('You must agree to the terms and conditions'))) 
+      }],
+      component: (
+        <Checkbox>
+          <p className="mb-0">
+            {t('Agree to the Terms of Use of this application and the Privacy Policy')}
+          </p>
+        </Checkbox>
+      ),
+    }
+  ];
+
+  const handleSubmit = (values) => {
+    const { password, mailUpdates } = values;
+    confirmInvitation(
+      { password, mailUpdates },
+      () => { },
+      { companyCode, userCode }
+    );
+    setPasswordReseted(true);
+  };
+
   if (checking && !invitationSuccess) {
     return <Loading />;
   }
 
-  // If auto-confirming (inviteToken present), we might want to show loading or nothing until redirect
   if (invitationSuccess && user && user.inviteToken) {
-     // The useEffect will handle the redirect/confirm. 
-     // We can show loading here too or just return null.
-     // Original code: checks invitationSuccess && !user.inviteToken for form, else redirect.
+   
      return <Loading />;
   }
 
@@ -88,6 +177,7 @@ export default function AppInvitation({
               <DafButton
                 type="primary"
                 className="normal-br"
+                style={theme || window.theme ? { backgroundColor: (theme || window.theme).colorPrimary, borderColor: (theme || window.theme).colorPrimary } : {}}
                 onClick={() => {
                   window.location.href = loginPath;
                 }}
@@ -97,86 +187,21 @@ export default function AppInvitation({
             )}
           </div>
         ) : (
-          <>
-            <Form name="password" layout="vertical" form={passwords} >
-              <Form.Item
-                required
-                name="password"
-                {...displayError('password')}
-                label={t("Password")}
-                rules={[{
-                  required: true,
-                  message: t("errors::password should not be empty")
-                }]}>
-                <Input.Password size="large" placeholder={t("Password")} />
-              </Form.Item>
-              <Form.Item
-                required
-                name="confirmPassword"
-                {...displayError('confirmPassword')}
-                label={t("Confirm Password")}
-                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'));
-                    },
-                  }),
-                ]}>
-                <Input.Password size="large" placeholder={t("Confirm Password")} />
-              </Form.Item>
-              <Form.Item
-                name="mailUpdates" valuePropName="checked" noStyle>
-                <Checkbox>{t("Sign up to receive updates")}</Checkbox>
-              </Form.Item>
-              <Form.Item
-                name="agreeTerms" valuePropName="checked" noStyle>
-                <Checkbox
-                  checked={termsAgreed}
-                  onChange={(e) => setTermsAgreed(e.target.checked)}
-                >
-                  <p className="mb-0">
-                    {t('Agree to the Terms of Use of this application and the Privacy Policy')}
-                  </p>
-                </Checkbox>
-              </Form.Item>
-            </Form>
-            <div className="buttons">
-              <DafButton
-                className="normal-br"
-                type="primary"
-                block
-                size="large"
-                disabled={!termsAgreed}
-                onClick={() => {
-                  passwords.validateFields().then(data => {
-                    const { password, mailUpdates } = data;
-                    confirmInvitation(
-                      { password, mailUpdates },
-                      () => { },
-                      { companyCode, userCode }
-                    );
-                    setPasswordReseted(true);
-                  });
-                }}
-              >
-                {t("Confirm")}
-              </DafButton>
-            </div>
-          </>
+          <AuthForm
+            fields={fields}
+            onSubmit={handleSubmit}
+            submitText={t("Confirm")}
+            initialValues={{ email: user?.email }}
+            errors={errors}
+            t={t}
+            executeRecaptcha={() => Promise.resolve(true)}
+            theme={theme || window.theme}
+          />
         )}
       </>
     );
 
     if (Layout) {
-      // Assuming Layout accepts these props as per Nashiriki AuthLayout
       return <Layout app={app} step={1} subTitle={subTitle} title={title}>{Content}</Layout>;
     }
 
@@ -189,5 +214,5 @@ export default function AppInvitation({
     );
   }
 
-  return user ? <Navigate to={appRedirectPath} /> : <Navigate to={redirectPath} />;
+  return null;
 }

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -5,8 +5,9 @@ import AdminAccountsScreen from "./AdminScreens/Accounts.jsx";
 import AdminAccountsViewScreen from "./AdminScreens/AccountsView.jsx";
 import AdminSubjectsScreen from "./AdminScreens/Subjects.jsx";
 import AdminLocationScreen from "./AdminScreens/Location.jsx";
-import AdminSubjectsViewScreen from "./AdminScreens/SubjectsView.jsx";
-
+// import AdminSubjectsViewScren from "./AdminScreens/SubjectsView.jsx";
+import AdminEventsScreen from "./AdminScreens/Events.jsx";
+import AdminDocumentsScreen from "./AdminScreens/Documents.jsx";
 export function getAdminRoutes(config) {
   const {
     appName,
@@ -16,8 +17,9 @@ export function getAdminRoutes(config) {
     useAdminAccountsViewConfig,
     useAdminSubjectsConfig,
     useAdminLocationConfig,
-    useAdminSubjectsViewConfig,
-    useAdminLocationViewConfig,
+   
+    useAdminDocumentsConfig,
+    useAdminEventsConfig,
     userIsAdmin,
   } = config;
 
@@ -59,36 +61,22 @@ export function getAdminRoutes(config) {
     return <AdminLocationScreen config={locationConfig} />;
   }
 
-  function LocationViewWrapper() {
-    const locationViewConfig =
-      typeof useAdminLocationViewConfig === "function"
-        ? useAdminLocationViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location" }} />;
-  }
 
-  function StakeholderViewWrapper() {
-    const stakeholderViewConfig =
-      typeof useAdminSubjectsViewConfig === "function"
-        ? useAdminSubjectsViewConfig()
-        : undefined;
-    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder" }} />;
-  }
 
-  function LocationEditWrapper() {
-    const locationViewConfig =
-      typeof useAdminLocationViewConfig === "function"
-        ? useAdminLocationViewConfig()
+  function DocumentsWrapper() {
+    const documentsConfig =
+      typeof useAdminDocumentsConfig === "function"
+        ? useAdminDocumentsConfig()
         : undefined;
-    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location", mode: "edit" }} />;
+    return <AdminDocumentsScreen config={documentsConfig} />;
   }
 
-  function StakeholderEditWrapper() {
-    const stakeholderViewConfig =
-      typeof useAdminSubjectsViewConfig === "function"
-        ? useAdminSubjectsViewConfig()
+  function EventsWrapper() {
+    const eventsConfig =
+      typeof useAdminEventsConfig === "function"
+        ? useAdminEventsConfig()
         : undefined;
-    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder", mode: "edit" }} />;
+    return <AdminEventsScreen config={eventsConfig} />;
   }
 
   const subjectsIndexComponent =
@@ -96,6 +84,10 @@ export function getAdminRoutes(config) {
       ? <LocationWrapper />
       : typeof useAdminSubjectsConfig === "function"
       ? <SubjectsWrapper />
+      : typeof useAdminDocumentsConfig === "function"
+      ? <DocumentsWrapper />
+      : typeof useAdminEventsConfig === "function"
+      ? <EventsWrapper />
       : <div />;
 
   const routes = [
@@ -156,6 +148,30 @@ export function getAdminRoutes(config) {
             visible: (user) => userIsAdmin(user),
             component: <SubjectsWrapper />,
           },
+
+        ]
+        
+      : []),
+      ...(typeof useAdminDocumentsConfig === "function"
+      ? [
+          {
+            path: "management/subjects/document",
+            key: `${APP_PREFIX}_ADMIN_SUBJECTS_DOCUMENTS`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <DocumentsWrapper />,
+          },
+        ]
+      : []),  
+      ...(typeof useAdminEventsConfig === "function"
+      ? [
+          {
+            path: "management/subjects/event",
+            key: `${APP_PREFIX}_ADMIN_SUBJECTS_EVENTS`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <EventsWrapper />,
+          },
         ]
       : []),
   ];

package/src/@daf/hooks/useAdminDashboard.js

@@ -46,15 +46,20 @@ export function useAdminDashboard({ dashboardService, onError }) {
 	}, [dashboardService, onError]);
 
 	const fetchUserGrowth = useCallback(
-		async (params) => {
+		async (activeFilter) => {
 			if (!dashboardService?.getUserGrowth) {
 				console.warn("dashboardService.getUserGrowth not provided");
 				return;
 			}
 
+			if (activeFilter === undefined || activeFilter === null) {
+				console.warn("activeFilter not provided to fetchUserGrowth");
+				return;
+			}
+
 			setUserGrowthDataLoading(true);
 			try {
-				const response = await dashboardService.getUserGrowth(params);
+				const response = await dashboardService.getUserGrowth(activeFilter);
 				setUserGrowthData(response || []);
 			} catch (err) {
 				if (onError) {
@@ -68,11 +73,9 @@ export function useAdminDashboard({ dashboardService, onError }) {
 		},
 		[dashboardService, onError]
 	);
-
 	useEffect(() => {
 		fetchDashboardData();
 	}, [fetchDashboardData]);
-
 	return {
 		data,
 		loading,

package/src/@daf/hooks/useSources.js

@@ -80,8 +80,9 @@ export default function useSource({ user = {}, t = () => {}, getData = () => {},
 	};
 }
 
-export const useSources = ({type, id, user, t = () => {}}) => {
+export const useSources = ({type, id, user, t = () => {}, stop}) => {
 	function getData(params) {
+		if(stop) return Promise.resolve({ data: [] });
 		if(id !== undefined && id !== null) {
 			return SourceService.getSources({type, id});
 		} else {

package/src/@daf/pages/Events/columns.js

@@ -160,14 +160,26 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
       return <AvatarGroup items={sources} />;
     },
   },
+  {
+    title: t("Author"),
+    dataIndex: "author",
+    key: "author",
+    show: activeTab === "own",
+    render: (value, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+
+      const author = value?.name;
+      return author ? <Tooltip title={author}>{author}</Tooltip> : '-';
+    },
+    ellipsis: true,
+  },
   {
     title: t("Status"),
     dataIndex: "status",
     key: "status",
     show: activeTab === "own",
-    correctiveActions: activeTab === "own",
-    testimonials: activeTab === "own",
-    incident: activeTab === "own",
     render: (value, all) => {
       if (all.empty) {
         return <div className="daf-default-cell" />;

package/src/@daf/pages/Locations/MineSite/columns.js

@@ -8,6 +8,7 @@ import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 import MoreOptions from '../../../core/components/Table/MoreOptions/index.jsx';
 import { renderStatusTag } from '../../../utils/tags.js';
+import MoreTags from '../../../core/components/Table/MoreTags/index.jsx';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications, APP}) => [
     {
@@ -105,7 +106,23 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
           return <Tooltip title={category}>{category}</Tooltip>;
         },
-    },    
+    }, 
+    {
+      dataIndex: 'products',
+      title: t('Products'),
+      ellipsis: true,
+      show: APP === 'nashiriki',
+      render: (v, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />
+        }
+
+        const products = v?.map((product) => product?.typeOfProduct);
+        const productOptions = findOptions(products, options?.minerals || options?.mineralOptions);
+
+        return productOptions?.length > 0 ? <MoreTags values={productOptions} limit={1} tagColor="processing" style={{ fontWeight: "normal", fontSize: 14 }} /> : '-';
+      },
+    },
     {
         dataIndex: 'operator',
         title: t('Operator'),

package/src/@daf/pages/TablePage/columns.js

@@ -11,6 +11,7 @@ export const getColumns = ({
     subject,
     data,
     applications,
+    APP,
 }) => {
     const registry = FILTER_REGISTRY[subject] || FILTER_REGISTRY[DEFAULT_SUBJECT];
 
@@ -25,5 +26,6 @@ export const getColumns = ({
         subject,
         data,
         applications,
+        APP,
     });
 }

package/src/@daf/pages/TablePage/hook.js

@@ -94,8 +94,6 @@ export const useTablePage = ({
         [t, subject, getFiltersConfig]
     );
 
-    console.log({options})
-
     useEffect(() => {
         setSelectOptions((prev) => ({
             ...prev,

package/src/@daf/pages/View/hooks/useViewActions.js

@@ -17,6 +17,8 @@ export const useViewActions = ({
     t,
     viewConfig,
     buttonActions,
+    canDelete,
+    deleteSubject,
   }) => {
     const [pageActions, setPageActions] = useState([]);
     const [extraPageActions, setExtraPageActions] = useState([]);
@@ -50,6 +52,12 @@ export const useViewActions = ({
           }
         }
       }
+
+      if(canDelete) {
+        if(viewConfig.deleteNamespaces.includes(namespace)){
+          actions.push(buttonActions.createDeleteButton(t, deleteSubject))
+        }
+      }
   
       if (viewConfig.summaryNamespaces.includes(namespace)) {
         extraActions.push(
@@ -58,6 +66,11 @@ export const useViewActions = ({
         extraActions.push(
           buttonActions.createRecordsButton(t, setOpenRecordsModal)
         );
+        if(canDelete) {
+          if(viewConfig.deleteNamespaces.includes(namespace)){
+            extraActions.push(buttonActions.createDeleteButton(t, deleteSubject))
+          }
+        }
       }
   
       setPageActions(actions);

package/src/@daf/pages/View/hooks/useViewPermissions.js

@@ -6,6 +6,7 @@ export const useViewPermissions = ({
     namespaceOverrides = {
         supportedNamespaces: {},
         canEdit: {},
+        canDelete: {},
       },
     namespace,
     user,
@@ -16,6 +17,7 @@ export const useViewPermissions = ({
     viewConfig,
 }) => {
     const baseNamespaceKeys = Object.keys(namespaceConfig || {});
+    console.log({namespaceConfig})
 
     const baseSupportedNamespaces = baseNamespaceKeys?.reduce((acc, key) => {
       acc[key] = () => true;
@@ -55,6 +57,19 @@ export const useViewPermissions = ({
         return canEditAction[namespace] ? canEditAction[namespace]() : false;
     }, [namespace, data, user]);
 
+    const canDelete = useMemo(() => {
+        const basecanDeleteAction = baseNamespaceKeys.reduce((acc, key) => {
+            acc[key] = () => isUserData();
+            return acc;
+            }, {});
+    
+            const canDeleteAction = {
+            ...namespaceOverrides.canDelete,
+            };
+            
+        return canDeleteAction[namespace] ? canDeleteAction[namespace]() : false;
+    }, [namespace, data, user, namespaceOverrides])
+
     useEffect(() => {
             if (data) {
                 if (typeof isSupportedNamespaces[namespace] === "function") {
@@ -69,6 +84,7 @@ export const useViewPermissions = ({
         isSupportedNamespaces,
         canEdit,
         isSupported,
+        canDelete
     }
 
 }