datastake-daf 0.6.720 → 0.6.722

package/src/@daf/pages/dashboards/UserDashboard/components/Triangulation/index.jsx

@@ -0,0 +1,68 @@
+import React, { useMemo, useCallback } from 'react'
+import { useWidgetFetch } from '../../../../../hooks/useWidgetFetch.js'
+import { getConfig } from './config.js'
+import { renderTooltipJsx } from '../../../../../utils/tooltip.js'
+import Widget from '../../../../../core/components/Dashboard/Widget/index.jsx'
+import PieChart from '../../../../../core/components/Charts/PieChart/chart.jsx'
+import { useTriangulation } from './hook.js'
+
+const defaultFetchConfig = {
+	basepath: "analytics",
+	url: "/widgets/triangulation",
+	defaultData: [],
+	filters: {},
+};
+
+function Triangulation({
+    section = "data-compilation",
+	tabSelected = "dataFlow",
+	t=() => {},
+	user = {},
+	theme = {}
+}) {
+    const fetchConfig = useMemo(
+		() => ({
+			...defaultFetchConfig,
+			filters: {
+				section: section,
+				tabSelected: tabSelected,
+			},
+			stop: false,
+		}),
+		[tabSelected],
+	);
+
+    const { data: widgetData, loading } = useWidgetFetch({config: fetchConfig});
+
+    const { pieData, isEmpty, getTooltipChildren } = useTriangulation({ widgetData, theme, t, section });
+
+    return (
+        <Widget
+            loading={loading}
+            title={t(
+                section === "data-compilation"
+                    ? "Information Sharing"
+                    : "Triangulation",
+            )}
+            className="with-border-header flex-1 h-w-btn-header"
+        >
+            <div className="flex flex-1 flex-column justify-content-center pl-4 pr-4">
+                <div className="flex justify-content-center">
+                    <PieChart
+                        mouseXOffset={10}
+                        mouseYOffset={10}
+                        changeOpacityOnHover={false}
+                        data={pieData}
+                        doConstraints={false}
+                        isPie
+                        t={t}
+                        isEmpty={isEmpty}
+                        getTooltipChildren={getTooltipChildren}
+                    />
+                </div>
+            </div>
+        </Widget>
+    )
+}
+
+export default Triangulation

package/src/@daf/pages/dashboards/UserDashboard/config.js

@@ -1,27 +1,27 @@
 export const getActionWidgetsConfig = ({ goTo, getRedirectLink, APP, t }) => [
     ...(APP === 'nashiriki' ? [{
         icon: "MineSite",
-		title: t("nashiriki::create-mine-site"),
-		onClick: () => goTo(getRedirectLink("/app/scl?create=true")),
-    }] : null),
-	{
-		icon: "FileEdit",
-		title: t("nashiriki::report-activity"),
-		onClick: () => goTo(getRedirectLink("/app/corrective-actions?create=true")),
-	},
-	{
-		icon: "ReportIncidents",
-		title: t("nashiriki::report-incident"),
-		onClick: () => goTo(getRedirectLink("/app/incident?create=true")),
-	},
-	{
-		icon: "Search",
-		title: t("nashiriki::find-information"),
-		onClick: () => goTo(getRedirectLink("/app/find-information")),
-	},
-	{
-		icon: "Share",
-		title: t("nashiriki::share-information"),
-		onClick: () => goTo(getRedirectLink("/app/partners")),
-	},
-];
+        title: t("nashiriki::create-mine-site"),
+        onClick: () => goTo(getRedirectLink("/app/scl?create=true")),
+    }] : []),
+    {
+        icon: "FileEdit",
+        title: "Report Activity",
+        onClick: () => goTo(getRedirectLink("/app/corrective-actions?create=true")),
+    },
+    {
+        icon: "ReportIncidents",
+        title: "Report Incident",
+        onClick: () => goTo(getRedirectLink("/app/incident?create=true")),
+    },
+    {
+        icon: "Search",
+        title: "Find Information",
+        onClick: () => goTo(getRedirectLink("/app/find-information")),
+    },
+    {
+        icon: "Share",
+        title: "Share Information",
+        onClick: () => goTo(getRedirectLink("/app/partners")),
+    },
+];

package/src/@daf/pages/dashboards/UserDashboard/index.jsx

@@ -3,12 +3,23 @@ import { getActionWidgetsConfig } from './config'
 import ActionWidget from '../../../core/components/Dashboard/Widget/ActionWidget/index.jsx'
 import Header from '../../../core/components/Header/index.jsx'
 import DashboardLayout from '../../../core/components/Dashboard/DashboardLayout/index.jsx'
+import KeyIndicators from './components/KeyIndicators/index.jsx'
+import MineSites from './components/MineSites/index.jsx'
+import DataCompilation from './components/DataCompilation/index.jsx'
+import DataConsilidation from './components/DataConsilidation/index.jsx'
 
 function UserDashboard({
     t = () => {},
     goTo = () => {},
     getRedirectLink = () => {},
     APP,
+    theme = {},
+    partners,
+    selectedPartners,
+    setSelectedPartners,
+    informationSources,
+    user = {},
+    options = {},
 }) {
 
     const actionsWidgetsConfig = useMemo(
@@ -16,6 +27,14 @@ function UserDashboard({
         [t, getRedirectLink, APP, t],
     );
 
+    const informationSourcesCount = useMemo(() => {
+        return informationSources > 0
+            ? informationSources
+            : selectedPartners?.partners?.length > 0
+                ? selectedPartners?.partners?.length
+                : 0
+    }, [informationSources, selectedPartners]);
+
     return (
         <DashboardLayout
             header={
@@ -35,6 +54,43 @@ function UserDashboard({
                 />
                 ))}
             </section>
+            <section>
+                <KeyIndicators 
+                    theme={theme}  
+                    partners={informationSourcesCount} 
+                    t={t} 
+                    goTo={goTo} 
+                    getRedirectLink={getRedirectLink} 
+                />
+            </section>
+            <section>
+                <MineSites 
+                    t={t}
+                    goTo={goTo}
+                    getRedirectLink={getRedirectLink}
+                    theme={theme}
+                    selectedPartners={selectedPartners}
+                    setSelectedPartners={setSelectedPartners}
+                    partners={partners}
+                    user={user}
+                    options={options}
+                    APP={APP}
+                />
+            </section>
+            <section>
+                <DataCompilation 
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+            </section>
+            <section>
+                <DataConsilidation 
+                    t={t} 
+                    user={user} 
+                    theme={theme} 
+                />
+            </section>
 
         </DashboardLayout>
     )

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

@@ -128,7 +128,13 @@ class AuthenticationService extends BaseService {
 		});
 	}
 
-    inviteUser(payload) {
+    inviteUser(payload, id) {
+		if(id) {
+			return this.apiPost({
+				url: `/companies/${id}/invite`,
+				data: payload,
+			});
+		}
 		return this.apiPost({
 			url: '/companies/invite',
 			data: payload,

package/src/pages.js

@@ -1 +1,2 @@
-export { default as SupplyChainDashboard } from './@daf/pages/dashboards/SupplyChain/index.jsx';
+export { default as SupplyChainDashboard } from './@daf/pages/dashboards/SupplyChain/index.jsx';
+export { default as UserDashboard } from './@daf/pages/dashboards/UserDashboard/index.jsx';

package/dist/style/datastake/mapbox-gl.css

@@ -1,330 +0,0 @@
-/* Isolated Mapbox GL CSS - Scoped to prevent Leaflet conflicts */
-
-/* Mapbox GL Core Styles - Scoped with .mapbox-gl-scope */
-.mapbox-gl-scope .mapboxgl-map {
-  font: 12px/20px Helvetica Neue, Arial, Helvetica, sans-serif;
-  overflow: hidden;
-  position: relative;
-  -webkit-tap-highlight-color: rgb(0 0 0/0);
-}
-
-.mapbox-gl-scope .mapboxgl-canvas {
-  left: 0;
-  position: absolute;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-map:-webkit-full-screen {
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-canary {
-  background-color: salmon;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass {
-  cursor: grab;
-  -webkit-user-select: none;
-  user-select: none;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive.mapboxgl-track-pointer {
-  cursor: pointer;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-interactive:active,
-.mapbox-gl-scope .mapboxgl-ctrl-group button.mapboxgl-ctrl-compass:active {
-  cursor: grabbing;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate .mapboxgl-canvas {
-  touch-action: pan-x pan-y;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: pinch-zoom;
-}
-
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan,
-.mapbox-gl-scope .mapboxgl-canvas-container.mapboxgl-touch-zoom-rotate.mapboxgl-touch-drag-pan .mapboxgl-canvas {
-  touch-action: none;
-}
-
-/* Control positioning */
-.mapbox-gl-scope .mapboxgl-ctrl-bottom,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left,
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right,
-.mapbox-gl-scope .mapboxgl-ctrl-left,
-.mapbox-gl-scope .mapboxgl-ctrl-right,
-.mapbox-gl-scope .mapboxgl-ctrl-top,
-.mapbox-gl-scope .mapboxgl-ctrl-top-left,
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  pointer-events: none;
-  position: absolute;
-  z-index: 2;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left {
-  left: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top {
-  left: 50%;
-  top: 0;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right {
-  right: 0;
-  top: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-right {
-  right: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right {
-  bottom: 0;
-  right: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom {
-  bottom: 0;
-  left: 50%;
-  transform: translateX(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left {
-  bottom: 0;
-  left: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-left {
-  left: 0;
-  top: 50%;
-  transform: translateY(-50%);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl {
-  clear: both;
-  pointer-events: auto;
-  transform: translate(0);
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-left .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0 0 10px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-top-right .mapboxgl-ctrl {
-  float: right;
-  margin: 10px 10px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-right .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-right .mapboxgl-ctrl {
-  float: right;
-  margin: 0 10px 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom .mapboxgl-ctrl {
-  float: left;
-  margin: 10px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-bottom-left .mapboxgl-ctrl,
-.mapbox-gl-scope .mapboxgl-ctrl-left .mapboxgl-ctrl {
-  float: left;
-  margin: 0 0 10px 10px;
-}
-
-/* Control group styling */
-.mapbox-gl-scope .mapboxgl-ctrl-group {
-  background: #fff;
-  border-radius: 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group:not(:empty) {
-  box-shadow: 0 0 0 2px #0000001a;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button {
-  background-color: initial;
-  border: 0;
-  box-sizing: border-box;
-  cursor: pointer;
-  display: block;
-  height: 29px;
-  outline: none;
-  overflow: hidden;
-  padding: 0;
-  width: 29px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button+button {
-  border-top: 1px solid #ddd;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button .mapboxgl-ctrl-icon {
-  background-position: 50%;
-  background-repeat: no-repeat;
-  display: block;
-  height: 100%;
-  width: 100%;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attrib-button:focus,
-.mapbox-gl-scope .mapboxgl-ctrl-group button:focus {
-  box-shadow: 0 0 2px 2px #0096ff;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled {
-  cursor: not-allowed;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:disabled .mapboxgl-ctrl-icon {
-  opacity: .25;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:first-child {
-  border-radius: 4px 4px 0 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:last-child {
-  border-radius: 0 0 4px 4px;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-group button:only-child {
-  border-radius: inherit;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl button:not(:disabled):hover {
-  background-color: #0000000d;
-}
-
-/* Marker styles */
-.mapbox-gl-scope .mapboxgl-marker {
-  position: absolute;
-  z-index: 1;
-}
-
-.mapbox-gl-scope .mapboxgl-marker svg {
-  display: block;
-}
-
-/* Popup styles */
-.mapbox-gl-scope .mapboxgl-popup {
-  position: absolute;
-  text-align: center;
-  margin-bottom: 20px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper {
-  padding: 1px;
-  text-align: left;
-  border-radius: 12px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content {
-  margin: 13px 24px 13px 20px;
-  line-height: 1.3;
-  font-size: 13px;
-  min-height: 1px;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content p {
-  margin: 17px 0;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip-container {
-  width: 40px;
-  height: 20px;
-  position: absolute;
-  left: 50%;
-  margin-top: -1px;
-  margin-left: -20px;
-  overflow: hidden;
-  pointer-events: none;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  width: 17px;
-  height: 17px;
-  padding: 1px;
-  margin: -10px auto 0;
-  pointer-events: auto;
-  -webkit-transform: rotate(45deg);
-  -moz-transform: rotate(45deg);
-  -ms-transform: rotate(45deg);
-  transform: rotate(45deg);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-content-wrapper,
-.mapbox-gl-scope .mapboxgl-popup-tip {
-  background: white;
-  color: #333;
-  box-shadow: 0 3px 14px rgba(0, 0, 0, 0.4);
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button {
-  position: absolute;
-  top: 0;
-  right: 0;
-  border: none;
-  text-align: center;
-  width: 24px;
-  height: 24px;
-  font: 16px/24px Tahoma, Verdana, sans-serif;
-  color: #757575;
-  text-decoration: none;
-  background: transparent;
-}
-
-.mapbox-gl-scope .mapboxgl-popup-close-button:hover,
-.mapbox-gl-scope .mapboxgl-popup-close-button:focus {
-  color: #585858;
-}
-
-/* Attribution */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  background: #fff;
-  background: rgba(255, 255, 255, 0.8);
-  margin: 0;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution,
-.mapbox-gl-scope .mapboxgl-ctrl-scale-line {
-  padding: 0 5px;
-  color: #333;
-  line-height: 1.4;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a {
-  text-decoration: none;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:hover,
-.mapbox-gl-scope .mapboxgl-ctrl-attribution a:focus {
-  text-decoration: underline;
-}
-
-/* Hide attribution by default */
-.mapbox-gl-scope .mapboxgl-ctrl-attribution {
-  display: none !important;
-}
-
-.mapbox-gl-scope .mapboxgl-ctrl-logo {
-  display: none !important;
-}