datastake-daf 0.6.748 → 0.6.750

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

@@ -4,7 +4,7 @@ import { findOptions } from '../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../helpers/Forms.js';
 import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
-
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
     return linkingObject?.[value]?.name;
@@ -86,7 +86,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <AvatarGroup items={val}></AvatarGroup>;
         },
     },
-    ,    {
+    {
         dataIndex: 'operator',
         title: t('Operator'),
         ellipsis: true,
@@ -129,22 +129,57 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return status ? <Tooltip title={status}>{status}</Tooltip> : '-';
         },
     },
-    {
-      id: 'actions',
-      title: "",
-      width: 60,
-      render: (_, all) => {
-        if (all.empty) {
-          return <div className="daf-default-cell" />;
+    
+      {
+        title: t("Sources"),
+        dataIndex: 'source',
+        ellipsis: true,
+        show: activeTab !== "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const source = findOptions(v, data?.options?.sourceOptions);
+          return source ? <Tooltip title={source}>{source}</Tooltip> : '-';
+        },
+      },
+      {
+        id: 'actions',
+        title: "",
+        width: 60,
+        render: (_, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />;
+          }
+          const onClick = () => {
+            const link = `/app/view/${subject}/${all.datastakeId}`;
+            if (activeTab === "shared") {
+              link += `?sourceId=${all?.authorId?.id}`;
+            }
+            goTo(getRedirectLink(link));
+          };
+          const moreMenuItems = [
+            {
+              label: t("Details"),
+              value: "details",
+              onClick: onClick,
+            },
+            {
+              label: t("Summary"),
+              value: "Summary",
+              onClick: () => {
+                let link = `/app/mine-summary/${all.datastakeId}`
+                if (activeTab === "shared") {
+                  link += `?sourceId=${all?.authorId?.id}`;
+                }
+                goTo(getRedirectLink(link));
+              },
+              // disabled: true,
+            },
+          ];
+          return <div >
+               <MoreMenu items={moreMenuItems} />
+          </div>;
         }
-
-        const link = `/app/view/${subject}/${all.datastakeId}`;
-
-        return <div style={{ display: "flex", justifyContent: "center" }}>
-						<a href={getRedirectLink(link)}>
-							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
-						</a>
-			</div>;
       }
-    }
 ].filter((column) => column.show !== false);

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

@@ -5,7 +5,7 @@ import { renderDateFormatted } from '../../../helpers/Forms.js';
 import CustomIcon from '../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
-
+import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
     return linkingObject?.[value]?.name;
@@ -71,8 +71,8 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },      
     {
-        dataIndex: 'administrativeLevel1',
-        title: t('Region'),
+        dataIndex: 'province',
+        title: t('Province'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -80,14 +80,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const region = getLinkValue(v, all?.linking?.SCL);
+          const province = getLinkValue(v, all?.linking?.SCL);
 
-          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+          return province ? <Tooltip title={province}>{province}</Tooltip> : '-';
         },
     },    
     {
-        dataIndex: 'administrativeLevel2',
-        title: t('District'),
+        dataIndex: 'territory',
+        title: t('Territory'),
         ellipsis: true,
         show: true,
         render: (v, all) => {
@@ -95,11 +95,26 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <div className="daf-default-cell" />
           }
 
-          const district = getLinkValue(v, all?.linking?.SCL);
+          const territory = getLinkValue(v, all?.linking?.SCL);
 
-          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
+          return territory ? <Tooltip title={territory}>{territory}</Tooltip> : '-';
         },
     },     
+    {
+      title: t("Sources"),
+      dataIndex: "sources",
+      key: "sources",
+      show: activeTab !== "own",
+      render: (val, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
+
+          const sources = sourceAvatarConfig(val, user, applications);
+
+          return <AvatarGroup items={sources}></AvatarGroup>;
+      },
+  },
     {
         title: t("Last Update"),
         dataIndex: "updatedAt",
@@ -115,21 +130,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
         ellipsis: true,
     },
-    {
-        title: t("Sources"),
-        dataIndex: "sources",
-        key: "sources",
-        show: activeTab !== "own",
-        render: (val, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
-
-            const sources = sourceAvatarConfig(val, user, applications);
-
-            return <AvatarGroup items={sources}></AvatarGroup>;
-        },
-    },
+   
     {
       id: 'actions',
       title: "",
@@ -138,14 +139,35 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         if (all.empty) {
           return <div className="daf-default-cell" />;
         }
-
-        const link = `/app/view/${subject}/${all.datastakeId}`;
-
-        return <div style={{ display: "flex", justifyContent: "center" }}>
-						<a href={getRedirectLink(link)}>
-							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
-						</a>
-			</div>;
+        const onClick = () => {
+          const link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
+        const moreMenuItems = [
+          {
+            label: t("Details"),
+            value: "details",
+            onClick: onClick,
+          },
+          {
+            label: t("Summary"),
+            value: "Summary",
+            onClick: () => {
+              let link = `/app/summary/${subject}/${all.datastakeId}`
+              if (activeTab === "shared") {
+                link += `?sourceId=${all?.authorId?.id}`;
+              }
+              goTo(getRedirectLink(link));
+            },
+            // disabled: true,
+          },
+        ];
+        return <div >
+             <MoreMenu items={moreMenuItems} />
+        </div>;
       }
     }
 ].filter((column) => column.show !== false);

package/src/@daf/pages/Locations/config.js

@@ -13,7 +13,16 @@ export const getFiltersConfig = ({t}) => {
 			getLabel: (option) => option.label,
 			getValue: (option) => option.value,
 		},
-    }
+		category:{
+			type: 'select',
+			label: 'Category',
+			placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		}
+	}
 }
 
 export const filtersConfig = {
@@ -22,9 +31,10 @@ export const filtersConfig = {
 };
 
 export const getFilterOptions = (options, t) => {
-	const { countries } = options || {};
+	const { countries = [], category = [] } = options || {};
 	const _default  = {
 		country: countries,
+		category: category,
 	}
 
 	return _default;

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

@@ -5,7 +5,7 @@ import { renderDateFormatted } from '../../../../helpers/Forms.js';
 import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
-
+import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
     return linkingObject?.[value]?.name;
@@ -99,7 +99,22 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
 
           return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
         },
-    },     
+    },    
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      width: 125,
+      render: (date, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
+
+          const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+          return <Tooltip title={_date}>{_date}</Tooltip>;
+      },
+      ellipsis: true,
+  }, 
     {
         title: t("Sources"),
         dataIndex: "sources",
@@ -116,20 +131,19 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },
     {
-        title: t("Last Update"),
-        dataIndex: "updatedAt",
-        key: "updatedAt",
-        width: 125,
-        render: (date, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
-
-            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-            return <Tooltip title={_date}>{_date}</Tooltip>;
-        },
+        title: t("Status"),
+        dataIndex: 'status',
         ellipsis: true,
+        show: activeTab == "own",
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const status = findOptions(v, data?.options?.statusOptions);
+          return status ? <Tooltip title={status}>{status}</Tooltip> : '-';
+        },
     },
+   
     {
       id: 'actions',
       title: "",
@@ -138,14 +152,35 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         if (all.empty) {
           return <div className="daf-default-cell" />;
         }
-
-        const link = `/app/view/${subject}/${all.datastakeId}`;
-
-        return <div style={{ display: "flex", justifyContent: "center" }}>
-						<a href={getRedirectLink(link)}>
-							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
-						</a>
-			</div>;
+        const onClick = () => {
+          const link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
+        const moreMenuItems = [
+          {
+            label: t("Details"),
+            value: "details",
+            onClick: onClick,
+          },
+          {
+            label: t("Summary"),
+            value: "Summary",
+            onClick: () => {
+              let link = `/app/operator-summary/${all.datastakeId}`
+              if (activeTab === "shared") {
+                link += `?sourceId=${all?.authorId?.id}`;
+              }
+              goTo(getRedirectLink(link));
+            },
+            // disabled: true,
+          },
+        ];
+        return <div >
+             <MoreMenu items={moreMenuItems} />
+        </div>;
       }
     }
 ].filter((column) => column.show !== false);

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

@@ -5,7 +5,7 @@ import { renderDateFormatted } from '../../../helpers/Forms.js';
 import CustomIcon from '../../core/components/Icon/CustomIcon.jsx';
 import AvatarGroup from '../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
-
+import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
     {
         dataIndex: 'datastakeId',
@@ -78,21 +78,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
         },
     },     
-    {
-        title: t("Last Update"),
-        dataIndex: "updatedAt",
-        key: "updatedAt",
-        width: 125,
-        render: (date, all) => {
-            if (all.empty) {
-                return <div className="daf-default-cell" />;
-            }
 
-            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
-            return <Tooltip title={_date}>{_date}</Tooltip>;
-        },
-        ellipsis: true,
-    },
     {
         title: t("Sources"),
         dataIndex: "sources",
@@ -111,6 +97,21 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
             return <AvatarGroup items={sources}></AvatarGroup>;
         },
     },
