datastake-daf 0.6.804 → 0.6.805

package/src/@daf/core/components/ViewForm/components/DataLink/flat.js

@@ -9,6 +9,7 @@ import { getLabelFromScopeForDataLink, tooltipInputs } from "../../../../../../h
 import ModalHeader from "../../../Header/ModalHeader/index.jsx";
 import { formatClassname } from "../../../../../../helpers/ClassesHelper";
 import { getInputLabel } from "../../config.js";
+import { useViewContext } from "../../context";
 
 export default function DataLinkFlat({
   form = {},
@@ -25,6 +26,11 @@ export default function DataLinkFlat({
   getToken,
   app,
 }) {
+  const {
+    maxWidth,
+    staticWidth,
+    fullWidth,
+  } = useViewContext();
   const isSingle = useMemo(() => form?.meta?.maxRepeat === 1, [form]);
   const [modalRow, setModalRow] = useState(null)
   const [linkingData, setLinkingData] = useState({});
@@ -418,7 +424,11 @@ export default function DataLinkFlat({
   ], [mapKey, inputs, tableKeys, ajaxModalValues]);
 
   return (
-    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={form?.meta?.style}>
+    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={{
+      ...form?.meta?.style,
+      maxWidth: fullWidth ? "unset" : maxWidth,
+      width: fullWidth ? "100%" : maxWidth,
+    }}>
       <div className="daf-table-wrapper no-padding repeatable-form-table no-pagination">
         <ConfigProvider renderEmpty={() => notApplicable ? t('Not applicable') : t('No information available')}>
           <Table

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

@@ -9,6 +9,7 @@ import { getLabelFromScopeForDataLink, tooltipInputs } from "../../../../../../h
 import ModalHeader from "../../../Header/ModalHeader/index.jsx";
 import { formatClassname } from "../../../../../../helpers/ClassesHelper";
 import { getInputLabel } from "../../config.js";
+import { useViewContext } from "../../context";
 
 export default function DataLink({
   form = {},
@@ -25,6 +26,11 @@ export default function DataLink({
   getToken,
   app,
 }) {
+  const {
+    maxWidth,
+    staticWidth,
+    fullWidth,
+  } = useViewContext();
   const isSingle = useMemo(() => form?.meta?.maxRepeat === 1, [form]);
   const [modalRow, setModalRow] = useState(null)
   const [linkingData, setLinkingData] = useState({});
@@ -372,7 +378,11 @@ export default function DataLink({
   ], [mapKey, inputs, tableKeys, ajaxModalValues]);
 
   return (
-    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={form?.meta?.style}>
+    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={{
+      ...form?.meta?.style,
+      maxWidth: fullWidth ? "unset" : maxWidth,
+      width: fullWidth ? "100%" : maxWidth,
+    }}>
       <div className="daf-table-wrapper no-padding repeatable-form-table no-pagination">
         <ConfigProvider renderEmpty={() => notApplicable ? t('Not applicable') : t('No information available')}>
           <Table

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

@@ -9,6 +9,7 @@ import { tooltipInputs, getLabelFromScopeForDataLink } from "../../../../../../h
 import ModalHeader from "../../../Header/ModalHeader/index.jsx";
 import { formatClassname } from "../../../../../../helpers/ClassesHelper.js";
 import { getInputLabel } from "../../config.js";
+import { useViewContext } from "../../context";
 
 export default function DataLinkGroup({
   form = {},
@@ -25,6 +26,11 @@ export default function DataLinkGroup({
   getToken,
   app,
 }) {
+  const {
+    maxWidth,
+    staticWidth,
+    fullWidth,
+  } = useViewContext();
   const dataLinkKey = useMemo(() =>
     Object.keys(form?.inputs || {}).find((k) => form?.inputs[k]?.type === "dataLink"), [form]);
 
@@ -371,7 +377,11 @@ export default function DataLinkGroup({
   ], [mapKey, inputs, tableKeys, ajaxModalValues]);
 
   return (
-    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={dataLinkInput?.meta?.style}>
+    <div className={formatClassname(['data-link-cont mt-2', noBody && 'no-body'])} style={{
+      ...dataLinkInput?.meta?.style,
+      maxWidth: fullWidth ? "unset" : maxWidth,
+      width: fullWidth ? "100%" : maxWidth,
+    }}>
       <div className="daf-table-wrapper no-padding repeatable-form-table no-pagination">
         <ConfigProvider renderEmpty={() => notApplicable ? t('Not applicable') : t('No information available')}>
           <Table

package/src/@daf/core/components/ViewForm/content.jsx

@@ -9,6 +9,7 @@ import RepeatableGroup from "./components/repeatableGroup";
 import RepeatableModals from "./components/repeatableModals";
 import { repeatObjects, isGroupInput, groupSubsections, getLastRow, showHideInput } from "./helper";
 import GetIcon from "../Icon/index.jsx";
+import { ViewProvider } from "./context";
 
 const Content = ({
 	style = {},
@@ -30,6 +31,8 @@ const Content = ({
 	user,
 	evaluationConfig = [],
 	fullWidth = false,
+	maxWidth = "75%",
+	staticWidth = "614px",
 }) => {
 	const groupSingle = (grps) => {
 		const form = Object.keys(grps).reduce((f, gKey) => {
@@ -222,6 +225,9 @@ const Content = ({
 												data={data}
 												allData={data}
 												linkingData={linkingData}
+												maxWidth={maxWidth}
+												staticWidth={staticWidth}
+												fullWidth={fullWidth}
 												className={
 													isEven
 														? ind === _length - 1 || ind === _length - 2
@@ -283,6 +289,9 @@ const Content = ({
 									ajaxOptions={ajaxOptions}
 									evaluationConfig={evaluationConfig}
 									cols={2}
+									maxWidth={maxWidth}
+									staticWidth={staticWidth}
+									fullWidth={fullWidth}
 								></Input>
 							</div>
 						) : null;
@@ -352,7 +361,7 @@ const Content = ({
 
 			return (
 				<>
-					<div className="wrapper" key={Date.now()} style={{ width: fullWidth ? "100%" : 700 }}>
+					<div className="wrapper" key={Date.now()} style={{ width: "75%", display: "flex", justifyContent: "center" }}>
 						{f.alertConf ? (
 							<Alert
 								className="w-100"
@@ -377,34 +386,48 @@ const Content = ({
 	}
 
 	return (
-		<div className="content" style={style}>
-			{!hasSubSections ? (
-				renderContent(form)
-			) : (
-				<React.Fragment>
-					<h1 className="title">{form ? getInputLabel(form, data) : ""}</h1>
-					<Tabs
-						className="section-tabs"
-						items={repeatObjects(groupSections, (key) => {
-							const section = groupSections[key];
+		<ViewProvider
+			t={t}
+			app={app}
+			ajaxForms={ajaxForms}
+			changeAjaxForms={changeAjaxForms}
+			getApiBaseUrl={getApiBaseUrl}
+			getAppHeader={getAppHeader}
+			user={user}
+			evaluationConfig={evaluationConfig}
+			fullWidth={fullWidth}
+			maxWidth={maxWidth}
+			staticWidth={staticWidth}
+		>
+			<div className="content" style={style}>
+				{!hasSubSections ? (
+					renderContent(form)
+				) : (
+					<React.Fragment>
+						<h1 className="title">{form ? getInputLabel(form, data) : ""}</h1>
+						<Tabs
+							className="section-tabs"
+							items={repeatObjects(groupSections, (key) => {
+								const section = groupSections[key];
 
-							return {
-								style: { maxHeight: "calc(100vh - 100px)", overflowY: "auto" },
-								label: (
-									<span>
-										{section.icon ? <GetIcon icon={section.icon} /> : null}{" "}
-										{getInputLabel(section, data)}
-									</span>
-								),
-								key: key,
-								tabKey: key,
-								children: renderContent(groupSections[key], false),
-							};
-						})}
-					/>
-				</React.Fragment>
-			)}
-		</div>
+								return {
+									style: { maxHeight: "calc(100vh - 100px)", overflowY: "auto" },
+									label: (
+										<span>
+											{section.icon ? <GetIcon icon={section.icon} /> : null}{" "}
+											{getInputLabel(section, data)}
+										</span>
+									),
+									key: key,
+									tabKey: key,
+									children: renderContent(groupSections[key], false),
+								};
+							})}
+						/>
+					</React.Fragment>
+				)}
+			</div>
+		</ViewProvider>
 	);
 };
 

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/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/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'