datastake-daf 0.6.756 → 0.6.757

package/src/@daf/pages/Dashboards/SupplyChain/index.jsx

@@ -20,7 +20,7 @@ function SupplyChain({
     setSelectedPartners, 
     informationSources,
     hardcodedData,
-    breadCrumbs = [],
+    breadcrumbs = [],
 }) {
 
     const sourceOptions = useMemo(() => {
@@ -69,7 +69,7 @@ function SupplyChain({
                             />
                         </div>
                     }
-                    breadcrumbs={breadCrumbs}
+                    breadcrumbs={breadcrumbs}
                 />
             }
         >

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

@@ -34,6 +34,7 @@ const DocumentsTable = ({
     form = {},
     applications = [],
     subjectClear = () => {},
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -49,8 +50,6 @@ const DocumentsTable = ({
         applications,
     }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
-    const breadCrumbs = [];
-
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
     useEffect(() => {
@@ -91,7 +90,7 @@ const DocumentsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Documents")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Events/Activities/index.jsx

@@ -35,6 +35,7 @@ const ActivitiesTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -52,8 +53,6 @@ const ActivitiesTable = ({
         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 ActivitiesTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Activities")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

package/src/@daf/pages/Events/Incidents/index.jsx

@@ -35,6 +35,7 @@ const IncidentsTable = ({
     extendingFilters = {},
     createDefaultValues = {},
     applications = [],
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState("own");
@@ -52,8 +53,6 @@ const IncidentsTable = ({
         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 IncidentsTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("Incidents")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

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

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

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

@@ -4,7 +4,9 @@ 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';
+
 const getLinkValue = (value, linkingObject) => {
   if(linkingObject && linkingObject?.[value]) {
     return linkingObject?.[value]?.name;
@@ -12,7 +14,7 @@ const getLinkValue = (value, linkingObject) => {
   return null;
 }
 
-export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data}) => [
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
     {
         dataIndex: 'datastakeId',
         title: t('ID'),
@@ -129,15 +131,15 @@ export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink,
     
       {
         title: t("Sources"),
-        dataIndex: 'source',
+        dataIndex: 'sources',
         ellipsis: true,
         show: activeTab !== "own",
         render: (v, all) => {
           if (all.empty) {
             return <div className="daf-default-cell" />
           }
-          const source = findOptions(v, data?.options?.sourceOptions);
-          return source ? <Tooltip title={source}>{source}</Tooltip> : '-';
+          const sources = sourceAvatarConfig(v, user, applications);
+          return <AvatarGroup items={sources}></AvatarGroup>;
         },
       },
       {
@@ -149,7 +151,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/Locations/MineSite/index.jsx

@@ -34,6 +34,8 @@ const ProductionSitesTable = ({
     form = {},
     extendingFilters = {},
     createDefaultValues = {},
+    applications = [],
+    breadcrumbs = [],
 }) => {
     const [selectOptions, setSelectOptions] = useState();
     const [activeTab, setActiveTab] = useState('own');
@@ -48,9 +50,8 @@ const ProductionSitesTable = ({
         theme,
         subject: 'production-sites',
         data,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data]);
-
-    const breadCrumbs = [];
+        applications,   
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
 
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
@@ -93,7 +94,7 @@ const ProductionSitesTable = ({
         <TablePageWithTabs 
            t={t}
            title={t("production-sites")}
-           breadCrumbs={breadCrumbs}
+           breadCrumbs={breadcrumbs}
            location={location}
            loading={loading}
            goTo={goTo}

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/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/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/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/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/constants/breadCrumbs.js

@@ -0,0 +1,20 @@
+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",
+}

package/src/constants.js

@@ -0,0 +1 @@
+export { defaultBreadCrumbsLabels } from './constants/breadCrumbs.js';