datastake-daf 0.6.744 → 0.6.745

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

@@ -33,7 +33,7 @@ const TablePageWithTabs = ({
 }) => {
     const params = new URLSearchParams(location?.search);
     const [activeTab, setActiveTab] = useState(params.get("tab") || defaultActiveTab);
-    const [openCreateModal, setOpenCreateModal] = useState(false);
+    const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
 
     const getActiveTabRef = useRef(getActiveTab);
     useEffect(() => {
@@ -103,7 +103,7 @@ const TablePageWithTabs = ({
             />
             {openCreateModal && (
                 <Drawer
-                    destroyOnClose
+                    destroyOnHidden
                     title={
                         <DrawerHeader 
                             title={t(drawerTitle)}

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

@@ -219,7 +219,6 @@ class AuthenticationService extends BaseService {
 		language,
 		...params
 	}) {
-		console.log({language})
 		return this.apiPost({
 			url: '/query/form-options',
 			isDaf: true,

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

@@ -4,7 +4,6 @@ import { filterCreateData } from "../../helpers/Forms.js";
 import { removeKeysFromObject } from "../utils/object.js";
 
 export const getNamespace = (namespace) => {
-    console.log({namespace})
 	let _namespace = namespace;
 	switch (namespace) {
 		case "locations":
@@ -117,7 +116,7 @@ class LinkedSubjectsService extends BaseService {
 			url: `/forms/options`,
 			isApp: true,
 			params: {
-				id: "categoryOptions,locationCategories,countries,category,subCategory,optionPositionSupplyChain",
+				id: "categoryOptions,eventsType,locationCategories,countries,category,subCategory,optionPositionSupplyChain",
 			},
 		});
 	}

package/src/pages.js

@@ -1,16 +1,16 @@
 // Dashboards
 export { default as SupplyChainDashboard } from './@daf/pages/dashboards/SupplyChain/index.jsx';
 export { default as UserDashboard } from './@daf/pages/dashboards/UserDashboard/index.jsx';
-export { default as OperatorsTable } from './@daf/pages/dashboards/Operations/Operators/index.jsx';
-export { default as LocationsTable } from './@daf/pages/dashboards/AllInformation/Locations/index.jsx';
-export { default as StakeholdersTable } from './@daf/pages/dashboards/AllInformation/Stakeholders/index.jsx';
-export { default as EventsTable } from './@daf/pages/dashboards/AllInformation/Events/index.jsx';
-export { default as DocumentsTable } from './@daf/pages/dashboards/AllInformation/Documents/index.jsx';
-export { default as WorkersTable } from './@daf/pages/dashboards/Operations/Workers/index.jsx';
-export { default as ActivitiesTable } from './@daf/pages/dashboards/DueDilligence/Activities/index.jsx';
+export { default as OperatorsTable } from './@daf/pages/Stakeholders/Operators/index.jsx';
+export { default as LocationsTable } from './@daf/pages/Locations/index.jsx';
+export { default as StakeholdersTable } from './@daf/pages/Stakeholders/index.jsx';
+export { default as EventsTable } from './@daf/pages/Events/index.jsx';
+export { default as DocumentsTable } from './@daf/pages/Documents/index.jsx';
+export { default as WorkersTable } from './@daf/pages/Stakeholders/Workers/index.jsx';
+export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index.jsx';
 
-export { default as IncidentsTable } from './@daf/pages/dashboards/DueDilligence/Incidents/index.jsx';
-export { default as ProductionSitesTable } from './@daf/pages/dashboards/Operations/ProductionSites/index.jsx';
+export { default as IncidentsTable } from './@daf/pages/Events/Incidents/index.jsx';
+export { default as ProductionSitesTable } from './@daf/pages/Locations/MineSite/index.jsx';
 
 // Pages
 export { default as TablePageWithTabs } from './@daf/pages/pages/TablePageWithTabs/index.jsx';

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow:

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

@@ -1,151 +0,0 @@
-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';
-import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
-
-const getLinkValue = (value, linkingObject) => {
-  if(linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
-
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
-    {
-        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: 'type',
-        title: t('Type'),
-        ellipsis: true,
-        show: true,
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-
-          const type = findOptions(v, data?.options?.locationCategories);
-    
-          return type ? <Tooltip title={type}>{type}</Tooltip> : '-';
-        },
-    },     
-    {
-        dataIndex: 'keyStakeholder',
-        title: t('Key Stakeholder'),
-        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: 'scope',
-        title: t('Scope'),
-        ellipsis: true,
-        show: true,
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-
-          const scope = getLinkValue(v, all?.linking?.SCL);
-
-          return scope ? <Tooltip title={scope}>{scope}</Tooltip> : '-';
-        },
-    },    
-    {
-      title: t("Start Date"),
-      dataIndex: "startDate",
-      key: "startDate",
-      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("End Date"),
-        dataIndex: "endDate",
-        key: "endDate",
-        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" />;
-            }
-
-            const sources = sourceAvatarConfig(val, user, applications);
-
-            return <AvatarGroup items={sources}></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/Stakeholders/columns.js

@@ -1,132 +0,0 @@
-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';
-import sourceAvatarConfig from '../../../../../helpers/sourceAvatarConfig.js';
-
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
-    {
-        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, options?.categoriesOptions);
-    
-          return category ? <Tooltip title={category}>{category}</Tooltip> : '-';
-        },
-    },     
-    {
-        dataIndex: 'subCategory',
-        title: t('Sub Category'),
-        ellipsis: true,
-        show: true,
-        render: (v, all) => {
-          if (all.empty) {
-            return <div className="daf-default-cell" />
-          }
-
-          const subCategory = findOptions(v, options?.subCategoriesOptions);
-    
-          return subCategory ? <Tooltip title={subCategory}>{subCategory}</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> : '-';
-        },
-    },     
-    {
-        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 "--";
-            }
-
-            const sources = sourceAvatarConfig(val, user, applications);
-
-            return <AvatarGroup items={sources}></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);