+    {
+      title: t("Last Update"),
+      dataIndex: "updatedAt",
+      key: "updatedAt",
+      width: 125,
+      render: (date, all) => {
+          if (all.empty) {
+              return <div className="daf-default-cell" />;
+          }
+
+          const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+          return <Tooltip title={_date}>{_date}</Tooltip>;
+      },
+      ellipsis: true,
+  },
     {
       id: 'actions',
       title: "",
@@ -119,14 +120,35 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         if (all.empty) {
           return <div className="daf-default-cell" />;
         }
-
-        const link = `/app/view/${subject}/${all.datastakeId}`;
-
-        return <div style={{ display: "flex", justifyContent: "center" }}>
-						<a href={getRedirectLink(link)}>
-							<CustomIcon name="Link" size={15} color={theme.baseGray70} />
-						</a>
-			</div>;
+        const onClick = () => {
+          const link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
+        const moreMenuItems = [
+          {
+            label: t("Details"),
+            value: "details",
+            onClick: onClick,
+          },
+          {
+            label: t("Summary"),
+            value: "Summary",
+            onClick: () => {
+              let link = `/app/summary/${subject}/${all.datastakeId}`
+              if (activeTab === "shared") {
+                link += `?sourceId=${all?.authorId?.id}`;
+              }
+              goTo(getRedirectLink(link));
+            },
+            // disabled: true,
+          },
+        ];
+        return <div >
+             <MoreMenu items={moreMenuItems} />
+        </div>;
       }
     }
 ].filter((column) => column.show !== false);

package/src/@daf/pages/Stakeholders/config.js

@@ -13,7 +13,16 @@ export const getFiltersConfig = ({t}) => {
 			getLabel: (option) => option.label,
 			getValue: (option) => option.value,
 		},
-    }
+		category:{
+			type: 'select',
+			label: 'Category',
+			placeholder: (t) => `${t('Filter by')} ${t('Category').toLowerCase()}`,
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		}
+	}
 }
 
 export const filtersConfig = {
@@ -22,9 +31,10 @@ export const filtersConfig = {
 };
 
 export const getFilterOptions = (options, t) => {
-	const { countries } = options || {};
+	const { countries = [], category = [] } = options || {};
 	const _default  = {
 		country: countries,
+		category: category,
 	}
 
 	return _default;

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

@@ -5,6 +5,7 @@ import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } fro
 import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
 import { displayMessage } from '../../../helpers/messages.js';
+import DAFHeader from '../../core/components/Header/index.jsx';
 
 const StakeholdersTable = ({
     t = () => {},

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

@@ -6,6 +6,21 @@ import { StorageManager } from '../../helpers/StorageManager.js';
 import { getServicesConfig } from './helpers/config.js';
 import { ErrorService } from './ErrorService.js';
 
+// Helper functions for external use
+export const getMainApiUrl = () => {
+  const config = getServicesConfig();
+  return config.mainApiUrl;
+};
+
+export const getAppHeader = () => {
+  const config = getServicesConfig();
+  return {
+    Language: StorageManager.get('datastakeLng') || 'en',
+    'ngrok-skip-browser-warning': true,
+    Application: config.application,
+  };
+};
+
 export class BaseService extends BaseHTTPService {
   constructor() {
     const config = getServicesConfig();

package/src/index.js

@@ -190,3 +190,12 @@ export { InformationChannelProvider } from "./@daf/core/components/Screens/Infor
 // UI
 export { default as SDGIcons } from "./@daf/core/components/UI/SDGIcon/index.jsx";
 export { default as CountryFlag } from "./@daf/core/components/UI/CountryFlag/index.jsx"
+
+
+//Settings
+export { default as Settings } from "./@daf/core/components/Screens/Settings/index.js";
+export { default as SettingsView } from "./@daf/core/components/Screens/Settings/View/index.js";
+export { default as SettingsEdit } from "./@daf/core/components/Screens/Settings/Edit/index.js";
+export { default as SettingsHeader } from "./@daf/core/components/Screens/Settings/components/Header/index.js";
+export { default as SettingsMenu } from "./@daf/core/components/Screens/Settings/components/Menu/index.js";
+export { INPUT_TYPES, ACTIVE_FORM_KEY, PLACEHOLDER, getDefaultActiveForm } from "./@daf/core/components/Screens/Settings/config.js";