datastake-daf 0.6.753 → 0.6.755

package/src/@daf/core/components/Screens/Users/index.jsx

@@ -0,0 +1,173 @@
+import React, { useMemo, useState, useEffect } from 'react'
+import { Drawer } from 'antd'
+import { getColumns } from './columns.js';
+import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
+import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
+import UsersCreate from './create.jsx';
+import Header from '../../../../core/components/Header/index.jsx';
+import BaseScreen from '../BaseScreen/index.jsx';
+import { CREATE_DRAWER_WIDTH } from '../../../../../helpers/Forms.js';
+import DrawerHeader from '../../../../core/components/Header/DrawerHeader/index.jsx';
+
+const UsersTable = ({
+  t = () => {},
+  goTo = () => {},
+  user = {},
+  options = {},
+  getRedirectLink = () => {},
+  theme = {},
+  loading = false,
+  data = {},
+  isMobile,
+  APP,
+  location,
+  getData = () => {},
+  getApiBaseUrl = () => {},
+  getAppHeader = () => {},
+  onInviteUser = () => {},
+  onEditUser = () => {},
+  query = {},
+  ajaxForms = {},
+  changeAjaxForms = () => {},
+  ajaxOptions = {},
+  changeAjaxOptions = () => {},
+  extendingFilters = {},
+  userRoles = [],
+}) => {
+  const [selectOptions, setSelectOptions] = useState();
+  const params = new URLSearchParams(location?.search);
+  const [openCreateModal, setOpenCreateModal] = useState(params.has("create"));
+  const [userToEdit, setUserToEdit] = useState(null);
+
+  const columns = useMemo(() => getColumns({
+    t,
+    goTo,
+    user,
+    options,
+    getRedirectLink,
+    theme,
+    subject: 'user',
+    data,
+    setUserToEdit,
+  }), [t, goTo, user, options, getRedirectLink, theme, data]);
+
+  const breadCrumbs = [];
+
+  const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({ location });
+
+  const filters = useMemo(() => ({
+    ...otherParams,
+    ...extendingFilters,
+  }), [otherParams, extendingFilters]);
+
+  useEffect(() => {
+    getData({
+      pagination: paginationQuery,
+      ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
+      ...otherParams,
+      sortBy: {
+        [sortBy || 'updatedAt']: sortDir ? (sortDir === 'ascend' ? 1 : -1) : -1,
+      },
+      ...extendingFilters,
+    }, 'users');
+  }, [location.search, JSON.stringify(extendingFilters)]);
+
+  const selectFiltersConfig = useMemo(() => getFiltersConfig({ t }), [t]);
+
+  useEffect(() => {
+    setSelectOptions((prev) => ({
+      ...prev,
+      ...getFilterOptions(options, t),
+    }));
+  }, [options, t]);
+
+  return (
+    <div className="semibold form-input-output daf-create-view">
+      <Header 
+        title={t("users")}
+        breadcrumbs={breadCrumbs}
+        actionButtons={[
+          {
+            type: "primary",
+            onClick: () => setOpenCreateModal(true),
+            tooltip: t("New"),
+            icon: "Add",
+          },
+        ]}
+        // onDownload={() => {
+        //   console.log("download");
+        // }}
+        // downloadDisabled={false}
+      />
+      <BaseScreen 
+        t={t}
+        checkboxConfig={checkboxConfig}
+        defaultTableFilters={{}}
+        columns={columns}
+        data={data}
+        loading={loading}
+        location={location}
+        goTo={goTo}
+        APP={APP}
+        getApiBaseUrl={getApiBaseUrl}
+        selectOptions={selectOptions}
+        selectFilters={selectFiltersConfig}
+        view="users"
+        getRedirectLink={getRedirectLink}
+        defaultUrlParams={{}}
+        module={APP}
+        filtersConfig={filtersConfig}
+        isMobile={isMobile}
+      />
+      {(openCreateModal || !!userToEdit) && (
+        <Drawer
+          destroyOnClose
+          title={
+            <DrawerHeader 
+              title={t(userToEdit ? "Edit User" : "New User")}
+            />
+          }
+          open={openCreateModal || !!userToEdit}
+          onClose={() => {
+            setOpenCreateModal(false);
+            setUserToEdit(null);
+          }}
+          width={CREATE_DRAWER_WIDTH}
+          bodyStyle={{ padding: 0 }}
+          maskClosable={false}
+        >
+          <UsersCreate
+            t={t}
+            goTo={goTo}
+            user={user}
+            APP={APP}
+            getApiBaseUrl={getApiBaseUrl}
+            getAppHeader={getAppHeader}
+            onSubmitted={(payload) => {
+              if (userToEdit) {
+                onEditUser(payload);
+              } else {
+                onInviteUser(payload);
+              }
+              setOpenCreateModal(false);
+              setUserToEdit(null);
+            }}
+            onCancel={() => {
+              setOpenCreateModal(false);
+              setUserToEdit(null);
+            }}
+            query={query}
+            ajaxForms={ajaxForms}
+            changeAjaxForms={changeAjaxForms}
+            ajaxOptions={ajaxOptions}
+            changeAjaxOptions={changeAjaxOptions}
+            userRoles={userRoles}
+            userToEdit={userToEdit}
+          />
+        </Drawer>
+      )}
+    </div>
+  );
+};
+
+export default UsersTable;

package/src/@daf/core/components/TableScreen/TablePageWithTabs/index.jsx

@@ -1,9 +1,9 @@
 import React, { useState, useEffect, useRef } from 'react'
 import { Tabs, Drawer } from 'antd'
-import Header from '../../../Header/index.jsx'
-import BaseScreen from '../../BaseScreen/index.jsx'
-import { CREATE_DRAWER_WIDTH } from '../../../../helpers/Forms.js'
-import DrawerHeader from '../../../Header/DrawerHeader/index.jsx'
+import Header from '../../../../core/components/Header/index.jsx'
+import BaseScreen from '../../../components/Screens/BaseScreen/index.jsx'
+import { CREATE_DRAWER_WIDTH } from '../../../../../helpers/Forms.js'
+import DrawerHeader from '../../../../core/components/Header/DrawerHeader/index.jsx'
 
 const TablePageWithTabs = ({
     t= () => {},

package/src/@daf/pages/Summary/Activities/Restoration/helper.js

@@ -1,5 +1,3 @@
-import React from 'react';
-
 // ============================================================================
 // REGION: Photo/Image Extraction
 // ============================================================================
@@ -122,93 +120,6 @@ export const getGenderTooltipChildren = (item, isEmpty, genderDistributionData,
     });
 };
 
-// ============================================================================
-// REGION: Multiselect Options
-// ============================================================================
-
-/**
- * Get filtered options for multiselect based on activityData.origin
- * Filters options based on whether origin contains 'kobo', 'straatos', or both
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @param {React.Component} CustomIcon - CustomIcon component for rendering Monitor option avatar
- * @returns {Array} - Filtered array of option objects
- */
-export const getFilteredOptions = (activityData, CustomIcon) => {
-    const allOptions = [
-        {
-            label: "Own Data",
-            value: "own",
-            avatar: <span>OWN</span>,
-            background: "#016C6E",
-            color: "white",
-        },
-        {
-            label: "Monitor",
-            value: "other",
-            avatar: <CustomIcon name={"Search02"} size={14} />,
-        },
-    ];
-
-    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-        return allOptions;
-    }
-
-    // Extract origin names from the array
-    const originNames = activityData.origin
-        .map(item => item?.name?.toLowerCase())
-        .filter(Boolean);
-
-    const hasKobo = originNames.includes('kobo');
-    const hasStraatos = originNames.includes('straatos');
-
-    // If contains kobo only, show only Monitor
-    if (hasKobo && !hasStraatos) {
-        return allOptions.filter(option => option.value === 'other');
-    }
-
-    // If contains straatos only, show only Own Data
-    if (hasStraatos && !hasKobo) {
-        return allOptions.filter(option => option.value === 'own');
-    }
-
-    // If contains both or neither, show both
-    return allOptions;
-};
-
-/**
- * Get default selected value for multiselect based on activityData.origin
- * 
- * @param {Object} activityData - Activity data object containing origin array
- * @returns {Array} - Array of default selected values
- */
-export const getDefaultSelected = (activityData) => {
-    if (!activityData?.origin || !Array.isArray(activityData.origin)) {
-        return ['own'];
-    }
-
-    // Extract origin names from the array
-    const originNames = activityData.origin
-        .map(item => item?.name?.toLowerCase())
-        .filter(Boolean);
-
-    const hasKobo = originNames.includes('kobo');
-    const hasStraatos = originNames.includes('straatos');
-
-    // If contains kobo only, default to monitor (other)
-    if (hasKobo && !hasStraatos) {
-        return ['other'];
-    }
-
-    // If contains straatos only, default to own
-    if (hasStraatos && !hasKobo) {
-        return ['own'];
-    }
-
-    // If contains both or neither, default to own
-    return ['own'];
-};
-
 // ============================================================================
 // REGION: Activity Indicators
 // ============================================================================

package/src/@daf/pages/Summary/Activities/Restoration/index.jsx

@@ -1,7 +1,7 @@
 import { useMemo, useCallback } from 'react';
-import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators, Multiselect, CustomIcon } from '../../../../../../src/index.js'
+import { DashboardLayout, Header, ImageCarousel, KeyIndicators, MineSiteMap, Widget, PieChart, ActivityIndicators } from '../../../../../../src/index.js'
 import { getKeyIndicatorsRowConfig } from './config';
-import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig, getFilteredOptions, getDefaultSelected } from './helper';
+import { getActivityImages, getGenderDistributionData, isGenderDistributionEmpty, calculateGenderPieData, getGenderTooltipChildren, getActivityIndicatorsConfig } from './helper';
 import { renderTooltipJsx } from '../../../../../../src/utils';
 import { useResizeContext } from '../../../../../../src/context';
 
@@ -24,18 +24,6 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
         [activityData, t]
     );
 
-    // Filter options based on activityData.origin
-    const filteredOptions = useMemo(() => 
-        getFilteredOptions(activityData, CustomIcon),
-        [activityData]
-    );
-
-    // Get default selected based on activityData.origin
-    const defaultSelected = useMemo(() => 
-        getDefaultSelected(activityData),
-        [activityData]
-    );
-
     return (
         <DashboardLayout
             header={
@@ -48,24 +36,6 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                     breadcrumbs={breadcrumbs}
                     goBackTo={goBackTo}
                     loading={loading}
-                    addedHeaderFirst
-                    addedHeader={
-                            <div style={{ marginRight: 0 }}>
-                                <Multiselect
-                                    canUnselectLast={false}
-                                    options={filteredOptions}
-                                    isAvatarGroup
-                                    selectionType="checkbox"
-                                    onChange={(selected) => {
-                                        console.log(selected);
-                                    }}
-                                    dropDownWidth={200}
-                                    defaultSelected={defaultSelected}
-                                    placeholder="Select partners..."
-                                />
-                            </div>
-                        
-                    }
                 />
             }
         >
@@ -87,6 +57,57 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                             app={"straatos"}
                             showSider={false}
                             user={null}
+                            data={[
+                                {
+                                    _id: {},
+                                    id: "7f2aaed4-4b2e-406c-8e0a-6659c5c8367b",
+                                    color: "#6698E4",
+                                    parent: {
+                                        _id: {},
+                                        createdAt: "2024-06-13T14:51:55.296Z",
+                                        updatedAt: "2024-06-13T14:51:55.296Z",
+                                        id: "a5340bf1-2c7d-413f-a2a5-ccd7dc8f7a7c",
+                                        name: "New Mine",
+                                        authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+                                        collectId: "f8a2b6a9cc935ef3e5844427f49aade34e152eca",
+                                        country: "AL",
+                                        category: "mineSite",
+                                        datastakeId: "LOC-00000000141",
+                                        __v: 0,
+                                    },
+                                    administrativeLevel1: "6839cb26-5af4-44a3-b136-a0f0a0bcecc6",
+                                    administrativeLevel2: "f849835d-5640-4bee-ae98-9f1c810c1abe",
+                                    // "name": "New Mine",
+                                    country: "AL",
+                                    category: "mineSite",
+                                    authorId: "4e6066e9-00d8-423a-94ec-c7c9d3432fec",
+                                    gps: {
+                                        latitude: 7,
+                                        longitude: 1,
+                                    },
+                                    area: [
+                                        [6, 5],
+                                        [7, 1],
+                                        [9, 2],
+                                    ],
+                                    associatedSubjects: [
+                                        {
+                                            entity: "Event",
+                                            _id: {},
+                                            nature: "",
+                                        },
+                                    ],
+                                    published: false,
+                                    version: 1,
+                                    createdAt: "2024-06-13T14:51:55.296Z",
+                                    updatedAt: "2024-06-13T14:51:55.296Z",
+                                    name: "Name",
+                                    type: "Loc Type",
+                                    __v: 0,
+                                    datastakeId: "LOC-00000000141",
+                                },
+                            ]}
+                            // tooltipAsText: true,
                             primaryLink={true}
                             renderTooltip={() => {
                                 return [
@@ -96,8 +117,8 @@ const RestorationActivitySummary = ({ activityData, supportText, onDownload, dow
                                     },
                                 ];
                             }}
-                          
-                            mapConfig={{ maxZoom: 18, zoom: 5, center: [14, -14] }}
+                            center={[13, -15]}
+                            mapConfig={{ maxZoom: 18 }}
                             type={'territory'}
                             link={true}
                             onClickLink={() => { }}

package/src/pages.js

@@ -11,7 +11,7 @@ export { default as ActivitiesTable } from './@daf/pages/Events/Activities/index
 
 export { default as IncidentsTable } from './@daf/pages/Events/Incidents/index.jsx';
 export { default as ProductionSitesTable } from './@daf/pages/Locations/MineSite/index.jsx';
-
+export { default as UsersTable } from './@daf/core/components/Screens/Users/index.jsx';
 
 // Summary
 export { default as OperatorSummary } from './@daf/pages/Summary/Operator/index.jsx';

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: