datastake-daf 0.6.803 → 0.6.805

package/src/@daf/core/components/ViewForm/context/index.js

@@ -0,0 +1,80 @@
+import { createContext, useContext } from "react";
+
+const ViewContext = createContext({
+  user: null,
+  isReview: false,
+  t: (s) => s,
+  errors: {},
+  changeErrors: () => { },
+  ajaxOptions: {},
+  getAppHeader: () => { },
+  getApiBaseUrl: () => { },
+  changeAjaxOptions: () => { },
+  changeAjaxForms: () => { },
+  getMainApiUrl: () => { },
+  app: null,
+  ajaxForms: {},
+  query: null,
+  goTo: () => { },
+  maxWidth: "75%",
+  staticWidth: "614px",
+  fullWidth: false,
+});
+
+export const ViewProvider = ({
+  t,
+  user,
+  ajaxForms,
+  isReview,
+  children,
+  ajaxOptions,
+  highlightMandatory,
+  getAppHeader,
+  getApiBaseUrl,
+  changeAjaxOptions,
+  getMainApiUrl,
+  app,
+  query,
+  goTo,
+  errors,
+  changeErrors,
+  changeAjaxForms,
+  evaluationConfig,
+  maxWidth,
+  staticWidth,
+  fullWidth,
+}) => {
+  const values = {
+    t,
+    errors,
+    changeErrors,
+    user,
+    ajaxForms,
+    isReview,
+    changeAjaxOptions,
+    getMainApiUrl,
+    ajaxOptions,
+    highlightMandatory,
+    app,
+    changeAjaxForms,
+    getAppHeader,
+    getApiBaseUrl,
+    query,
+    evaluationConfig,
+    goTo,
+    maxWidth,
+    staticWidth,
+    fullWidth,
+  };
+
+  return (
+    <ViewContext.Provider value={values}>
+      {children}
+    </ViewContext.Provider>
+  );
+}
+
+export const useViewContext = () => {
+  const values = useContext(ViewContext);
+  return values;
+}

package/src/@daf/pages/Dashboards/SelfAssesment/components/AssociatedInformation/columns.js

@@ -4,6 +4,7 @@ import { renderDateFormatted } from '../../../../../../helpers/Forms.js';
 import { findOptions, getLinkValue } from '../../../../../../helpers/StringHelper.js';
 import CustomIcon from '../../../../../core/components/Icon/CustomIcon.jsx';
 import NavigationAction from '../../../../../core/components/Table/NavigationAction/index.jsx';
+import { getAdminLevelName } from '../../../../../../helpers/adminLevels.js';
 
 
 export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink, theme }) =>
@@ -62,7 +63,10 @@ export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink,
 				if (all.empty) {
 					return <div className="daf-default-cell" />;
 				}
-				const label = findOptions(v, options?.categoriesOptions) || "-";				
+
+				const categoriesOptions = [...(options?.categoriesOptions || []), ...(options?.locationCategories || [])]
+
+				const label = findOptions(v, categoriesOptions) || "-";				
 
 				return (
 					<Tooltip title={label}>{label || "-"}</Tooltip>
@@ -79,7 +83,7 @@ export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink,
 					return <div className="daf-default-cell" />;
 				}
 
-				const label = findOptions(v, options?.subCategoriesOptionsSbgi) || "-";	
+				const label = findOptions(v, options?.subCategoriesOptions) || "-";	
 
 				return (
 					<Tooltip title={label}>{label || "-"}</Tooltip>
@@ -113,7 +117,7 @@ export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink,
                 return <div className="daf-default-cell" />
               }
     
-              const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+              const region = getAdminLevelName(all?.linking?.SCL, "level_1");
     
               return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
             },
@@ -128,7 +132,7 @@ export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink,
                 return <div className="daf-default-cell" />
               }
     
-              const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+              const district = getAdminLevelName(all?.linking?.SCL, "level_2");
     
               return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
             },
