datastake-daf 0.6.793 → 0.6.794

package/src/@daf/pages/SelfAssesment/components/OrgInformationTable/columns.js

@@ -0,0 +1,157 @@
+import {  Tooltip } from "antd";
+import CustomIcon from "../../../../core/components/Icon/CustomIcon.jsx";
+// import  {findOptions} from "../../../../helpers/StringHelper.js";
+import ProgressBar from "../../../../core/components/ProgressBar/index.jsx";
+import ProgressBarSideIcon from "../../../../core/components/ProgressBar/components/SideIcon/index.jsx";
+import { Link } from "react-router-dom";
+import { renderDateFormatted } from "../../../../../helpers/Forms.js";
+
+export const getColumns = ({
+	t,
+	goTo = () => {},
+	show = "show",
+	getRedirectLink = () => {},
+	token,
+	selectedSubjects,
+	setSelectedSubjects,
+	selectOptions,
+	entity,
+}) => {
+const cols = [
+    {
+        dataIndex: "formName",
+        title: t("form"),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const title = all?.published
+                ? t("general-information")
+                : t("registration");
+
+            return <Tooltip title={title}>{title}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "completion",
+        title: t("completion"),
+        ellipsis: true,
+        show: !isMonitoring,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const submittedStages = ["evaluation", "planning", "improvement"];
+
+            const step1Stage = data?.stepStages?.["step-1"];
+            const step2Stage = data?.stepStages?.["step-2"];
+            const isSubmitted =
+                data?.published &&
+                submittedStages.includes(step1Stage) &&
+                submittedStages.includes(step2Stage);
+
+            return (
+                <div style={{ display: "flex", alignItems: "center", gap: "5px" }}>
+                    <ProgressBar
+                        tooltipTitle={isSubmitted && t("Submitted")}
+                        style={{ width: "100%" }}
+                        percentage={v || 0}
+                        isSubmitted={isSubmitted}
+                    ></ProgressBar>
+                    {isSubmitted ? (
+                        <ProgressBarSideIcon size={16} iconSize={10} />
+                    ) : (
+                        <span>{v || 0}%</span>
+                    )}
+                </div>
+            );
+        },
+    },
+    {
+        dataIndex: "monitoring",
+        title: t("Monitoring"),
+        ellipsis: true,
+        show: isMonitoring,
+        render: (v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            return <Tooltip title={v || 0}>{v || 0}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "lastUpdate",
+        title: t("Last Update"),
+        ellipsis: true,
+        show: true,
+        render: (_v, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const v = _v
+                ? renderDateFormatted(_v, "DD MMM YYYY", user?.language || "en")
+                : "-";
+
+            return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: "action",
+        title: "",
+        width: 60,
+        show: true,
+        render: (_, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            let link = `/app/mines/${all.datastakeId}/${all?.key?.toLowerCase()}`;
+
+            if (all?.key.includes("monitoring")) {
+                return (
+                    <Link to={getRedirectLink(link)}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </Link>
+                );
+            }
+
+            if (all?.key.includes("identification")) {
+                link = `/app/view/location/${all.datastakeId}`;
+            }
+
+            const stage = data?.stage;
+            const key = all?.key;
+            let isDisabled = false;
+
+            if (
+                (stage === "evaluation" && (key === "improvement" || key === "planning")) ||
+                (stage === "planning" && key === "improvement") ||
+                (!["evaluation", "planning", "improvement"].includes(stage) &&
+                    key !== "identification")
+            ) {
+                isDisabled = true;
+            }
+
+            return <div style={{ display: "flex", justifyContent: "center" }}>
+                {isDisabled ? (
+                    <span style={{ cursor: "not-allowed", opacity: 0.5 }}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </span>
+                ) : (
+                    <Link to={getRedirectLink(link)}>
+						<CustomIcon name="Link" width={18} height={18} />
+                        </Link>
+                )}
+            </div>;
+        },
+    },
+]
+
+	return cols.filter((c) => c[show]);
+};

package/src/@daf/pages/SelfAssesment/components/OrgInformationTable/config.js

@@ -0,0 +1,31 @@
+export const getFiltersConfig = ({t}) => {
+    return {
+        timeframe: {
+            type: "timeframe",
+            label: "Timeframe",
+            style: { flex: 1 },
+        },
+    }
+}
+
+export const getFilterOptions = (options, t) => {
+    const { timeframe = [] } = options || {};
+    const _default = {
+        timeframe: timeframe,
+    }
+
+    return _default;
+}
+
+export const formConfig = {
+    namespace: 'organisation',
+    view: 'information',
+    scope: 'create',
+    formType: 'organisation',
+}
+
+export const viewConfig = {
+    title: "Organisations",
+    createTitle: "Create Organisation",
+}
+

package/src/@daf/pages/SelfAssesment/components/OrgInformationTable/index.js

@@ -0,0 +1,77 @@
+import React from "react";
+import TablePage from "../../../TablePage/index.jsx";
+
+const OrganisationInformationTable = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    loading = false,
+    data = {},
+    isMobile,
+    APP,
+    location,
+    getData = () => {},
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    getFormData = () => {},
+    saveFormData = () => {},
+    formLoading = false,
+    query = {},
+    ajaxForms = {},
+    changeAjaxForms = () => {},
+    ajaxOptions = {},
+    changeAjaxOptions = () => {},
+    formData = {},
+    formValue = {},
+    form = {},
+    applications = [],
+    subjectClear = () => {},
+    breadcrumbs = [],
+    extendingFilters = {},
+    createDefaultValues = {},
+}) => {
+    return (
+        <TablePage
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}
+            location={location}
+            applications={applications}
+            
+            subject="organisations"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            subjectClear={subjectClear}
+            extendingFilters={extendingFilters}
+            breadcrumbs={breadcrumbs}
+                        
+            formConfig={{
+                getFormData,
+                saveFormData,
+                formLoading,
+                query,
+                ajaxForms,
+                changeAjaxForms,
+                ajaxOptions,
+                changeAjaxOptions,
+                formData,
+                formValue,
+                form,
+            }}
+            defaultValues={createDefaultValues}
+        />
+    );
+};
+
+export default OrganisationInformationTable;

package/src/@daf/pages/SelfAssesment/components/ProductionSiteTable/columns.js

@@ -0,0 +1,117 @@
+import React from 'react';
+import { Tooltip, Tag } from 'antd';
+import { findOptions } from '../../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../../helpers/Forms.js';
+import NavigationAction from '../../../core/components/Table/NavigationAction/index.jsx';
+import AvatarGroup from '../../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../../helpers/sourceAvatarConfig.js';
+import { renderStatusTag } from '../../../utils/tags.js';
+
+export const getColumns = ({t, goTo, user, options, activeTab, getRedirectLink, theme, subject, data, applications}) => [
+    {
+        dataIndex: 'datastakeId',
+        title: t('ID'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },
+    {
+        dataIndex: 'name',
+        title: t('Name'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+    
+          return <Tooltip title={v}>{v}</Tooltip>;
+        },
+    },    
+    {
+        dataIndex: 'category',
+        title: t('Type'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+          const category = findOptions(v, options?.locationCategories);
+    
+          return <Tooltip title={category}>{category}</Tooltip>;
+        },
+    },    
+    {
+        dataIndex: 'region',
+        title: t('Region'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+          const region = getLinkValue(all?.administrativeLevel1, all?.linking?.SCL);
+
+          return region ? <Tooltip title={region}>{region}</Tooltip> : '-';
+        },
+    },        
+    {
+        dataIndex: 'district',
+        title: t('District'),
+        ellipsis: true,
+        show: true,
+        render: (v, all) => {
+          if (all.empty) {
+            return <div className="daf-default-cell" />
+          }
+
+         const district = getLinkValue(all?.administrativeLevel2, all?.linking?.SCL);
+
+          return district ? <Tooltip title={district}>{district}</Tooltip> : '-';
+        },
+    },    
+    {
+        title: t("Last Update"),
+        dataIndex: "updatedAt",
+        key: "updatedAt",
+        width: 125,
+        render: (date, all) => {
+            if (all.empty) {
+                return <div className="daf-default-cell" />;
+            }
+
+            const _date = date ? renderDateFormatted(date, "DD MMM YYYY", user?.language || 'en') : "-";
+            return <Tooltip title={_date}>{_date}</Tooltip>;
+        },
+        ellipsis: true,
+    },
+  
+    {
+      id: 'actions',
+      title: "",
+      width: 60,
+      render: (_, all) => {
+        if (all.empty) {
+          return <div className="daf-default-cell" />;
+        }
+
+        const onClick = () => {
+          let link = `/app/view/${subject}/${all.datastakeId}`;
+          if (activeTab === "shared") {
+            link += `?sourceId=${all?.authorId?.id}`;
+          }
+          goTo(getRedirectLink(link));
+        };
+
+        return <NavigationAction onClick={onClick} theme={theme} />;
+      }
+    }
+].filter((column) => column.show !== false);

package/src/@daf/pages/SelfAssesment/components/ProductionSiteTable/index.jsx

@@ -0,0 +1,54 @@
+import React from 'react';
+import TablePage from '../../../TablePage/index.jsx';
+import { getColumns } from './columns.js';
+
+const ProductionSiteTable = ({
+    t = () => {},
+    goTo = () => {},
+    user = {},
+    options = {},
+    getRedirectLink = () => {},
+    theme = {},
+    loading = false,
+    data = {},
+    isMobile,
+    APP,
+    location,
+    getData = () => {},
+    getApiBaseUrl = () => {},
+    getAppHeader = () => {},
+    applications = [],
+    subjectClear = () => {},
+    breadcrumbs = [],
+    extendingFilters = {},
+    createDefaultValues = {},
+}) => {
+    return (
+        <TablePage
+            t={t}
+            goTo={goTo}
+            user={user}
+            options={options}
+            getRedirectLink={getRedirectLink}
+            theme={theme}
+            loading={loading}
+            data={data}
+            isMobile={isMobile}
+            APP={APP}   
+            location={location}
+            applications={applications}
+            subject="production-sites"
+            getData={getData}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            subjectClear={subjectClear}
+            extendingFilters={extendingFilters}
+            breadcrumbs={breadcrumbs}
+            formConfig={formConfig}
+            defaultValues={createDefaultValues}
+            onDownload={() => console.log("download")}
+        />
+    )
+}
+
+export default ProductionSiteTable

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

@@ -69,18 +69,90 @@ class AdminService extends BaseService {
     }
 
     getSubjects({ subject, params }) {
-        return this.apiGet({
-          url: `${subject}`,
+      return this.apiGet({
+          url: `/management/subjects/${subject}`,
           params,
-        })
+      });
     }
 
-    mergeSubjects({ subject, ...data }) {
+    mergeLocations({ ids, data }) {
+      const [id1, id2, ...remainingIds] = ids || [];
+      
+      if (!id1 || !id2) {
+        throw new Error('At least two IDs are required for merging');
+      }
+      
+      const url = `/management/merge/location/${id1}/${id2}`;
+      
+      const payload = {
+        ...data,
+      };
+      
+      if (remainingIds.length > 0) {
+        payload.additionalIds = remainingIds;
+      }
+      
+      return this.apiPost({
+        url,
+        data: payload,
+      });
+    }
+
+
+
+    mergeSubjects({ subject, ids, data }) {
+        const [id1, id2, ...remainingIds] = ids || [];
+        
+        if (!id1 || !id2) {
+            throw new Error('At least two IDs are required for merging');
+        }
+        
+        const url = `/management/merge/${subject}/${id1}/${id2}`;
+        
+        const payload = {
+            ...data,
+
+        };
+        
+        if (remainingIds.length > 0) {
+            payload.additionalIds = remainingIds;
+        }
+        
         return this.apiPost({
-          url: `/merge/${subject}`,
-          data,
-        })
+            url,
+            data: payload,
+        });
     }
