datastake-daf 0.6.743 → 0.6.745

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "datastake-daf",
-	"version": "0.6.743",
+	"version": "0.6.745",
 	"dependencies": {
 		"@ant-design/icons": "^5.2.5",
 		"@antv/g2": "^5.1.1",
@@ -22,7 +22,9 @@
 		"docx-preview": "^0.3.7",
 		"dot-object": "^2.1.5",
 		"file-saver": "^2.0.5",
+		"firebase": "^12.5.0",
 		"html-to-image": "^1.11.13",
+		"i18next": "^25.6.0",
 		"leaflet": "^1.0.3",
 		"leaflet-editable": "^1.3.0",
 		"leaflet-geosearch": "^3.1.0",

package/rollup.config.js

@@ -27,7 +27,7 @@ const external = [
   "react-collapsed",
   "leaflet-geosearch",
   "react-html-parser",
-  "styled-component",
+  "styled-components",
   "@ant-design/icons",
   "deepmerge",
   "leaflet.heat",
@@ -46,7 +46,12 @@ const external = [
   "file-saver",
   "axios",
   "form-data",
-  "firebase"
+  "firebase",
+  "firebase/app",
+  "firebase/messaging",
+  "i18next",
+  "i18next-browser-languagedetector",
+  "react-i18next"
 ];
 
 // Four builds, components, utils, hooks, context

package/src/@daf/core/components/DynamicForm/components/ajaxModal.js

@@ -261,7 +261,7 @@ function AjaxModal({
         setData({})
         setModalVisible(!modalVisible);
       }}
-      destroyOnClose={destroy}
+      destroyOnHidden={destroy}
     >
       {modalVisible ? (isFetching ?
         <div className="form-loader"><Loading /></div>

package/src/@daf/core/components/EditForm/components/Comment/index.js

@@ -229,7 +229,7 @@ export default function Comment({
         footer={null}
         width={650}
         className="max-h-50"
-        destroyOnClose
+        destroyOnHidden
         onCancel={onCloseModal}
         title={(
           <ModalHeader title={'Comment'} />

package/src/@daf/core/components/EditForm/components/DataLink/ajaxSelectDataLink.js

@@ -521,7 +521,7 @@ export function AjaxSelectMain({
   function updateOther(item, label, value) {
     try {
       // remove the last comma and closing bracket
-      const cleanedString = updateOtherValues.replace(/,\s*]$/, "]");
+      const cleanedString = updateOtherValues?.replace(/,\s*]$/, "]");
       const updateOtherVal = updateOtherValues ? JSON.parse(cleanedString) : {};
       const valueToSet = isDataLink ? item : value;
 

package/src/@daf/core/components/EditForm/components/DataLink/flat.js

@@ -554,7 +554,7 @@ export default function DataLinkFlat({
         footer={null}
         width={650}
         className="max-h-50"
-        destroyOnClose
+        destroyOnHidden
         onCancel={onCloseModal}
         title={(
           <ModalHeader title={getLabelFromScopeForDataLink(form?.modalLabel || form?.label, formScope)} />

package/src/@daf/core/components/EditForm/components/DataLink/index.js

@@ -547,7 +547,7 @@ export default function DataLink({
         footer={null}
         width={650}
         className="max-h-50"
-        destroyOnClose
+        destroyOnHidden
         onCancel={onCloseModal}
         title={(
           <ModalHeader title={getLabelFromScopeForDataLink(form?.modalLabel || form?.label, formScope)} />

package/src/@daf/core/components/EditForm/components/DataLinkGroup/index.js

@@ -539,7 +539,7 @@ export default function DataLinkGroup({
         footer={null}
         width={650}
         className="max-h-50"
-        destroyOnClose
+        destroyOnHidden
         onCancel={onCloseModal}
         title={(
           <ModalHeader title={getLabelFromScopeForDataLink(form?.modalLabel || form?.label, formScope)} />

package/src/@daf/core/components/EditForm/components/Repeatable/index.js

@@ -611,7 +611,7 @@ export default function Repeatable({
         footer={null}
         width={650}
         className="max-h-50"
-        destroyOnClose
+        destroyOnHidden
         onCancel={onCloseModal}
         title={(
           <ModalHeader

package/src/@daf/core/components/EditForm/components/ajaxSelect.js

@@ -462,7 +462,7 @@ export function AjaxSelectMain({
 	function updateOther(item, label, value) {
 		try {
 			// remove the last comma and closing bracket
-			const cleanedString = updateOtherValues.replace(/,\s*]$/, "]");
+			const cleanedString = updateOtherValues?.replace(/,\s*]$/, "]");
 			const updateOtherVal = updateOtherValues ? JSON.parse(cleanedString) : {};
 
 			const _new = { ...formsValue };

package/src/@daf/core/components/EditForm/components/geolocation.js

@@ -123,6 +123,7 @@ export default function Geolocation({
           searchLabel: t('Search'),
           provider: mapProvider,
           style: 'button',
+          position: 'topleft',
           notFoundMessage: t('Location not found'),
           showMarker: false,
           marker: {

package/src/@daf/core/components/EditForm/helper.js

@@ -2862,10 +2862,6 @@ export const GetFormItem = ({
 			if (input && typeof input === "object") {
 				// check if input is valid
 				const hideComment = namespace === "project-readiness";
-				console.log("hideComment", {
-					hideComment,
-					namespace,
-				});
 				return (
 					<>
 						<div className="flex-row input-cont">

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineAccount/index.jsx

@@ -46,7 +46,7 @@ export default function CombineAccountModal({
 			withModalFormWrapper={false}
 			width={1100}
 			disabled={isDisabled}
-			destroyOnClose={true}
+			destroyOnHidden={true}
 		>
 			<Container>
 				<div className="daf-table-wrapper no-pagination">

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineLocation/index.jsx

@@ -52,7 +52,7 @@ export default function CombineLocationModal({
 			withModalFormWrapper={false}
 			width={1100}
 			disabled={isDisabled}
-			destroyOnClose={true}
+			destroyOnHidden={true}
 			onValuesChange={() => {
 				setIsDisabled(() => {
 				  const values = MainForm.getFieldsValue();

package/src/@daf/core/components/Screens/Admin/AdminModals/CombineSubjects/index.jsx

@@ -53,7 +53,7 @@ export default function CombineSubjectsModal({
 			withModalFormWrapper={false}
 			width={1100}
 			disabled={isDisabled}
-			destroyOnClose={true}
+			destroyOnHidden={true}
 			onValuesChange={() => {
 				setIsDisabled(() => {
 				  const values = MainForm.getFieldsValue();

package/src/@daf/layouts/AppLayout/index.jsx

@@ -156,8 +156,9 @@ function AppLayout({
         console.log(err);
       }
     };
-
-    _fetchPreferences();
+    if (!userPreferences) {
+      _fetchPreferences();
+    }
   }, [getUserPreference]);
 
   const setIsCollapse = (val = false) => {
@@ -370,9 +371,9 @@ function AppLayout({
                 className="ln-22 dark-select language-select"
                 style={{ color: 'white', height: '30px' }}
                 defaultValue={StorageManager.get('datastakeLng') || 'en'}
-                bordered={false}
+                variant="borderless"
                 onChange={lng => updateLanguage?.(lng)}
-                popupClassName={formatClassname(['dark-select-popup language-select', appName, theme.customHeaderColor && 'custom'])}
+                classNames={{ popup: formatClassname(['dark-select-popup language-select', appName, theme.customHeaderColor && 'custom']) }}
               >
                 {languageConfig.map(lang => (
                   <Select.Option key={lang.value} value={lang.value}>

package/src/@daf/layouts/AuthLayout/components/Select/style.js

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { MOBILE_WIDTH, TABLET_WIDTH } from "datastake-daf/src/constants/Style";
+import { MOBILE_WIDTH, TABLET_WIDTH } from "../../../../../constants/Style";
 
 const Style = styled.div`
   display: flex;

package/src/@daf/layouts/AuthLayout/style.js

@@ -1,5 +1,5 @@
 import styled from "styled-components";
-import { MOBILE_WIDTH, TABLET_WIDTH } from "datastake-daf/src/constants/Style";
+import { MOBILE_WIDTH, TABLET_WIDTH } from "../../../constants/Style";
 
 const Style = styled.div`
   .errors-cont {

package/src/@daf/pages/Documents/columns.js

@@ -0,0 +1,102 @@
+import React from 'react';
+import { Tooltip } from 'antd';
+import { findOptions } from '../../../helpers/StringHelper.js';
+import { renderDateFormatted } from '../../../helpers/Forms.js';
+import CustomIcon from '../../core/components/Icon/CustomIcon.jsx';
+import AvatarGroup from '../../core/components/AvatarGroup/index.jsx';
+import sourceAvatarConfig from '../../../helpers/sourceAvatarConfig.js';
+
+export const getColumns = ({ t, goTo, user, options, activeTab, getRedirectLink, theme, subject, 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('Title'),
+    ellipsis: true,
+    show: true,
+    render: (v, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />
+      }
+
+      return <Tooltip title={v}>{v}</Tooltip>;
+    },
+  },
+  {
+    title: t("Date"),
+    dataIndex: "date",
+    key: "date",
+    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,
+  },
+  {
+    title: t("Sources"),
+    dataIndex: "sources",
+    key: "sources",
+    show: activeTab !== "own",
+    render: (val, all) => {
+      if (all.empty) {
+        return <div className="daf-default-cell" />;
+      }
+      if (!val || val?.length === 0) {
+        return "--";
+      }
+
+      const sources = sourceAvatarConfig(val, user, applications);
+
+      return <AvatarGroup items={sources}></AvatarGroup>;
+    },
+  },
+  {
+    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 link = `/app/view/${subject}/${all.datastakeId}`;
+
+      return <div style={{ display: "flex", justifyContent: "center" }}>
+        <a href={getRedirectLink(link)}>
+          <CustomIcon name="Link" size={15} color={theme.baseGray70} />
+        </a>
+      </div>;
+    }
+  }
+].filter((column) => column.show !== false);

package/src/@daf/pages/{dashboards/AllInformation/Documents → Documents}/create.jsx

@@ -1,10 +1,10 @@
 import React, { useEffect} from 'react'
 import { message } from 'antd';
-import { MessageTypes } from '../../../../../helpers/messages.js';
-import DynamicForm from '../../../../core/components/DynamicForm/index.jsx';
+import { MessageTypes } from '../../../helpers/messages.js';
+import DynamicForm from '../../core/components/DynamicForm/index.jsx';
 
-const DocumentsCreate = ({
-    namespace = 'documents',
+const StakeholdersCreate = ({
+    namespace = 'stakeholders',
     view = 'scoping',
     edit = false,
     formData = {},
@@ -39,7 +39,7 @@ const DocumentsCreate = ({
     useEffect(() => {
         if (Object.keys(form).length === 0 && !formData[`${APP}-${view}`]) {
           if (!edit) {
-            getData({ namespace, module: APP, view, scope: 'global' });
+            getData({ namespace, module: APP, view, scope: 'create' });
           } else {
             form = formConfig;
             data = formValue;
@@ -76,6 +76,7 @@ const DocumentsCreate = ({
                         ...payloadData,
                         form: 'document'
                     };
+
                 
                     const callback = (type, m, data) => {
                         if (setSelectedFormNext) {
@@ -101,4 +102,4 @@ const DocumentsCreate = ({
     )
 }
 
-export default DocumentsCreate
+export default StakeholdersCreate

package/src/@daf/pages/{dashboards/AllInformation/Documents → Documents}/index.jsx

@@ -1,10 +1,10 @@
 import React, { useMemo, useState, useEffect, useCallback } from 'react'
-import TablePageWithTabs from '../../../pages/TablePageWithTabs/index.jsx'
+import TablePageWithTabs from '../pages/TablePageWithTabs/index.jsx'
 import { getColumns } from './columns.js';
 import { checkboxConfig, getFiltersConfig, filtersConfig, getFilterOptions } from './config.js';
-import { useGetQueryParams } from '../../../../hooks/useGetQueryParams.js';
-import DocumentsCreate from './create.jsx';
-import { displayMessage } from '../../../../../helpers/messages.js';
+import { useGetQueryParams } from '../../hooks/useGetQueryParams.js';
+import StakeholdersCreate from './create.jsx';
+import { displayMessage } from '../../../helpers/messages.js';
 
 const DocumentsTable = ({
     t = () => {},
@@ -32,12 +32,11 @@ const DocumentsTable = ({
     formData = {},
     formValue = {},
     form = {},
-    extendingFilters = {},
     applications = [],
+    subjectClear = () => {},
 }) => {
     const [selectOptions, setSelectOptions] = useState();
-    const [activeTab, setActiveTab] = useState();
-
+    const [activeTab, setActiveTab] = useState("own");
     const columns = useMemo(() => getColumns({
         t, 
         goTo, 
@@ -47,36 +46,24 @@ const DocumentsTable = ({
         getRedirectLink, 
         theme,
         subject: 'documents',
-        data,
         applications,
-    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, data, applications]);
+    }), [t, goTo, user, options, activeTab, getRedirectLink, theme, applications]);
 
     const breadCrumbs = [];
 
     const { paginationQuery, searchParams, otherParams, sortBy, sortDir } = useGetQueryParams({location});
 
-    const filters = useMemo(() => {
-        return {
-            ...otherParams,
-            ...extendingFilters
-        }
-    }, [otherParams, extendingFilters])
-
     useEffect(() => {
-        console.log("fetching data")
         getData({
             pagination: paginationQuery,
-            ...(Object.keys(filters).length > 0 && { filters: filters }),
+            ...(Object.keys(otherParams).length > 0 && { filters: otherParams }),
             ...(Object.keys(searchParams).length > 0 && { search: searchParams }),
             tab: activeTab,
             sortBy: {
                 [sortBy || "updatedAt"]: sortDir ? (sortDir === "ascend" ? 1 : -1) : -1,
             }
         }, 'documents')
-        console.log("data fetched")
-    }, [location.search, activeTab, JSON.stringify(extendingFilters)]);
-
-    console.log({data})
+    }, [paginationQuery, otherParams, searchParams, activeTab]);
 
     const selectFiltersConfig = useMemo(() => {
         return getFiltersConfig({t});
@@ -93,15 +80,22 @@ const DocumentsTable = ({
         setActiveTab(value);
     }, []);
 
+    useEffect(
+		() => () => {
+			subjectClear();
+		},
+		[],
+	);
+
     return (
         <TablePageWithTabs 
            t={t}
-           title={t("documents")}
+           title={t("Documents")}
            breadCrumbs={breadCrumbs}
            location={location}
            loading={loading}
            goTo={goTo}
-           defaultActiveTab={"all"}
+           defaultActiveTab={"own"}
            columns={columns}
            data={data}
            checkboxConfig={checkboxConfig}
@@ -120,7 +114,7 @@ const DocumentsTable = ({
            drawerTitle={t("Create Document")}
         >
             {({onDrawerClose}) => (
-                <DocumentsCreate 
+                <StakeholdersCreate 
                     t={t}
                     goTo={goTo}
                     user={user}
@@ -136,8 +130,7 @@ const DocumentsTable = ({
                                 type,
                                 t("affirmations::subject-created-successfully") || m,
                             );
-                            // goTo(`/app/edit/stakeholders/${data.datastakeId}`);
-                            goTo(`/app/edit/documents/${data.datastakeId}`)
+                            goTo(`/app/edit/documents/${data.datastakeId}`);
                         }
                     }}
                     onCancel={onDrawerClose}