datastake-daf 0.6.758 → 0.6.760

package/src/@daf/pages/Events/Incidents/columns.js

@@ -1,57 +1,12 @@
 import React from 'react';
 import { Tooltip, Tag } from 'antd';
-import { findOptions } from '../../../../helpers/StringHelper.js';
+import { findOptions, getLinkValue } 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';
-import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
-const getLinkValue = (value, linkingObject) => {
-  if(linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
-
-const getEventCategoryBySubject = (eventCategoryObject, subject) => {
-  if (!eventCategoryObject || typeof eventCategoryObject !== 'object') {
-    return null;
-  }
-  
-  const subjectSingular = subject.endsWith('ies') 
-    ? subject.slice(0, -3) + 'y'
-    : subject.endsWith('s') 
-    ? subject.slice(0, -1)       
-    : subject;                      
-
-  const key = `typeOfEvent is ${subjectSingular}`;
-  return eventCategoryObject[key] || null;
-};
-
-export const renderStatusTag = ({ value, t = (s) => s }) => {
-	const width = 87;
-
-	switch (value) {
-		case "edited":
-			return (
-				<Tag color="yellow" style={{ width }} className="text-center">
-					{t("Edited")}
-				</Tag>
-			);
-		case "submitted":
-			return (
-				<Tag color="green" style={{ width }} className="text-center">
-					{t("Submitted")}
-				</Tag>
-			);
-		default:
-			return (
-				<Tag color="blue" style={{ width }} className="text-center">
-					{t("Private")}
-				</Tag>
-			);
-	}
-};
+import { getEventCategoryBySubject } from '../helper.js';
+import { renderStatusTag } from '../../../utils/tags.js';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
@@ -209,23 +164,14 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />;
         }
         const onClick = () => {
-          const link = `/app/view/${subject}/${all.datastakeId}`;
+          let 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,
-          },
-     
-        ];
-        return <div >
-             <MoreMenu items={moreMenuItems} />
-        </div>;
+
+        return <NavigationAction onClick={onClick} theme={theme} />;
       }
     }
 ].filter((column) => column.show !== false);

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

@@ -2,43 +2,11 @@ import React from 'react';
 import { Tooltip, Tag } from 'antd';
 import { findOptions } from '../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../helpers/Forms.js';
-import CustomIcon from '../../core/components/Icon/CustomIcon.jsx';
-// import CustomIcon from '../../core/components/';
 import AvatarGroup from '../../core/components/AvatarGroup/index.jsx';
 import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
 import MoreTags from '../../core/components/Table/MoreTags/index.jsx';
-import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
-const getLinkValue = (value, linkingObject) => {
-  if (linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
-
-export const renderEventStatusTag = ({ value, t = (s) => s }) => {
-  const width = 87;
-
-  switch (value) {
-    case "edited":
-      return (
-        <Tag color="orange" style={{ width }} className="text-center">
-          {t("Edited")}
-        </Tag>
-      );
-    case "submitted":
-      return (
-        <Tag color="green" style={{ width }} className="text-center">
-          {t("Submitted")}
-        </Tag>
-      );
-    default:
-      return (
-        <Tag color="blue" style={{ width }} className="text-center">
-          {t("Private")}
-        </Tag>
-      );
-  }
-};
+import NavigationAction from '../../core/components/Table/NavigationAction/index.jsx';
+import { renderStatusTag } from '../../utils/tags.js';
 
 export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications }) => [
   {
@@ -200,7 +168,7 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
       }
 
       const _val = all?.published || all?.status === "submitted" ? "submitted" : value;
-      return renderEventStatusTag({ value: _val, t });
+      return renderStatusTag({ value: _val, t });
     },
     ellipsis: true,
   },
@@ -227,23 +195,14 @@ export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink,
         return <div className="daf-default-cell" />;
       }
       const onClick = () => {
-        const link = `/app/view/${subject}/${all.datastakeId}`;
+        let 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,
-        },
-    
-      ];
-      return <div >
-           <MoreMenu items={moreMenuItems} />
-      </div>;
+
+      return <NavigationAction onClick={onClick} theme={theme} />;
     }
   }
 ].filter((column) => column.show !== false);

package/src/@daf/pages/Events/helper.js

@@ -0,0 +1,14 @@
+export const getEventCategoryBySubject = (eventCategoryObject, subject) => {
+    if (!eventCategoryObject || typeof eventCategoryObject !== 'object') {
+      return null;
+    }
+    
+    const subjectSingular = subject.endsWith('ies') 
+      ? subject.slice(0, -3) + 'y'
+      : subject.endsWith('s') 
+      ? subject.slice(0, -1)       
+      : subject;                      
+  
+    const key = `typeOfEvent is ${subjectSingular}`;
+    return eventCategoryObject[key] || null;
+  };

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

@@ -1,19 +1,12 @@
 import React from 'react';
 import { Tooltip } from 'antd';
-import { findOptions } from '../../../../helpers/StringHelper.js';
+import { findOptions, getLinkValue } 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';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
 
-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',

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

@@ -1,17 +1,10 @@
 import React from 'react';
 import { Tooltip } from 'antd';
-import { findOptions } from '../../../helpers/StringHelper.js';
+import { findOptions, getLinkValue } 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';
-import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
-const getLinkValue = (value, linkingObject) => {
-  if(linkingObject && linkingObject?.[value]) {
-    return linkingObject?.[value]?.name;
-  }
-  return null;
-}
+import NavigationAction from '../../core/components/Table/NavigationAction/index.jsx';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
@@ -139,35 +132,16 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
         if (all.empty) {
           return <div className="daf-default-cell" />;
         }
+
         const onClick = () => {
-          const link = `/app/view/${subject}/${all.datastakeId}`;
+          let 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>;
+
+        return <NavigationAction onClick={onClick} theme={theme} />;
       }
     }
 ].filter((column) => column.show !== false);

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

@@ -0,0 +1,11 @@
+import React from 'react';
+
+const Partners = () => {
+    return (
+        <div>
+            <h1>Partners</h1>
+        </div>
+    );
+};
+
+export default Partners

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

@@ -1,17 +1,11 @@
 import React from 'react';
 import { Tooltip } from 'antd';
-import { findOptions } from '../../../../helpers/StringHelper.js';
+import { findOptions, getLinkValue } 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';
 import MoreMenu from '../../../core/components/Table/MoreMenu/index.jsx';
-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}) => [
     {
@@ -153,7 +147,7 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />;
         }
         const onClick = () => {
-          const link = `/app/view/${subject}/${all.datastakeId}`;
+          let link = `/app/view/${subject}/${all.datastakeId}`;
           if (activeTab === "shared") {
             link += `?sourceId=${all?.authorId?.id}`;
           }

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

@@ -2,41 +2,10 @@ import React from 'react';
 import { Tooltip, Tag } from 'antd';
 import { findOptions } from '../../../../helpers/StringHelper.js';
 import { renderDateFormatted } from '../../../../helpers/Forms.js';
-import CustomIcon from '../../../core/components/Icon/CustomIcon.jsx';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.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 renderStatusTag = ({ value, t = (s) => s }) => {
-	const width = 87;
-
-	switch (value) {
-		case "edited":
-			return (
-				<Tag color="yellow" style={{ width }} className="text-center">
-					{t("Edited")}
-				</Tag>
-			);
-		case "submitted":
-			return (
-				<Tag color="green" style={{ width }} className="text-center">
-					{t("Submitted")}
-				</Tag>
-			);
-		default:
-			return (
-				<Tag color="blue" style={{ width }} className="text-center">
-					{t("Private")}
-				</Tag>
-			);
-	}
-};
+import { renderStatusTag } from '../../../utils/tags.js';
 
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     // {
@@ -164,23 +133,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />;
         }
 
-        const link = `/app/view/${subject}/${all.datastakeId}`;
+        const onClick = () => {
+          let link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
 
-        return <div style={{ display: "flex", justifyContent: "center" }}>
-            <button 
-                onClick={() => goTo(getRedirectLink(link))}
-                style={{ 
-                    cursor: 'pointer', 
-                    border: 'none', 
-                    background: 'transparent',
-                    padding: 0,
-                    display: 'flex',
-                    alignItems: 'center'
-                }}
-            >
-                <CustomIcon name="Link" size={15} color={theme.baseGray70} />
-            </button>
-        </div>;
+        return <NavigationAction onClick={onClick} theme={theme} />;
       }
     }
 ].filter((column) => column.show !== false);

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

@@ -2,10 +2,10 @@ 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';
-import MoreMenu from '../../core/components/Table/MoreMenu/index.jsx';
+import NavigationAction from '../../core/components/Table/NavigationAction/index.jsx';
+
 export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, applications}) => [
     {
         dataIndex: 'datastakeId',
@@ -121,34 +121,13 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
           return <div className="daf-default-cell" />;
         }
         const onClick = () => {
-          const link = `/app/view/${subject}/${all.datastakeId}`;
+          let 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>;
+        return <NavigationAction onClick={onClick} theme={theme} />;
       }
     }
 ].filter((column) => column.show !== false);