@@ -167,7 +171,7 @@ export const getColumns = ({ t, activeTab, options, user, goTo, getRedirectLink,
 			},
 		},
 		{
-			dataIndex: "lastUpdated",
+			dataIndex: "lastUpdate",
 			title: t("Last Update"),
 			ellipsis: true,
 			show: true,

package/src/@daf/pages/Dashboards/SelfAssesment/components/AssociatedInformation/index.jsx

@@ -5,6 +5,7 @@ import SearchFilters from '../../../../../core/components/Filters/searchFilters/
 import DafTable from '../../../../../core/components/Table/index.jsx';
 import TabsHeader from '../../../../../core/components/Header/TabsHeader/index.jsx';
 import { getColumns } from './columns.js';
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js';
 
 function AssociatedInformation({
     t = () => {},
@@ -12,6 +13,7 @@ function AssociatedInformation({
     goTo = () => {},
     getRedirectLink = () => {},
     options = {},
+    theme = {},
 }) {
     const tabs = [
 		{ value: "stakeholders", label: t("Stakeholders") },
@@ -21,11 +23,20 @@ function AssociatedInformation({
 	];
 	const [activeTab, setActiveTab] = useState("stakeholders");
 
-    const data = [];
+    const defaultConfig = useMemo(
+		() => ({
+			basepath: "stakeholder",
+			url: "/kyc/associatedInformation",
+		}),
+		[],
+	);
+
+    const { data, loading } = useWidgetFetch({config: defaultConfig});
+    console.log({data})
 
     const columns = useMemo(
-		() => getColumns({ t, isMonitoring: false, activeTab, options, getRedirectLink, user }),
-		[t, activeTab, options, getRedirectLink, user],
+		() => getColumns({ t, isMonitoring: false, activeTab, options, getRedirectLink, user, theme, goTo }),
+		[t, activeTab, options, getRedirectLink, user, theme, goTo],
 	);
 
     return (
@@ -33,6 +44,7 @@ function AssociatedInformation({
             title={t("Associated Information")}
             expandable
             className="with-border-header no-px-body overflow-hidden"
+            loading={loading}
         >
             <div style={{ display: "flex", flexDirection: "column", gap: "24px", marginLeft: "12px" }}>
                 <TabsHeader

package/src/@daf/pages/Dashboards/SelfAssesment/components/OrganisationInformation/columns.js

@@ -33,9 +33,9 @@ export const getColumns = ({
             if (all.empty) {
                 return <div className="daf-default-cell" />
             }
-            const published = false;
+            const published = all?.published || false;
 
-            return <ProgressBarWithIcon published={published} data={v} t={t} />
+            return <ProgressBarWithIcon published={published} data={all} t={t} />
         }
     },
     {

package/src/@daf/pages/Dashboards/SelfAssesment/components/OrganisationInformation/index.jsx

@@ -9,22 +9,25 @@ function OrganisationInformation({
     goTo = () => {},
     getRedirectLink = () => {},
     theme = {},
+    data,
+    loading,
 }) {
-    const organistionInfo = [
+    const organisationInfo = [
         {key: 'kyc', label: t("My KYC")},
         {key: 'management-systems', label: t("Management Systems")},
     ]
 
     const tableData = useMemo(() => {
-        return organistionInfo.map((item) => {
+        return organisationInfo.map((item) => {
             return {
                 key: item.key,
                 name: item.label,
-                completion: 0,
-                lastUpdate: "",
+                completion: data?.data?.[`${item.key}Data`]?.meta?.completion?.percentage || 0,
+                lastUpdate: data?.data?.[`${item.key}Data`]?.updatedAt || "",
+                ...data?.data?.[`${item.key}Data`],
             }
         })
-    }, [organistionInfo])
+    }, [organisationInfo, data])
 
     const columns = useMemo(() => {
         return getColumns({ t, data: tableData, user, goTo, getRedirectLink, theme })
@@ -34,6 +37,7 @@ function OrganisationInformation({
         <Widget 
             title={t("Organisation Information")}
             className="with-border-header daf-table-wrapper no-pagination no-px-body"
+            loading={loading}
         >
             <DAFTable columns={columns} data={tableData} />
         </Widget>

package/src/@daf/pages/Dashboards/SelfAssesment/index.jsx

@@ -32,7 +32,7 @@ function SelfAssesment({
                 <ProductionSites t={t} options={options} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} />
             </section>
             <section>
-                <AssociatedInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} />
+                <AssociatedInformation t={t} user={user} goTo={goTo} getRedirectLink={getRedirectLink} data={data} loading={loading} theme={theme} options={options} />
             </section>
         </DashboardLayout>
     )

package/src/@daf/pages/Edit/index.jsx

@@ -331,6 +331,7 @@ const Edit = ({
 								linkingForms={linkingForms}
 								form={selectedForm}
 								data={data}
+								fullWidth
 								{...{
 									t,
 									user,

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

@@ -158,11 +158,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             goTo(getRedirectLink(link));
           };
           const moreMenuItems = [
-            {
-              label: t("Details"),
-              value: "details",
-              onClick: onClick,
-            },
             {
               label: t("Summary"),
               value: "Summary",
@@ -175,6 +170,11 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
               },
               // disabled: true,
             },
+            {
+              label: t("Details"),
+              value: "details",
+              onClick: onClick,
+            },
           ];
           return <div >
                <MoreMenu items={moreMenuItems} />

package/src/@daf/pages/Stakeholders/Operators/columns.js

@@ -162,11 +162,6 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           goTo(getRedirectLink(link));
         };
         const moreMenuItems = [
-          {
-            label: t("Details"),
-            value: "details",
-            onClick: onClick,
-          },
           {
             label: t("Summary"),
             value: "Summary",
@@ -179,10 +174,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             },
             // disabled: true,
           },
+          {
+            label: t("Details"),
+            value: "details",
+            onClick: onClick,
+          },
         ];
-        return <div >
-             <MoreMenu items={moreMenuItems} />
-        </div>;
+        return <MoreMenu items={moreMenuItems} />
       }
     }
 ].filter((column) => column.show !== false);

package/src/@daf/pages/Summary/Activities/Monitoring/components/BiodiversityAndHabitat/index.jsx

@@ -1,21 +1,27 @@
-import React, { useMemo } from 'react';
-import { ActivityIndicators, Widget } from '../../../../../../../../src/index.js';
+import React from 'react';
+import { Widget, FaunaWidget, InvasiveSpeciesWidget } from '../../../../../../../../src/index.js';
 import styled from 'styled-components';
-import { 
-    generateFaunaConfig, 
-    generateInvasiveSpeciesConfig 
-} from './helper';
 
-const Container = styled.div`
-    display: grid;
-    grid-template-columns: 70% 28.5%;
+const BiodiversityContainer = styled.div`
+    display: flex;
     gap: 24px;
     width: 100%;
+    
     @media (max-width: 768px) {
-        grid-template-columns: 1fr;
+        flex-direction: column;
     }
 `;
 
+const FaunaSection = styled.section`
+    width: 60%;
+    min-width: 0;
+`;
+
+const InvasiveSpeciesSection = styled.section`
+width: 38.5%;
+`;
+
+
 const BiodiversityAndHabitat = ({
     faunaPresent = [],
     invasiveSpecies = [],
@@ -23,40 +29,37 @@ const BiodiversityAndHabitat = ({
     loading = false,
     t = (s) => s
 }) => {
-    const observedFaunaConfig = useMemo(() => 
-        generateFaunaConfig(faunaPresent, t),
-        [faunaPresent, t]
-    );
-
-    const invasiveSpeciesConfig = useMemo(() => 
-        generateInvasiveSpeciesConfig(invasiveSpecies, hasInvasiveSpecies, t),
-        [invasiveSpecies, hasInvasiveSpecies, t]
-    );
-
     return (
         <Widget
             title={t("Biodiversity & Habitat")}
             className="with-border-header h-w-btn-header"
         >
-            <section>
-                <Container>
-                    <ActivityIndicators
+            <BiodiversityContainer>
+                <FaunaSection>
+                    <FaunaWidget
                         title={t("Observed Fauna")}
-                        config={observedFaunaConfig}
+                        faunaPresent={faunaPresent}
+                        columnsPerRow={5}
+                        itemWidth={120}
+                        itemHeight={120}
                         loading={loading}
-                        widgetClassName="h-w-btn-header"
                         t={t}
                     />
-                    <ActivityIndicators
+                </FaunaSection>
+
+                <InvasiveSpeciesSection>
+                    <InvasiveSpeciesWidget
                         title={t("Invasive Species")}
-                        config={invasiveSpeciesConfig}
+                        invasiveSpecies={invasiveSpecies}
+                        hasInvasiveSpecies={hasInvasiveSpecies}
+                        columnsPerRow={3}
+                        itemWidth={100}
+                        itemHeight={100}
                         loading={loading}
-                        className="single-column"
-                        widgetClassName="h-w-btn-header"
                         t={t}
                     />
-                </Container>
-            </section>
+                </InvasiveSpeciesSection>
+            </BiodiversityContainer>
         </Widget>
     );
 };

package/src/@daf/pages/View/index.jsx

@@ -304,6 +304,7 @@ const View = ({
                             getApiBaseUrl={getApiBaseUrl}
                             getAppHeader={getAppHeader}
                             user={user}
+                            fullWidth
                         />
                     )}
                 </div>

package/src/helpers/adminLevels.js

@@ -0,0 +1,4 @@
+export const getAdminLevelName = (data, level) => {
+	const entry = Object.values(data || {}).find(item => item.level === level);
+	return entry?.name || "-";
+};

package/src/index.js

@@ -79,6 +79,8 @@ export { default as CarouselWidget } from "./@daf/core/components/Dashboard/Widg
 export { default as ImageCarousel } from "./@daf/core/components/Dashboard/Widget/ImageCarousel/index.jsx";
 export { default as StatCard } from "./@daf/core/components/Dashboard/Widget/StatCard/index.js";
 export { default as VegetationHealth } from "./@daf/core/components/Dashboard/Widget/VegetationWidget/index.jsx";
+export { default as FaunaWidget } from "./@daf/core/components/Dashboard/Widget/FaunaWidget/index.jsx";
+export { default as InvasiveSpeciesWidget } from "./@daf/core/components/Dashboard/Widget/InvasiveSpeciesWidget/index.jsx";
 // export { default as WidgetCatalogue } from "./@daf/core/components/Dashboard/Widget/WidgetCatalogue/index.jsx";
 
 // Forms

package/src/utils.js

@@ -64,4 +64,6 @@ export { renderBreadCrumbs, buildBreadCrumbs as buildBreadCrumbsHelper } from '.
 
 export { copyToClipboard } from './helpers/copyToClipboard.js'
 
-export { isArrayOfObjects } from './@daf/utils/arrays.js'
+export { isArrayOfObjects } from './@daf/utils/arrays.js'
+
+export { getAdminLevelName } from './helpers/adminLevels.js'