datastake-daf 0.6.759 → 0.6.761

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

@@ -34,6 +34,7 @@ const LocationsTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -51,8 +52,6 @@ const LocationsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-    const breadCrumbs = [];
-
     const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -92,7 +91,7 @@ const LocationsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Locations")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

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/Operators/index.jsx

@@ -35,6 +35,7 @@ const OperatorsTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -52,7 +53,6 @@ const OperatorsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-    const breadCrumbs = [];
 
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
@@ -95,7 +95,7 @@ const OperatorsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Operators")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

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/Workers/index.jsx

@@ -35,6 +35,7 @@ const WorkersTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -52,8 +53,6 @@ const WorkersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
-    const breadCrumbs = [];
-
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     const filters = useMemo(() => {
@@ -95,7 +94,7 @@ const WorkersTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Workers")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

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);

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

@@ -35,6 +35,7 @@ const StakeholdersTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -50,8 +51,6 @@ const StakeholdersTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
-    const breadCrumbs = [];
-
     const { paginationQuery, searchParams, otherParams } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -89,7 +88,7 @@ const StakeholdersTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Stakeholders")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Summary/Minesite/components/LocationMap/index.js

@@ -1,7 +1,6 @@
 import React, { useMemo } from 'react'
 import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
 import Map from '../../../../../core/components/Dashboard/Map/index.jsx'
-import { getLinkValue } from '../../../../../../helpers/StringHelper.js'
 
 const LocationMap = ({
     selectedPartners = {},

package/src/@daf/pages/Summary/Minesite/index.jsx

@@ -29,6 +29,7 @@ const MineSummary = ({
     getRedirectLink = () => {},
     goBack = () => {},
     onIdChange = () => {},
+    breadcrumbs = [],
 }) => {
     const { 
         selectedItem, 
@@ -70,6 +71,7 @@ const MineSummary = ({
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
                     loading={loading}
+                    breadcrumbs={breadcrumbs}
                     addedHeaderFirst
 					actionButtons={[
                         {

package/src/@daf/pages/Summary/Operator/index.jsx

@@ -29,7 +29,8 @@ const OperatorSummary = ({
     goTo = () => {},
     getRedirectLink = () => {},
     goBack = () => {},
-    onIdChange = () => {}
+    onIdChange = () => {},
+    breadcrumbs = [],
 }) => {
     const { 
         selectedItem, 
@@ -70,6 +71,7 @@ const OperatorSummary = ({
                     title={hasSelect ? t("Operator Review") : (singleItemData?.name || "") + " " + t("Summary")}
                     className="with-border-header h-w-btn-header no-px-body"
                     goBackTo={!hasSelect && goBack}
+                    breadcrumbs={breadcrumbs}
                     addedHeaderFirst
 					actionButtons={[
                         {

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

@@ -0,0 +1,76 @@
+import { BaseService } from "./BaseService.js";
+import { createLazyService } from "./helpers/LazyService.js";
+
+class PartnerService extends BaseService {
+	get(tab, filters) {
+		const { page, pageSize, search, searchParams, ...rest } = filters;
+		const params = {
+			filters: rest,
+			pagination: {
+				skip: page,
+				take: pageSize,
+			},
+		};
+		if (search && searchParams.length > 0) {
+			params.search = {
+				qs: search,
+				fields: searchParams,
+			};
+		}
+
+		return this.apiGet({
+			url: "/partner",
+			isApp: true,
+			params,
+		});
+	}
+
+	create(data) {
+		return this.apiPost({
+			url: "/partner",
+			isApp: true,
+			data,
+		});
+	}
+
+	accept(id) {
+		return this.apiPut({ url: `/partner/approve/${id}`, isApp: true });
+	}
+
+	activate(id) {
+		return this.apiPut({ url: `/partner/activate/${id}`, isApp: true });
+	}
+
+	decline(id) {
+		return this.apiPut({ url: `/partner/decline/${id}`, isApp: true });
+	}
+
+	suspend(id) {
+		return this.apiPut({ url: `/partner/suspend/${id}`, isApp: true });
+	}
+
+	block(id) {
+		return this.apiPut({ url: `/partner/block/${id}`, isApp: true });
+	}
+
+	resendInvite(id) {
+		return this.apiPut({ url: `/partner/resendInvite/${id}`, isApp: true });
+	}
+
+	getSubjectSources({ id, namespace = "stakeholder" }) {
+		return this.apiGet({
+			url: `/${namespace}/sources-for-subject/${id}`,
+			isApp: true,
+		});
+	}
+
+	update(id, data) {
+		return this.apiPut({
+			url: `/partner/${id}`,
+			isApp: true,
+			data,
+		});
+	}
+}
+
+export default createLazyService(PartnerService);

package/src/@daf/utils/tags.js

@@ -0,0 +1,26 @@
+import { Tag } from "antd";
+
+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>
+			);
+	}
+};

package/src/constants/breadCrumbs.js

@@ -0,0 +1,22 @@
+export const defaultBreadCrumbsLabels = {
+    events: "Events",
+    accounts: "Accounts",
+    modules: "Modules",
+    settings: "Settings",
+    user: "Users",
+    analysis: "Analysis",
+    'data-store': "Data Store",
+    data: "Data",
+    partners: "Partners",
+    locations: "Locations",
+    'information-channels': 'Channels',
+	'find-information': 'Query',
+    stakeholders: "Stakeholders",
+    documents: "Documents",
+    mines: "Mines",
+    summary: "Summary",
+    edit: "Edit",
+    details: "Details",
+    query: "Query",
+    channels: "Channels",
+}

package/src/constants.js

@@ -0,0 +1,2 @@
+export { defaultBreadCrumbsLabels } from './constants/breadCrumbs.js';
+export { CREATE_DRAWER_WIDTH, CREATE_DRAWER_WIDTH_LARGE } from './helpers/Forms.js';