+
+    viewLocation({ id }) {
+      return this.apiGet({
+        url: `/management/subject/location/${id}`,
+      });
+    }
+
+    viewStakeholder({ id }) {
+          return this.apiGet({
+            url: `/management/subject/stakeholder/${id}`,
+          });
+    }
+
+    updateSubject({ subject, id, data }) {
+      const type = subject === 'location' ? 'location' : 'stakeholder';
+      return this.apiPut({
+        url: `/management/subject/${type}/${id}`,
+        data,
+      });
+    }
+
+    getUserGrowth(activeFilter) {
+      return this.apiGet({
+        url: `/accounts/dashboard/user-growth`,
+        isUserManager: true,
+        params: { activeFilter },
+      });
+    }
+
+    
 }
 
 export default createLazyService(AdminService);

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

@@ -26,4 +26,5 @@ class DashboardService extends BaseService {
     }
 }
 
-export default createLazyService(DashboardService);
+export default createLazyService(DashboardService);
+

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

@@ -63,19 +63,29 @@ export const getDefaultActiveFilters = (
 };
 
 const NEW_PAGINATION_APPS = ["nashiriki"];
+
 export const filterParams = (value, module) => {
 	const { activeFilters, ...rest } = value;
 
-	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
-		activeFilters || {};
+	const {
+		page = 1,
+		pageSize = 20,
+		sortDir,
+		sortBy,
+		search,
+		searchParams,
+		...filters
+	} = activeFilters || {};
 
 	const params = {};
-	
+
 	params.pagination = JSON.stringify({
-		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
+		page,
+		pageSize,
 	});
 
+	params.filters = JSON.stringify(filters);
+
 	if (search && searchParams) {
 		params.search = JSON.stringify({
 			qs: search,
@@ -90,13 +100,5 @@ export const filterParams = (value, module) => {
 		});
 	}
 
-	if (Object.keys(filters).length) {
-		if (value.sourceId && value.sourceId === "overview") {
-			params.filters = JSON.stringify(filters);
-		} else {
-			params.filters = JSON.stringify({ ...filters, authorId: undefined });
-		}
-	}
-
 	return { ...rest, ...params };
 };

package/src/constants/locales/en/translation.js

@@ -1,4 +1,11 @@
 const en = {
+  "sbg-admin::remove-user-title":"Remove User Title",
+  "sbg-admin::remove-user-body":"Remove User Body",
+  "Administrative-level-1": "Administrative Level 1",
+  "Administrative-level-2": "Administrative Level 2",
+  "merge-output": "Merge Output",
+  "admin::current_subjects": "Current Subjects",
+"add-account":"Add Account",
   "Site": "Site",
   "Production Sites": "Production Sites",
   "Type of account": "Type of account",

package/src/constants/locales/fr/translation.js

@@ -420,7 +420,7 @@ const fr = {
 	Documentation: "Documents",
 	"Edit project": "Modifier le projet",
 	Name: "Nom",
-	Type: "Tapez",
+	Type: "Type",
 	type: "Type",
 	Province: "Province",
 	Territory: "Territoire",

package/src/constants/locales/sp/translation.js

@@ -233,7 +233,7 @@ const sp = {
   "Documentation": "Documentos",
   "Edit project": "Modificar proyecto",
   "Name": "Nombre",
-  "Type": "Escribe",
+  "Type": "Tipo",
   "type": "Tipo",
   "Province": "Provincia",
   "Territory": "Territorio",

package/build/manifest.json

@@ -1,25 +0,0 @@
-{
-  "short_name": "React App",
-  "name": "Create React App Sample",
-  "icons": [
-    {
-      "src": "favicon.ico",
-      "sizes": "64x64 32x32 24x24 16x16",
-      "type": "image/x-icon"
-    },
-    {
-      "src": "logo192.png",
-      "type": "image/png",
-      "sizes": "192x192"
-    },
-    {
-      "src": "logo512.png",
-      "type": "image/png",
-      "sizes": "512x512"
-    }
-  ],
-  "start_url": ".",
-  "display": "standalone",
-  "theme_color": "#000000",
-  "background_color": "#ffffff"
-}

package/build/robots.txt

@@ -1,3 +0,0 @@
-# https://www.robotstxt.org/robotstxt.html
-User-agent: *
-Disallow: