datastake-daf 0.6.816 → 0.6.818

package/dist/services/index.js

@@ -1458,6 +1458,11 @@ class LinkedSubjectsService extends BaseService {
   getForm({
     namespace
   }, language = "en", scope) {
+    console.log({
+      namespace,
+      language,
+      scope
+    });
     return this.apiGet({
       url: `forms/${namespace === "documents" ? namespace : getNamespace(namespace)}`,
       isApp: true,
@@ -1727,6 +1732,201 @@ class PartnerService extends BaseService {
 }
 var PartnerService$1 = createLazyService(PartnerService);
 
+class EventsService extends BaseService {
+  getForm({
+    scope
+  }, language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/event`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getWithModule({
+    query,
+    signal,
+    module
+  }) {
+    return this.apiGet({
+      isApp: true,
+      url: `/${module}/event`,
+      params: query,
+      signal
+    });
+  }
+  getOne({
+    id,
+    module,
+    signal
+  }) {
+    return this.apiGet({
+      url: `/${module}/event/${id}`,
+      isApp: true,
+      signal
+    });
+  }
+  get(query, signal) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event",
+      params: query,
+      signal
+    });
+  }
+  getData(id, sourceId, source, version) {
+    return this.apiGet({
+      isApp: true,
+      url: `/event/${id}`,
+      params: {
+        authorId: sourceId,
+        source,
+        version
+      }
+    });
+  }
+  getLinking(query) {
+    return this.apiGet({
+      isApp: true,
+      url: "/event/linking",
+      params: query
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      return this.apiPut({
+        isApp: true,
+        url: `/event/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPut({
+        isApp: true,
+        url: "/event",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/event",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/event/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/event/${id}/remove`,
+      data: data
+    });
+  }
+  submitForm(id) {
+    const app = window.globalServicesConfig.application;
+    return this.apiPost({
+      isApp: true,
+      url: `/${app}/versioning/submit/Event/${id}`
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "categoryOptions,eventsType,testimonialsType,eventCategory,countries,eventCategoryOptions"
+      }
+    });
+  }
+}
+var EventsService$1 = createLazyService(EventsService);
+
+class WorkersService extends BaseService {
+  get(params) {
+    return this.apiGet({
+      isApp: true,
+      url: "/stakeholder",
+      params
+    });
+  }
+  getForm(scope = "modalNashirikiWorker", language = "en") {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/stakeholder`,
+      params: {
+        scope,
+        language
+      }
+    });
+  }
+  getData(id, sourceId, version, source) {
+    return this.apiGet({
+      isApp: true,
+      url: `/stakeholder/${id}`,
+      params: {
+        authorId: sourceId,
+        version,
+        source
+      }
+    });
+  }
+  submit(payload) {
+    if (payload.id) {
+      // const { id, ...data } = payload;
+      return this.apiPut({
+        isApp: true,
+        url: `/stakeholder/${payload.id}`,
+        data: filterCreateData(payload)
+      });
+    }
+    if (payload?.form) {
+      delete payload.form;
+      return this.apiPost({
+        isApp: true,
+        url: "/stakeholder",
+        data: filterCreateData(payload)
+      });
+    }
+    return this.apiPost({
+      isApp: true,
+      url: "/stakeholder",
+      data: filterCreateData(payload)
+    });
+  }
+  submitStep(data, id) {
+    return this.apiPut({
+      isApp: true,
+      url: `/stakeholder/submit/${id}`,
+      data: filterCreateData(data)
+    });
+  }
+  remove(id, data) {
+    return this.apiDelete({
+      isApp: true,
+      url: `/stakeholder/${id}/remove`,
+      data: data
+    });
+  }
+  getOptions() {
+    return this.apiGet({
+      isApp: true,
+      url: `/forms/options`,
+      params: {
+        id: "activityAtSiteOptions,category,countries,optionPositionSupplyChain,subCategory"
+      }
+    });
+  }
+}
+var WorkersService$1 = createLazyService(WorkersService);
+
 exports.AdminService = AdminService$1;
 exports.AuthenticationService = AuthenticationService$1;
 exports.BaseHTTPService = BaseHTTPService;
@@ -1736,6 +1936,7 @@ exports.DashboardService = DashboardService$1;
 exports.DataStoreService = DataStoreService$1;
 exports.ErrorHandler = ErrorHandler;
 exports.ErrorService = ErrorService;
+exports.EventsService = EventsService$1;
 exports.LinkedSubjectsService = LinkedSubjects;
 exports.NotificationService = NotificationService$1;
 exports.OperatorService = OperatorService$1;
@@ -1743,6 +1944,7 @@ exports.PartnerService = PartnerService$1;
 exports.QueryService = QueryService$1;
 exports.SourceService = SourceService$1;
 exports.UserService = UserService$1;
+exports.WorkersService = WorkersService$1;
 exports.configureServices = configureServices;
 exports.createLazyService = createLazyService;
 exports.getServicesConfig = getServicesConfig;

package/dist/utils/index.js

@@ -14105,6 +14105,32 @@ const buildQueryString = params => {
   return query ? `?${query}` : '';
 };
 
+/**
+ * Check if a successful response contains embedded error data
+ */
+const isErrorResponse = data => {
+  if (!data) return false;
+  return (
+    // Check for Exception names
+    data.name && data.name.includes('Exception') ||
+    // Check for nested response with error status
+    data.response?.statusCode && data.response.statusCode >= 400 ||
+    // Check for top-level error status
+    data.statusCode && data.statusCode >= 400 ||
+    // Check for explicit error flag
+    data.error === true ||
+    // Check for nested error property
+    data.response?.error && data.response.error !== null
+  );
+};
+
+/**
+ * Extract error message from various error response formats
+ */
+const getErrorMessage = data => {
+  return data?.message || data?.response?.message || data?.response?.error || 'An error occurred';
+};
+
 /**
  * Generic error handler factory for axios requests
  * Highly configurable to adapt to different project needs
@@ -15091,6 +15117,7 @@ exports.formatToKebabCase = formatToKebabCase$1;
 exports.getAdminLevelName = getAdminLevelName;
 exports.getDefaultActiveFilters = getDefaultActiveFilters;
 exports.getDivergenceOrEqual = getDivergenceOrEqual;
+exports.getErrorMessage = getErrorMessage;
 exports.getImageUploadViewValue = getImageUploadViewValue;
 exports.getInterface = getInterface;
 exports.getNkey = getNkey;
@@ -15114,6 +15141,7 @@ exports.hasKeyInObject = hasKeyInObject;
 exports.hasNotChanged = hasNotChanged;
 exports.isArrayOfObjects = isArrayOfObjects;
 exports.isEmptyOrSpaces = isEmptyOrSpaces;
+exports.isErrorResponse = isErrorResponse;
 exports.isModuleApproved = isModuleApproved;
 exports.isProxy = isProxy;
 exports.isSuperAdmin = isSuperAdmin;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.816",
+	"version": "0.6.818",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",

package/public/Vegetation/damage-from-insects-default.svg

@@ -14,3 +14,4 @@
 
 
 
+

package/public/Vegetation/dry-or-dead-default.svg

@@ -16,3 +16,4 @@
 
 
 
+

package/public/Vegetation/healthy-default.svg

@@ -14,3 +14,4 @@
 
 
 
+

package/public/Vegetation/yellowing.svg

@@ -8,3 +8,4 @@
 
 
 
+

package/src/@daf/core/components/Charts/RadarChart/index.jsx

@@ -1,4 +1,4 @@
-import React, { useRef, useEffect } from "react";
+import React, { useRef, useEffect, useCallback } from "react";
 import { Radar } from "@antv/g2plot";
 import { theme } from "antd";
 import { renderTooltip } from "../../../../utils/tooltip";
@@ -39,6 +39,46 @@ const RadarChart = ({
 		legendStyle
 	} = useLegendConfig({legendConfig, isPdf});
 
+	// Helper function to wrap long text labels to multiple lines
+	// Ensures text is never hidden - wraps to multiple lines if needed
+	const wrapLabel = useCallback((text, maxLength = 10) => {
+		if (!text) {
+			return '';
+		}
+		
+		const formattedText = formattedXAxis(text);
+		
+		// If text is short enough, return as is
+		if (formattedText.length <= maxLength) {
+			return formattedText;
+		}
+		
+		// Split by spaces to find word boundaries
+		const words = formattedText.split(' ');
+		const lines = [];
+		let currentLine = '';
+		
+		words.forEach((word, index) => {
+			// If adding this word would exceed maxLength, start a new line
+			if (currentLine && (currentLine + ' ' + word).length > maxLength) {
+				if (currentLine) {
+					lines.push(currentLine);
+				}
+				currentLine = word;
+			} else {
+				currentLine = currentLine ? currentLine + ' ' + word : word;
+			}
+			
+			// If it's the last word, add it to lines
+			if (index === words.length - 1 && currentLine) {
+				lines.push(currentLine);
+			}
+		});
+		
+		// Ensure we always return something - never empty
+		return lines.length > 0 ? lines.join('\n') : formattedText;
+	}, [formattedXAxis]);
+
 	useEffect(() => {
 		if (!containerRef.current) {
 			return;
@@ -59,17 +99,18 @@ const RadarChart = ({
 				  }
 				: { showCrosshairs: false, showMarkers: true, ...tooltipConfig },
 			color: color || token.colorPrimary7,
-			
-			paddingX: 60,
-			paddingY: 60,
+			// Increased padding to ensure labels are never clipped
+			padding: [50, 50, 50, 50],
 			xAxis: {
 				label: {
-					formatter: formattedXAxis,
+					formatter: (text) => wrapLabel(text, 10),
 					offset: 15,
+					autoRotate: false,
+					autoHide: false, // Never hide labels
+					autoEllipsis: false, // Never truncate with ellipsis
 					style: {
 						fontSize: 12,
 						fill: '#666',
-						textAlign: 'center',
 					},
 				},
 				line: null,
@@ -138,6 +179,7 @@ const RadarChart = ({
 		formattedXAxis,
 		score,
 		token.colorPrimary7,
+		wrapLabel,
 		rest,
 	]);
 
@@ -151,9 +193,9 @@ const RadarChart = ({
 	}, []);
 
 	return (
-		<div className="flex flex-1 flex-column justify-content-center" style={{ overflow: 'visible' }}>
-			<div className="flex justify-content-center" style={{ paddingX: '30px', overflow: 'visible', width: '100%' }}>
-				<Container ref={containerRef} height={height} isPdf={isPdf} style={{ paddingX: '30px' }}></Container>
+		<div className="flex flex-1 flex-column justify-content-center">
+			<div className="flex justify-content-center">
+				<Container ref={containerRef} height={height} isPdf={isPdf}></Container>
 			</div>
 			{legendEnabled && legendPosition === 'bottom' && (
 				<CustomLegend

package/src/@daf/core/components/Charts/style.js

@@ -3,7 +3,6 @@ import styled from "styled-components";
 const Container = styled.div`
 	height: ${props => props.height || '300px'};
 	width: ${props => props.isPdf ? (props.width ? props.width : '1000px') : 'calc(100% - 48px)'};
-	overflow: ${props => props.style?.overflow || 'visible'};
 `;
 
 export default Container;