datastake-daf 0.6.731 → 0.6.733

package/dist/pages/index.js

@@ -13518,7 +13518,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
   } : {};
@@ -13721,7 +13721,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 +15957,7 @@ function AvatarGroup({
   });
 }
 
-const getColumns = ({
+const getColumns$1 = ({
   t,
   goTo,
   user,
@@ -16050,9 +16050,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 +16113,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 +16135,11 @@ const getFiltersConfig = ({
     }
   };
 };
-const filtersConfig = {
+const filtersConfig$1 = {
   name: '',
   datastakeId: ''
 };
-const getFilterOptions = (options, t) => {
+const getFilterOptions$1 = (options, t) => {
   const {
     countries
   } = options || {};
@@ -16191,6 +16191,15 @@ const MessageTypes = {
   WARNING: 'warning'
 };
 
+/**
+ * Displays a notification message using Ant Design's message component
+ * @param {string} type - The type of message (success, error, warning)
+ * @param {string} m - The message content to display
+ */
+function displayMessage(type, m) {
+  antd.message[type](m);
+}
+
 const countriesPhoneNumberLength = {
   AD: 6,
   AE: 9,
@@ -29839,7 +29848,7 @@ function DynamicForm({
   });
 }
 
-const StakeholdersCreate = ({
+const StakeholdersCreate$1 = ({
   namespace = 'stakeholders',
   view = 'scoping',
   edit = false,
@@ -29967,7 +29976,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,
@@ -29997,6 +30006,441 @@ 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/locations`);
+        }
+      },
+      onCancel: onDrawerClose,
+      query: query,
+      ajaxForms: ajaxForms,
+      changeAjaxForms: changeAjaxForms,
+      ajaxOptions: ajaxOptions,
+      changeAjaxOptions: changeAjaxOptions,
+      formData: formData,
+      formValue: formValue,
+      form: form
+    })
+  });
+};
+
+const getColumns = ({
+  t,
+  goTo,
+  user,
+  options,
+  activeTab,
+  getRedirectLink,
+  theme,
+  subject,
+  data,
+  dataOptions
+}) => [{
+  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, dataOptions?.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"
+      });
+    }
+    findOptions(v, options?.countries);
+    return '-';
+  }
+}, {
+  dataIndex: 'administrativeLevel2',
+  title: t('District'),
+  ellipsis: true,
+  show: true,
+  render: (v, all) => {
+    if (all.empty) {
+      return /*#__PURE__*/jsxRuntime.jsx("div", {
+        className: "daf-default-cell"
+      });
+    }
+    findOptions(v, options?.countries);
+    return '-';
+  }
+}, {
+  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"
+      });
+    }
+    if (!val || val?.length === 0) {
+      return "--";
+    }
+    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
+        };
+        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 = {},
+  dataOptions = {}
+}) => {
+  const [selectOptions, setSelectOptions] = React.useState();
+  const [activeTab, setActiveTab] = React.useState();
+  const columns = React.useMemo(() => getColumns({
+    t,
+    goTo,
+    user,
+    options,
+    activeTab,
+    getRedirectLink,
+    theme,
+    subject: 'location',
+    data,
+    dataOptions
+  }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, dataOptions]);
+  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]);
   const selectFiltersConfig = React.useMemo(() => {
     return getFiltersConfig({
       t
@@ -30013,7 +30457,7 @@ const StakeholdersTable = ({
   }, []);
   return /*#__PURE__*/jsxRuntime.jsx(TablePageWithTabs, {
     t: t,
-    title: t("Stakeholders"),
+    title: t("Locations"),
     breadCrumbs: breadCrumbs,
     location: location,
     loading: loading,
@@ -30029,12 +30473,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, {
@@ -30044,19 +30488,14 @@ const StakeholdersTable = ({
       APP: APP,
       getApiBaseUrl: getApiBaseUrl,
       getAppHeader: getAppHeader,
-      defaultData: {
-        economicSector: 'miningMineralTrade'
-      },
       getData: getFormData,
       saveData: saveFormData,
       loading: formLoading,
       onSubmitted: (type, m, data) => {
-        // displayMessage(
-        //     type,
-        //     t("affirmations::subject-created-successfully") || m,
-        // );
         if (data.datastakeId) {
-          goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+          displayMessage(type, t("affirmations::subject-created-successfully") || m);
+          // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+          window.location.reload();
         }
       },
       onCancel: onDrawerClose,
@@ -30072,6 +30511,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

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.731",
+	"version": "0.6.733",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

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

@@ -0,0 +1,144 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+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';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, dataOptions}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },     
+    {
+        dataIndex: 'category',
+        title: t('Category'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const category = findOptions(v, dataOptions?.locationCategories);
+    
+          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
+        },
+    },     
+    {
+        dataIndex: 'country',
+        title: t('Country'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return country ? <Tooltip title={country}>{country}</Tooltip> : '-';
+        },
+    },      
+    {
+        dataIndex: 'administrativeLevel1',
+        title: t('Region'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return  '-';
+        },
+    },    
+    {
+        dataIndex: 'administrativeLevel2',
+        title: t('District'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const country = findOptions(v, options?.countries);
+
+          return  '-';
+        },
+    },     
+    {
+        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",
+        key: "sources",
+        show: activeTab !== "own",
+        render: (val, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+            if (!val || val?.length === 0) {
+                return "--";
+            }
+
+            return <AvatarGroup items={val}></AvatarGroup>;
+        },
+    },
+    {
+      id: 'actions',
+      title: "",
+      width: 60,
+      render: (_, all) => {
+        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>;
+      }
+    }
+].filter((column) => column.show !== false);

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

@@ -0,0 +1,31 @@
+export const checkboxConfig = {
+	name: 'Name',
+	datastakeId: 'ID'
+}
+
+export const getFiltersConfig = ({t}) => {
+    return {
+        country: {
+			type: 'select',
+			placeholder: t('Country'),
+			style: { flex: 1 },
+			labelStyle: { flex: 1 },
+			getLabel: (option) => option.label,
+			getValue: (option) => option.value,
+		},
+    }
+}
+
+export const filtersConfig = {
+	name: '',
+	datastakeId: '',
+};
+
+export const getFilterOptions = (options, t) => {
+	const { countries } = options || {};
+	const _default  = {
+		country: countries,
+	}
+
+	return _default;
+}

package/src/@daf/pages/dashboards/AllInformation/Locations/create.jsx

@@ -0,0 +1,103 @@
+import React, { useEffect} from 'react'
+import { message } from 'antd';
+import { MessageTypes } from '../../../../../helpers/messages.js';
+import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
+
+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
+    };
+
+    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 (
+        <div className="daf-create-form">
+            <DynamicForm 
+                form={form}
+                data={data}
+                showSaveAndNext={false}
+                module={APP}
+                onCancel={onCancel}
+                isCreate
+                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,
+                    };
+                
+                    const callback = (type, m, data) => {
+                        if (setSelectedFormNext) {
+                            setSelectedFormNext();
+                        }
+                        if (type === MessageTypes.SUCCESS) {
+                            if (onSubmitted) onSubmitted(type, m, data);
+                        } else {
+                            message.error(m);
+                        }
+                    };
+                    
+                    saveData(
+                        !data && !data.id ? newPayload : Object.assign(newPayload, { id: data.id }),
+                        callback,
+                    );
+                }}
+                isFormDisabled={() => {
+                    return !data || !data.typeOfEvent;
+                }}
+            />
+        </div>
+    )
+}
+
+export default StakeholdersCreate

package/src/@daf/pages/dashboards/AllInformation/Locations/index.jsx

@@ -0,0 +1,142 @@
+import React, { useMemo, useState, useEffect, useCallback } from 'react'
+import TablePageWithTabs from '../../../pages/TablePageWithTabs/index.jsx'
+import { getColumns } from './columns.js';
+import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
+import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
+import StakeholdersCreate from './create.jsx';
+import { displayMessage } from '../../../../../helpers/messages.js';
+
+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 = {},
+    dataOptions = {},
+}) => {
+    const [selectOptions, setSelectOptions] = useState();
+    const [activeTab, setActiveTab] = useState();
+    const columns = useMemo(() => getColumns({
+        t, 
+        goTo, 
+        user,
+        options,
+        activeTab,
+        getRedirectLink, 
+        theme,
+        subject: 'location',
+        data,
+        dataOptions
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, dataOptions]);
+
+    const breadCrumbs = [];
+
+    const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
+
+    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]);
+
+    const selectFiltersConfig = useMemo(() => {
+        return getFiltersConfig({t});
+    }, [t]);
+
+    useEffect(() => {
+        setSelectOptions((prev) => ({
+          ...prev,
+          ...getFilterOptions(options, t),
+        }))
+      }, [options, t])
+
+    const handleActiveTabChange = useCallback((value) => {
+        setActiveTab(value);
+    }, []);
+
+    return (
+        <TablePageWithTabs 
+           t={t}
+           title={t("Locations")}
+           breadCrumbs={breadCrumbs}
+           location={location}
+           loading={loading}
+           goTo={goTo}
+           defaultActiveTab={"all"}
+           columns={columns}
+           data={data}
+           checkboxConfig={checkboxConfig}
+           APP={APP}
+           getApiBaseUrl={getApiBaseUrl}
+           selectOptions={selectOptions}
+           selectFiltersConfig={selectFiltersConfig}
+           getRedirectLink={getRedirectLink}
+           filtersConfig={filtersConfig}
+           isMobile={isMobile}
+           view="locations"
+           getActiveTab={handleActiveTabChange}
+           onDownload={() => {
+            console.log("download");
+           }}
+           drawerTitle={t("Create Location")}
+        >
+            {({onDrawerClose}) => (
+                <StakeholdersCreate 
+                    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/edit/stakeholders/${data.datastakeId}`);
+                            window.location.reload();
+                        }
+                    }}
+                    onCancel={onDrawerClose}
+                    query={query}
+                    ajaxForms={ajaxForms}
+                    changeAjaxForms={changeAjaxForms}
+                    ajaxOptions={ajaxOptions}
+                    changeAjaxOptions={changeAjaxOptions}
+                    formData={formData}
+                    formValue={formValue}
+                    form={form}
+                />
+            )}
+        </TablePageWithTabs>
+    )
+}
+
+export default LocationsTable

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

@@ -10,7 +10,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         dataIndex: 'datastakeId',
         title: t('ID'),
         ellipsis: true,
-          show: true,
+        show: true,
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
@@ -78,9 +78,9 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         },
     },     
     {
-        title: t("Date"),
-        dataIndex: "date",
-        key: "date",
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
         width: 125,
         render: (date, all) => {
             if (all.empty) {

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

@@ -4,6 +4,7 @@ import { getColumns } from './columns.js';
 import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
 import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
 import StakeholdersCreate from './create.jsx';
+import { displayMessage } from '../../../../../helpers/messages.js';
 
 const StakeholdersTable = ({
     t = () => {},
@@ -107,19 +108,16 @@ const StakeholdersTable = ({
                     APP={APP}
                     getApiBaseUrl={getApiBaseUrl}
                     getAppHeader={getAppHeader}
-                    defaultData={{
-                        economicSector: 'miningMineralTrade'
-                    }}
                     getData={getFormData}
                     saveData={saveFormData}
                     loading={formLoading}
                     onSubmitted={(type, m, data) => {
-                        // displayMessage(
-                        //     type,
-                        //     t("affirmations::subject-created-successfully") || m,
-                        // );
                         if (data.datastakeId) {
-                            goTo(`/app/edit/stakeholders/${data.datastakeId}`);
+                            displayMessage(
+                                type,
+                                t("affirmations::subject-created-successfully") || m,
+                            );
+                            goTo(`/app/locations`);
                         }
                     }}
                     onCancel={onDrawerClose}

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

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

package/src/pages.js

@@ -4,4 +4,5 @@ export { default as UserDashboard } from './@daf/pages/dashboards/UserDashboard/
 export { default as StakeholdersTable } from './@daf/pages/dashboards/AllInformation/Stakeholders/index.jsx';
 
 // Pages
-export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';
+export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';
+export { default as LocationsTable } from './@daf/pages/dashboards/AllInformation/Locations/index.jsx';