datastake-daf 0.6.732 → 0.6.734

package/dist/hooks/index.js

@@ -6925,7 +6925,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, []);
+  }, [config]);
   return {
     data,
     loading,

package/dist/pages/index.js

@@ -6788,7 +6788,7 @@ const useWidgetFetch = ({
   };
   React.useEffect(() => {
     fetchData();
-  }, []);
+  }, [config]);
   return {
     data,
     loading,
@@ -11990,30 +11990,32 @@ const mapIcon = category => {
 };
 const leftBackground = theme.colorPrimary3;
 const rightBackground = theme.colorPrimary6;
-const mapDataForChainOfCustody = (data = {}, options = [], goTo = () => {}) => {
+const mapDataForChainOfCustody = (data = {}, options = {}, goTo = () => {}) => {
   const mapChildren = (items, type, parentId, isDirect = true) => {
-    return (items ?? []).map(item => ({
-      id: item.id,
-      number: 0,
-      name: item.name,
-      sources: parentId ? [parentId] : [],
-      subTitle: findOptions(item.category, options),
-      leftIcon: type === "client" ? rightIcon : leftIcon,
-      leftBackground: type === "client" ? rightBackground : leftBackground,
-      topIcon: mapIcon(item.category),
-      children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
-      onClick: () => {
-        if (isDirect && parentId === data.id) {
-          goTo(`/app/partners?datastakeId=${item.id}`);
+    return (items ?? []).map(item => {
+      return {
+        id: item.id,
+        number: 0,
+        name: item.name,
+        sources: parentId ? [parentId] : [],
+        subTitle: findOptions(item?.category, options?.categoriesOptions),
+        leftIcon: type === "client" ? rightIcon : leftIcon,
+        leftBackground: type === "client" ? rightBackground : leftBackground,
+        topIcon: mapIcon(item.category),
+        children: mapChildren(item.sources ?? item.clients ?? [], type, item.id, false),
+        onClick: () => {
+          if (isDirect && parentId === data.id) {
+            goTo(`/app/partners?datastakeId=${item.id}`);
+          }
         }
-      }
-    }));
+      };
+    });
   };
   return {
     id: data.id,
     number: 0,
     name: data.name,
-    subTitle: findOptions(data.category, options),
+    subTitle: findOptions(data?.category, options?.categoriesOptions),
     leftIcon: middleIcon,
     leftBackground: theme.colorPrimary10,
     topIcon: mapIcon(data.category),
@@ -12044,7 +12046,7 @@ function TradeRelationships({
   } = useWidgetFetch({
     config: fetchConfig
   });
-  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options?.category ?? [], goTo);
+  const mappedData = mapDataForChainOfCustody(Object.keys(data)?.length > 0 ? data : hardcodedData, options, goTo);
   return /*#__PURE__*/jsxRuntime.jsx(Widget, {
     loading: loading,
     title: t("Trade Relationships"),
@@ -12430,6 +12432,9 @@ function Identification({
     label: t("Monthly"),
     value: "monthly"
   }], [t]);
+  console.log({
+    identificationData: data
+  });
   const chartConfig = useIdentification({
     data,
     theme,
@@ -13518,7 +13523,7 @@ const getTabs = t => {
     label: t("Events")
   }];
 };
-const getFiltersConfig$1 = (t, filters, locationCategories) => {
+const getFiltersConfig$2 = (t, filters, locationCategories) => {
   const value = filters.type ? {
     value: filters.type
   } : {};
@@ -13713,6 +13718,12 @@ function MineSites({
     defaultData: [],
     stop: selectedPartners?.loading
   }), [activeTab, selectedPartners]);
+  console.log({
+    activeTab
+  });
+  console.log({
+    dataFetchConfig
+  });
   const {
     data,
     loading,
@@ -13721,7 +13732,7 @@ function MineSites({
     config: dataFetchConfig
   });
   const tabs = React.useMemo(() => getTabs(t), [t]);
-  const filtersConfig = React.useMemo(() => getFiltersConfig$1(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
+  const filtersConfig = React.useMemo(() => getFiltersConfig$2(t, filters, locationCategories), [activeTab, filters, t, locationCategories]);
   const onFilterChange = filters => {
     setFilters(p => ({
       ...p,
@@ -15957,7 +15968,7 @@ function AvatarGroup({
   });
 }
 
-const getColumns = ({
+const getColumns$1 = ({
   t,
   goTo,
   user,
@@ -16050,9 +16061,9 @@ const getColumns = ({
     }) : '-';
   }
 }, {
-  title: t("Date"),
-  dataIndex: "date",
-  key: "date",
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
   width: 125,
   render: (date, all) => {
     if (all.empty) {
@@ -16113,11 +16124,11 @@ const getColumns = ({
   }
 }].filter(column => column.show !== false);
 
-const checkboxConfig = {
+const checkboxConfig$1 = {
   name: 'Name',
   datastakeId: 'ID'
 };
-const getFiltersConfig = ({
+const getFiltersConfig$1 = ({
   t
 }) => {
   return {
@@ -16135,11 +16146,11 @@ const getFiltersConfig = ({
     }
   };
 };
-const filtersConfig = {
+const filtersConfig$1 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions = (options, t) => {
+const getFilterOptions$1 = (options, t) => {
   const {
     countries
   } = options || {};
@@ -29848,7 +29859,7 @@ function DynamicForm({
   });
 }
 
-const StakeholdersCreate = ({
+const StakeholdersCreate$1 = ({
   namespace = 'stakeholders',
   view = 'scoping',
   edit = false,
@@ -29924,7 +29935,8 @@ const StakeholdersCreate = ({
         };
         const newPayload = {
           ...defaultData,
-          ...payloadData
+          ...payloadData,
+          form: 'stakeholder'
         };
         const callback = (type, m, data) => {
           if (setSelectedFormNext) {
@@ -29976,7 +29988,7 @@ const StakeholdersTable = ({
 }) => {
   const [selectOptions, setSelectOptions] = React.useState();
   const [activeTab, setActiveTab] = React.useState();
-  const columns = React.useMemo(() => getColumns({
+  const columns = React.useMemo(() => getColumns$1({
     t,
     goTo,
     user,
@@ -29984,7 +29996,7 @@ const StakeholdersTable = ({
     activeTab,
     getRedirectLink,
     theme,
-    subject: 'stakeholder'
+    subject: 'stakeholders'
   }), [t, goTo, user, options, activeTab, getRedirectLink, theme]);
   const breadCrumbs = [];
   const {
@@ -30006,6 +30018,455 @@ const StakeholdersTable = ({
       tab: activeTab
     }, 'stakeholders');
   }, [paginationQuery, otherParams, searchParams, activeTab]);
+  const selectFiltersConfig = React.useMemo(() => {
+    return getFiltersConfig$1({
+      t
+    });
+  }, [t]);
+  React.useEffect(() => {
+    setSelectOptions(prev => ({
+      ...prev,
+      ...getFilterOptions$1(options)
+    }));
+  }, [options, t]);
+  const handleActiveTabChange = React.useCallback(value => {
+    setActiveTab(value);
+  }, []);
+  return /*#__PURE__*/jsxRuntime.jsx(TablePageWithTabs, {
+    t: t,
+    title: t("Stakeholders"),
+    breadCrumbs: breadCrumbs,
+    location: location,
+    loading: loading,
+    goTo: goTo,
+    defaultActiveTab: "all",
+    columns: columns,
+    data: data,
+    checkboxConfig: checkboxConfig$1,
+    APP: APP,
+    getApiBaseUrl: getApiBaseUrl,
+    selectOptions: selectOptions,
+    selectFiltersConfig: selectFiltersConfig,
+    getRedirectLink: getRedirectLink,
+    filtersConfig: filtersConfig$1,
+    isMobile: isMobile,
+    view: "stakeholders",
+    getActiveTab: handleActiveTabChange,
+    onDownload: () => {
+      console.log("download");
+    },
+    drawerTitle: t("Create Stakeholder"),
+    children: ({
+      onDrawerClose
+    }) => /*#__PURE__*/jsxRuntime.jsx(StakeholdersCreate$1, {
+      t: t,
+      goTo: goTo,
+      user: user,
+      APP: APP,
+      getApiBaseUrl: getApiBaseUrl,
+      getAppHeader: getAppHeader,
+      getData: getFormData,
+      saveData: saveFormData,
+      loading: formLoading,
+      onSubmitted: (type, m, data) => {
+        if (data.datastakeId) {
+          displayMessage(type, t("affirmations::subject-created-successfully") || m);
+          goTo(`/app/stakeholders`);
+        }
+      },
+      onCancel: onDrawerClose,
+      query: query,
+      ajaxForms: ajaxForms,
+      changeAjaxForms: changeAjaxForms,
+      ajaxOptions: ajaxOptions,
+      changeAjaxOptions: changeAjaxOptions,
+      formData: formData,
+      formValue: formValue,
+      form: form
+    })
+  });
+};
+
+const getLinkValue = (value, linkingObject) => {
+  if (linkingObject && linkingObject?.[value]) {
+    return linkingObject?.[value]?.name;
+  }
+  return null;
+};
+const getColumns = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data
+}) => [{
+  dataIndex: 'datastakeId',
+  title: t('ID'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'name',
+  title: t('Name'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: v,
+      children: v
+    });
+  }
+}, {
+  dataIndex: 'category',
+  title: t('Category'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const category = findOptions(v, data?.options?.locationCategories);
+    return category ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: category,
+      children: category
+    }) : '-';
+  }
+}, {
+  dataIndex: 'country',
+  title: t('Country'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const country = findOptions(v, options?.countries);
+    return country ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: country,
+      children: country
+    }) : '-';
+  }
+}, {
+  dataIndex: 'administrativeLevel1',
+  title: t('Region'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const region = getLinkValue(v, all?.linking?.SCL);
+    return region ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: region,
+      children: region
+    }) : '-';
+  }
+}, {
+  dataIndex: 'administrativeLevel2',
+  title: t('District'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const district = getLinkValue(v, all?.linking?.SCL);
+    return district ? /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: district,
+      children: district
+    }) : '-';
+  }
+}, {
+  title: t("Last Update"),
+  dataIndex: "updatedAt",
+  key: "updatedAt",
+  width: 125,
+  render: (date, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+    return /*#__PURE__*/jsxRuntime.jsx(antd.Tooltip, {
+      title: _date,
+      children: _date
+    });
+  },
+  ellipsis: true
+}, {
+  title: t("Sources"),
+  dataIndex: "sources",
+  key: "sources",
+  show: activeTab !== "own",
+  render: (val, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    console.log({
+      val,
+      all
+    });
+    return /*#__PURE__*/jsxRuntime.jsx(AvatarGroup, {
+      items: val
+    });
+  }
+}, {
+  id: 'actions',
+  title: "",
+  width: 60,
+  render: (_, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    const link = `/app/view/${subject}/${all.datastakeId}`;
+    return /*#__PURE__*/jsxRuntime.jsx("div", {
+      style: {
+        display: "flex",
+        justifyContent: "center"
+      },
+      children: /*#__PURE__*/jsxRuntime.jsx("a", {
+        href: getRedirectLink(link),
+        children: /*#__PURE__*/jsxRuntime.jsx(CustomIcon, {
+          name: "Link",
+          size: 15,
+          color: theme.baseGray70
+        })
+      })
+    });
+  }
+}].filter(column => column.show !== false);
+
+const checkboxConfig = {
+  name: 'Name',
+  datastakeId: 'ID'
+};
+const getFiltersConfig = ({
+  t
+}) => {
+  return {
+    country: {
+      type: 'select',
+      placeholder: t('Country'),
+      style: {
+        flex: 1
+      },
+      labelStyle: {
+        flex: 1
+      },
+      getLabel: option => option.label,
+      getValue: option => option.value
+    }
+  };
+};
+const filtersConfig = {
+  name: '',
+  datastakeId: ''
+};
+const getFilterOptions = (options, t) => {
+  const {
+    countries
+  } = options || {};
+  const _default = {
+    country: countries
+  };
+  return _default;
+};
+
+const StakeholdersCreate = ({
+  namespace = 'locations',
+  view = 'scoping',
+  edit = false,
+  formData = {},
+  loading = false,
+  onSubmitted = () => {},
+  onCancel = () => {},
+  getData = () => {},
+  saveData = () => {},
+  form: formConfig = {},
+  formValue = {},
+  defaultData = {},
+  user = {},
+  APP,
+  query,
+  goTo = () => {},
+  t = () => {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  getAppHeader = () => {},
+  getApiBaseUrl = () => {}
+}) => {
+  let {
+    form = {},
+    data = defaultData || {}
+  } = !edit ? formData[`${APP}-${view}`] || {} : {
+    form: formConfig,
+    data: formValue
+  };
+  React.useEffect(() => {
+    if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
+      if (!edit) {
+        getData({
+          namespace,
+          module: APP,
+          view,
+          scope: 'global'
+        });
+      } else {
+        form = formConfig;
+        data = formValue;
+      }
+    }
+  }, [edit, user?.language]);
+  return /*#__PURE__*/jsxRuntime.jsx("div", {
+    className: "daf-create-form",
+    children: /*#__PURE__*/jsxRuntime.jsx(DynamicForm, {
+      form: form,
+      data: data,
+      showSaveAndNext: false,
+      module: APP,
+      onCancel: onCancel,
+      isCreate: true,
+      t: t,
+      excludedKeys: ["title"],
+      user: user,
+      ajaxForms: ajaxForms,
+      ajaxOptions: ajaxOptions,
+      getAppHeader: getAppHeader,
+      getApiBaseUrl: getApiBaseUrl,
+      changeAjaxOptions: changeAjaxOptions,
+      app: APP,
+      query: query,
+      goTo: goTo,
+      changeAjaxForms: changeAjaxForms,
+      submit: (payload, setSelectedFormNext) => {
+        const payloadData = {
+          ...payload,
+          module: APP,
+          namespace
+        };
+        const newPayload = {
+          ...defaultData,
+          ...payloadData,
+          form: 'location'
+        };
+        const callback = (type, m, data) => {
+          if (setSelectedFormNext) {
+            setSelectedFormNext();
+          }
+          if (type === MessageTypes.SUCCESS) {
+            if (onSubmitted) onSubmitted(type, m, data);
+          } else {
+            antd.message.error(m);
+          }
+        };
+        saveData(!data && !data.id ? newPayload : Object.assign(newPayload, {
+          id: data.id
+        }), callback);
+      },
+      isFormDisabled: () => {
+        return !data || !data.typeOfEvent;
+      }
+    })
+  });
+};
+
+const LocationsTable = ({
+  t = () => {},
+  goTo = () => {},
+  user = {},
+  options = {},
+  getRedirectLink = () => {},
+  theme = {},
+  loading = false,
+  data = {},
+  isMobile,
+  APP,
+  location,
+  getData = () => {},
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  getFormData = () => {},
+  saveFormData = () => {},
+  formLoading = false,
+  query = {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  formData = {},
+  formValue = {},
+  form = {}
+}) => {
+  const [selectOptions, setSelectOptions] = React.useState();
+  const [activeTab, setActiveTab] = React.useState();
+  const columns = React.useMemo(() => getColumns({
+    t,
+    goTo,
+    user,
+    options,
+    activeTab,
+    getRedirectLink,
+    theme,
+    subject: 'locations',
+    data
+  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
+  const breadCrumbs = [];
+  const {
+    paginationQuery,
+    searchParams,
+    otherParams
+  } = useGetQueryParams({
+    location
+  });
+  React.useEffect(() => {
+    getData({
+      pagination: paginationQuery,
+      ...(Object.keys(otherParams).length > 0 && {
+        filters: otherParams
+      }),
+      ...(Object.keys(searchParams).length > 0 && {
+        search: searchParams
+      }),
+      tab: activeTab
+    }, 'locations');
+  }, [paginationQuery, otherParams, searchParams, activeTab]);
+  console.log({
+    data
+  });
   const selectFiltersConfig = React.useMemo(() => {
     return getFiltersConfig({
       t
@@ -30022,7 +30483,7 @@ const StakeholdersTable = ({
   }, []);
   return /*#__PURE__*/jsxRuntime.jsx(TablePageWithTabs, {
     t: t,
-    title: t("Stakeholders"),
+    title: t("Locations"),
     breadCrumbs: breadCrumbs,
     location: location,
     loading: loading,
@@ -30038,12 +30499,12 @@ const StakeholdersTable = ({
     getRedirectLink: getRedirectLink,
     filtersConfig: filtersConfig,
     isMobile: isMobile,
-    view: "stakeholders",
+    view: "locations",
     getActiveTab: handleActiveTabChange,
     onDownload: () => {
       console.log("download");
     },
-    drawerTitle: t("Create Stakeholder"),
+    drawerTitle: t("Create Location"),
     children: ({
       onDrawerClose
     }) => /*#__PURE__*/jsxRuntime.jsx(StakeholdersCreate, {
@@ -30053,16 +30514,14 @@ const StakeholdersTable = ({
       APP: APP,
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
-      defaultData: {
-        economicSector: 'miningMineralTrade'
-      },
       getData: getFormData,
       saveData: saveFormData,
       loading: formLoading,
       onSubmitted: (type, m, data) => {
         if (data.datastakeId) {
           displayMessage(type, t("affirmations::subject-created-successfully") || m);
-          goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+          // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+          goTo('/app/locations');
         }
       },
       onCancel: onDrawerClose,
@@ -30078,6 +30537,7 @@ const StakeholdersTable = ({
   });
 };
 
+exports.LocationsTable = LocationsTable;
 exports.StakeholdersTable = StakeholdersTable;
 exports.SupplyChainDashboard = SupplyChain;
 exports.TablePageWithTabs = TablePageWithTabs;

package/dist/services/index.js

@@ -1359,7 +1359,7 @@ class LinkedSubjectsService extends BaseService {
   }) {
     const _namespace = getNamespace(namespace);
     return this.apiGet({
-      url: `/${_namespace}/associated-information`,
+      url: `/${_namespace}`,
       isApp: true,
       params: query,
       signal