datastake-daf 0.6.786 → 0.6.787

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,10 +69,10 @@ class AdminService extends BaseService {
     }
 
     getSubjects({ subject, params }) {
-        return this.apiGet({
-          url: `${subject}`,
+      return this.apiGet({
+          url: `/management/subjects/${subject}`,
           params,
-        })
+      });
     }
 
     mergeSubjects({ subject, ...data }) {
@@ -81,6 +81,15 @@ class AdminService extends BaseService {
           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

@@ -1,102 +1,102 @@
 export const defaultFilterKeys = ["search", "sortDir", "sortBy", "timeframe", "activeTab"];
-
 function hasJsonStructure(str) {
-	if (typeof str !== "string") return false;
-	try {
-		const result = JSON.parse(str);
-		const type = Object.prototype.toString.call(result);
-		return type === "[object Object]" || type === "[object Array]";
-	} catch (err) {
-		return false;
-	}
+    if (typeof str !== "string") return false;
+    try {
+        const result = JSON.parse(str);
+        const type = Object.prototype.toString.call(result);
+        return type === "[object Object]" || type === "[object Array]";
+    } catch (err) {
+        return false;
+    }
 }
-
 export const getDefaultActiveFilters = (
-	params,
-	selectFiltersConfig,
-	defaultPageSize,
-	defaultFilters = {},
-	doPagination,
+    params,
+    selectFiltersConfig,
+    defaultPageSize,
+    defaultFilters = {},
+    doPagination,
 ) => {
-	const o = {};
-
-	defaultFilterKeys.forEach((k) => {
-		if (params.has(k)) {
-			if (hasJsonStructure(params.get(k))) {
-				o[k] = JSON.parse(params.get(k));
-			} else {
-				o[k] = params.get(k);
-			}
-		} else if (defaultFilters[k]) {
-			if (hasJsonStructure(defaultFilters[k])) {
-				o[k] = JSON.parse(defaultFilters[k]);
-			} else {
-				o[k] = defaultFilters[k];
-			}
-		}
-	});
-
-	if (params.has("searchParams")) {
-		try {
-			o.searchParams = JSON.parse(params.get("searchParams"));
-		} catch (e) {
-			o.searchParams = params.get("searchParams").split(",");
-		}
-	}
-
-	if (doPagination) {
-		o.page = Number(params.get("page")) || 1;
-		o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
-	}
-
-	Object.keys(selectFiltersConfig).forEach((k) => {
-		if (params.has(k)) {
-			if (hasJsonStructure(params.get(k))) {
-				o[k] = JSON.parse(params.get(k));
-			} else {
-				o[k] = params.get(k);
-			}
-		}
-	});
-
-	return o;
+    const o = {};
+    defaultFilterKeys.forEach((k) => {
+        if (params.has(k)) {
+            if (hasJsonStructure(params.get(k))) {
+                o[k] = JSON.parse(params.get(k));
+            } else {
+                o[k] = params.get(k);
+            }
+        } else if (defaultFilters[k]) {
+            if (hasJsonStructure(defaultFilters[k])) {
+                o[k] = JSON.parse(defaultFilters[k]);
+            } else {
+                o[k] = defaultFilters[k];
+            }
+        }
+    });
+    if (params.has("searchParams")) {
+        try {
+            o.searchParams = JSON.parse(params.get("searchParams"));
+        } catch (e) {
+            o.searchParams = params.get("searchParams").split(",");
+        }
+    }
+    if (doPagination) {
+        o.page = Number(params.get("page")) || 1;
+        o.pageSize = Number(params.get("pageSize")) || defaultPageSize;
+    }
+    Object.keys(selectFiltersConfig).forEach((k) => {
+        if (params.has(k)) {
+            if (hasJsonStructure(params.get(k))) {
+                o[k] = JSON.parse(params.get(k));
+            } else {
+                o[k] = params.get(k);
+            }
+        }
+    });
+    return o;
 };
-
 const NEW_PAGINATION_APPS = ["nashiriki"];
 export const filterParams = (value, module) => {
-	const { activeFilters, ...rest } = value;
-
-	const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
-		activeFilters || {};
+    const { activeFilters, ...rest } = value;
+    const { page, pageSize, sortDir, sortBy, search, searchParams, ...filters } =
+        activeFilters || {};
+    const params = {};
+    // Use skip and take inside pagination object
+    // Calculate skip from page number (page 1 = skip 1, page 2 = skip 21, etc.)
+    params.pagination = {
+        skip: page ? ((page - 1) * (pageSize || 20) + 1) : 1,
+        take: pageSize || 20,
+    };
+    if (search && searchParams) {
+        params.search = JSON.stringify({
+            qs: search,
+            fields: searchParams,
+        });
+    }
+    if (sortDir && sortBy) {
+        params.sort = JSON.stringify({
+            dir: sortDir,
+            by: sortBy,
+        });
+    }
+    if (Object.keys(filters).length) {
+        if (value.sourceId && value.sourceId === "overview") {
+            const { activeTab, ...restFilters } = filters;
+            Object.assign(params, restFilters);
+            if (activeTab !== undefined) {
+                params.tab = activeTab;
+            }
+        } else {
+            const { authorId, activeTab, ...restFilters } = filters;
+            Object.assign(params, restFilters);
+            if (activeTab !== undefined) {
+                params.tab = activeTab;
+            }
+        }
+    }
+    return { ...rest, ...params };
+};
 
-	const params = {};
-	
-	params.pagination = JSON.stringify({
-		[NEW_PAGINATION_APPS.includes(module) ? "skip" : "page"]: page,
-		[NEW_PAGINATION_APPS.includes(module) ? "take" : "pageSize"]: pageSize,
-	});
 
-	if (search && searchParams) {
-		params.search = JSON.stringify({
-			qs: search,
-			fields: searchParams,
-		});
-	}
 
-	if (sortDir && sortBy) {
-		params.sort = JSON.stringify({
-			dir: sortDir,
-			by: sortBy,
-		});
-	}
 
-	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,7 @@
 const en = {
+  "sbg-admin::remove-user-title":"Remove User Title",
+  "sbg-admin::remove-user-body":"Remove User Body",
+"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: