datastake-daf 0.6.813 → 0.6.814

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,14 +100,6 @@ 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,17 +1,4 @@
 const en = {
-  "admin::events": "Events",
-  "admin::document": "Documents",
-  "events": "Events",
-  "merge-locations": "Merge Locations",
-  "edit-account": "Edit Account",
-  "Are-you-sure-you-want-to-remove-the-user-from-this-account?": "Are you sure you want to remove the user from this account?",
-  "The-user-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "The user will lose access to the application and to all data created for this account.",
-  "merge": "Merge",
-  "Are-you-sure-you-want-to-suspend-this-account?": "Are you sure you want to suspend this account?",
-  "Associated-users-will-lose-access-to-the-application-and-to-all-data-created-for-this-account.": "Associated users will lose access to the application and to all data created for this account.",
-  "current_subjects": "Current Subjects",
-  "merged_output": "Merged Output",
-  "merge-subjects": "Merge Subjects",
   "All Data": "All Data",
   "sbg-admin::remove-user-title":"Remove User Title",
   "sbg-admin::remove-user-body":"Remove User Body",

package/src/helpers/copyToClipboard.js

@@ -41,63 +41,3 @@ export const copyToClipboard = (id) => {
     }
   }
 }
-
-/**
- * Copies a string directly to the clipboard.
- * 
- * This function takes a string and copies it to the clipboard.
- * It handles browser compatibility issues between IE and modern browsers.
- * 
- * @param {string} text - The string to copy to clipboard
- * @returns {Promise<boolean>} - Returns true if copying succeeded, false otherwise
- * 
- * @example
- * copyStringToClipboard('Text to copy'); // Copies "Text to copy" to clipboard
- */
-export const copyStringToClipboard = async (text) => {
-  if (!text) {
-    console.warn("No text provided to copy");
-    return false;
-  }
-
-  // Try modern Clipboard API first
-  if (navigator.clipboard && navigator.clipboard.writeText) {
-    try {
-      await navigator.clipboard.writeText(text);
-      return true;
-    } catch (ex) {
-      console.warn("Clipboard API failed, trying fallback:", ex);
-      // Fall through to fallback methods
-    }
-  }
-
-  // Fallback for older browsers or when Clipboard API fails
-  if (window.clipboardData && window.clipboardData.setData) {
-    // IE: prevent textarea being shown while dialog is visible
-    return window.clipboardData.setData("Text", text);
-  } else if (document.queryCommandSupported &&
-    document.queryCommandSupported("copy")) {
-    var textarea = document.createElement("textarea");
-    textarea.textContent = text;
-    // Prevent scrolling to bottom of page in MS Edge
-    textarea.style.position = "fixed";
-    textarea.style.opacity = "0";
-    textarea.style.left = "-9999px";
-    document.body.appendChild(textarea);
-    textarea.select();
-    try {
-      // Security exception may be thrown by some browsers
-      const success = document.execCommand("copy");
-      return success;
-    } catch (ex) {
-      console.warn("Copy to clipboard failed.", ex);
-      return false;
-    } finally {
-      document.body.removeChild(textarea);
-    }
-  }
-  
-  return false;
-}
-
-

package/src/@daf/core/components/Screens/Admin/AdminScreens/Documents.jsx

@@ -1,81 +0,0 @@
-import React, { useCallback } from "react";
-import { message } from "antd";
-import DocumentsTable from "../AdminTables/DocumentsTable/index.jsx";
-/**
- * Admin Location Screen Wrapper
- * This is a ready-to-use route component that can be configured per application
- * 
- * @param {Object} config - Application configuration
- * @param {string} config.appName - Application name
- * @param {string} config.module - Module identifier (APP constant)
- * @param {Function} config.goTo - Navigation function
- * @param {Function} config.t - Translation function
- * @param {Object} config.location - Router location object
- * @param {boolean} config.isMobile - Is mobile viewport
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Object} config.AdminService - Admin service with methods
- * @param {Object} config.options - Options object with categories, countries, etc.
- * @param {Function} config.handleError - Error handling function
- * @param {number} config.defaultPageSize - Default pagination page size
- * @param {string} config.view - View identifier
- * @param {string} config.headerTitle - Header title for the table
- * @param {Array} config.breadcrumbs - Breadcrumbs configuration
- * @param {any} config.refetchTrigger - Trigger to refetch data
- * @param {Function} config.getData - Optional custom getData function
- */
-export default function AdminLocationScreen({ config }) {
-	const {
-		appName = "app",
-		module,
-		goTo,
-		t,
-		location,
-		isMobile,
-		getRedirectLink,
-		AdminService,
-		options,
-		handleError,
-		defaultPageSize = 20,
-		view,
-		headerTitle = "documents",
-		breadcrumbs,
-		refetchTrigger,
-		getData,
-		user,
-	} = config;
-
-
-
-	const getSubjects = useCallback((params) => {
-		if (getData) {
-			return getData(params);
-		}
-		return AdminService.getItems({ item: 'document', params });
-	}, [getData, AdminService]);
-
-	return (
-		<DocumentsTable
-			t={t}
-			goTo={goTo}
-			getRedirectLink={getRedirectLink}
-			location={location}
-			module={module}
-			headerTitle={headerTitle}
-			getData={getSubjects}
-			isMobile={isMobile}
-			defaultPageSize={defaultPageSize}
-			view={view}
-			breadcrumbs={breadcrumbs}
-			refetchTrigger={refetchTrigger}
-			config={{
-				options: {
-					category: options?.category,
-					countries: options?.countries,
-				},
-			}}
-			user={user}
-			options={options}
-		/>
-	);
-}
-

package/src/@daf/core/components/Screens/Admin/AdminScreens/Events.jsx

@@ -1,77 +0,0 @@
-import React, { useCallback } from "react";
-import { message } from "antd";
-import EventsTable from "../AdminTables/EventsTable/index.jsx";
-/**
- * Admin Location Screen Wrapper
- * This is a ready-to-use route component that can be configured per application
- * 
- * @param {Object} config - Application configuration
- * @param {string} config.appName - Application name
- * @param {string} config.module - Module identifier (APP constant)
- * @param {Function} config.goTo - Navigation function
- * @param {Function} config.t - Translation function
- * @param {Object} config.location - Router location object
- * @param {boolean} config.isMobile - Is mobile viewport
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Object} config.AdminService - Admin service with methods
- * @param {Object} config.options - Options object with categories, countries, etc.
- * @param {Function} config.handleError - Error handling function
- * @param {number} config.defaultPageSize - Default pagination page size
- * @param {string} config.view - View identifier
- * @param {string} config.headerTitle - Header title for the table
- * @param {Array} config.breadcrumbs - Breadcrumbs configuration
- * @param {any} config.refetchTrigger - Trigger to refetch data
- * @param {Function} config.getData - Optional custom getData function
- */
-export default function AdminEventsScreen({ config }) {
-	const {
-		appName = "app",
-		module,
-		goTo,
-		t,
-		location,
-		isMobile,
-		getRedirectLink,
-		AdminService,
-		options,
-		handleError,
-		defaultPageSize = 20,
-		view,
-		headerTitle = "events",
-		breadcrumbs,
-		refetchTrigger,
-		getData,
-		user,
-	} = config;
-
-
-
-	const getSubjects = useCallback((params) => {
-		if (getData) {
-			return getData(params);
-		}
-		return AdminService.getItems({ item: 'event', params });
-	}, [getData, AdminService]);
-
-	return (
-		<EventsTable
-			t={t}
-			goTo={goTo}
-			getRedirectLink={getRedirectLink}
-			location={location}
-			module={module}
-			headerTitle={headerTitle}
-			getData={getSubjects}
-			isMobile={isMobile}
-			defaultPageSize={defaultPageSize}
-			view={view}
-			breadcrumbs={breadcrumbs}
-			refetchTrigger={refetchTrigger}
-			config={{
-				options:options}}
-			user={user}
-			options={options}
-		/>
-	);
-}
-

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/column.js

@@ -1,127 +0,0 @@
-import { Checkbox, Tooltip, Avatar } from "antd";
-import CustomIcon from "../../../../Icon/CustomIcon.jsx";
-import { findOptions } from "../../../../../../../helpers/StringHelper.js";
-import { renderDateFormatted } from "../../../../../../../helpers/Forms.js";
-export const getColumns = ({
-	t,
-	goTo = () => {},
-	show = "show",
-	getRedirectLink = () => {},
-	token,
-	selectedSubjects,
-	setSelectedSubjects,
-	selectOptions,
-	entity,
-	options,
-}) => {
-	const cols = [
-		{
-			title: "",
-			dataIndex: "select",
-			key: "select",
-			width: 50,
-			show: true,
-			render: (v, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-				return (
-					<Checkbox
-						onChange={() =>
-							setSelectedSubjects((prev) => {
-								const isSelected = prev?.some((p) => p.id === all.id);
-								if (isSelected) {
-									return prev.filter((p) => p.id !== all.id);
-								}
-								return [...prev, all];
-							})
-						}
-						checked={selectedSubjects?.some((p) => p.id === all.id)}
-						disabled={
-							selectedSubjects?.length >= 3 &&
-							!selectedSubjects?.some((p) => p.id === all.id)
-						}
-					/>
-				);
-			},
-		},
-		{
-			title: t("ID"),
-			dataIndex: "datastakeId",
-			key: "datastakeId",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		{
-			title: t("Title"),
-			dataIndex: "name",
-			key: "name",
-			ellipsis: true,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return <Tooltip title={value}>{value}</Tooltip>;
-			},
-		},
-		
-{
-    title: t("Date"),
-    dataIndex: "date",
-    key: "date",
-	show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return <div className="daf-default-cell" />;
-      }
-      return <Tooltip title={renderDateFormatted(value, "DD MMM YYYY", 'en')}>{renderDateFormatted(value, "DD MMM YYYY", 'en')	}</Tooltip>;
-    },
-  },
-{
-    title: t("Last Update"),
-    dataIndex: "updatedAt",
-    key: "updatedAt",
-	show: true,
-    render: (value, all) => {
-      if (all.empty) {
-        return <div className="daf-default-cell" />;
-      }
-      return <Tooltip title={renderDateFormatted(value, "DD MMM YYYY", 'en')}>{renderDateFormatted(value, "DD MMM YYYY", 'en')}</Tooltip>;
-    },
-},
-		{
-			title: "",
-			dataIndex: "actions",
-			key: "actions",
-			width: 60,
-			show: true,
-			render: (value, all) => {
-				if (all.empty) {
-					return <div className="daf-default-cell" />;
-				}
-
-				return (
-					<div
-						className="cursor-pointer"
-						onClick={() => {
-							goTo(getRedirectLink(`/app/view/management-document/${all.id}`));
-						}}
-					>
-						<CustomIcon name="Link" width={18} height={18} />
-					</div>
-				);
-			},
-		},
-	];
-
-	return cols.filter((c) => c[show]);
-};

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/helper.js

@@ -1,43 +0,0 @@
-
-
-export const selectFiltersConfig = {
-	category: {
-		type: "select",
-		label: "Category",
-		placeholder: (t) => t("Category"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	country: {
-		type: "select",
-		label: "Country",
-		placeholder: (t) => t("Country"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-	sources: {
-		type: "select",
-		label: "Sources",
-		placeholder: (t) => t("Sources"),
-		style: { flex: 1 },
-		labelStyle: { flex: 1 },
-		getLabel: (option) => option.label,
-		getValue: (option) => option.value,
-	},
-};
-
-export const filtersConfig = {
-	name: "",
-	datastakeId: "",
-};
-
-export const defaultUrlParams = { activeTab: "active" };
-
-export const checkboxConfig = {
-	name: "Name",
-	datastakeId: "ID",
-};

package/src/@daf/core/components/Screens/Admin/AdminTables/DocumentsTable/index.jsx

@@ -1,201 +0,0 @@
-import { useState, useMemo } from "react";
-import { useAdminTable } from "../hook";
-import AdminTable from "../components/index.jsx";
-import DAFTable from "../../../../Table/index.jsx";
-import { theme, Tag, message } from "antd";
-import CustomIcon from "../../../../Icon/CustomIcon.jsx";
-import {
-	selectFiltersConfig,
-	filtersConfig,
-	defaultUrlParams,
-	checkboxConfig,
-} from "./helper.js";
-import { getColumns } from "./column.js";
-const { useToken } = theme;
-
-export default function DocumentsTable({
-	t = (text) => text,
-	isMobile,
-	goTo,
-	getRedirectLink,
-	location,
-	getData,
-	module,
-	config,
-	defaultPageSize = 20,
-	view,
-	headerTitle,
-	breadcrumbs,
-	refetchTrigger,
-	user,
-	options,
-}) {
-	const [showFilters, setShowFilters] = useState(false);
-	const [hasError, setHasError] = useState(false);
-	const [selectedDocuments, setSelectedDocuments] = useState([]);
-	const { token } = useToken();
-
-	const getDataWithStringPagination = async ({ params }) => {
-		const { pagination, tab, filters, search, sort, ...otherParams } = params;
-		
-		let paginationObj = { page: 1, pageSize: 20 };
-		if (pagination) {
-			try {
-				paginationObj = typeof pagination === 'string' ? JSON.parse(pagination) : pagination;
-			} catch (e) {
-				console.error('Failed to parse pagination', e);
-			}
-		}
-
-
-		const pageSize = Number(paginationObj.pageSize) || Number(paginationObj.take) || 20;
-
-		let pageNumber = 1;
-
-		if (paginationObj.page || paginationObj.current) {
-			pageNumber = Number(paginationObj.page) || Number(paginationObj.current);
-		} else if (typeof paginationObj.skip === 'number') {
-		
-			pageNumber = Math.floor(paginationObj.skip / pageSize) + 1;
-		}
-
-		pageNumber = pageNumber || 1;
-
-
-		let activeTab = tab || "active";
-		if (!tab && filters) {
-			try {
-				const parsedFilters = typeof filters === 'string' ? JSON.parse(filters) : filters;
-				activeTab = parsedFilters.activeTab || "active";
-			} catch (e) {
-				activeTab = "active";
-			}
-		}
-		
-		const transformedParams = {
-			pagination: {
-				skip: pageNumber, 
-				take: pageSize,
-			},
-			tab: activeTab,
-		};
-		
-		return getData({ params: transformedParams });
-	};
-
-	const {
-		filter,
-		activeTab,
-		canClearSearch,
-		totalPending,
-		data,
-		loading,
-		initFetchDone,
-		fetchData,
-		fetchPendingAccounts,
-		setLoading,
-	} = useAdminTable({
-		goTo,
-		location,
-		selectFiltersConfig,
-		view,
-		// defaultUrlParams,
-		module,
-		defaultPageSize,
-		filtersConfig,
-		getRedirectLink,
-		getData: getDataWithStringPagination,
-		refetchTrigger,
-	});
-
-	const selectOptions = useMemo(() => {
-		return {
-			category: config.options?.category,
-			country: config.options?.countries,
-			sources: [],
-		};
-	}, [config.options]);
-
-	const columns = useMemo(() => {
-		return getColumns({
-			t,
-			goTo,
-			token,
-			module,
-			selectedDocuments,
-			setSelectedDocuments,
-			getRedirectLink,
-			selectOptions,
-			entity: headerTitle,
-			options,
-		});
-	}, [t, goTo, module, token, selectedDocuments, getRedirectLink, selectOptions, headerTitle, options]);
-
-	console.log({data}, "data");
-
-	return (
-		<>
-			<AdminTable
-				filters={filter}
-				t={t}
-				headerTitle={headerTitle}
-				// actionButton={[
-				// 	{
-				// 		icon: "Merge",
-				// 		onClick: () => setIsModalOpen(true),
-				// 		tooltip: t("merge-subjects"),
-				// 		disabled: selectedDocuments.length < 2,
-				// 	},
-				// ]}
-				// tabs={getTabs({ t })}
-				isMobile={isMobile}
-				// activeTab={activeTab}
-				showFilters={showFilters}
-				setShowFilters={setShowFilters}
-				hasError={hasError}
-				setHasError={setHasError}
-				canClearSearch={canClearSearch}
-				selectOptions={selectOptions}
-				checkboxConfig={checkboxConfig}
-				defaultTableFilters={{}}
-				breadcrumbs={breadcrumbs}
-			>
-				{selectedDocuments.length > 0 && (
-					<div className="flex flex-row  ml-6 mt-5" style={{ flexWrap: "wrap", gap: "8px" }}>
-						{selectedDocuments.map((document) => (
-							<Tag
-								key={document.id}
-								className="flex flex-row gap-2 items-center"
-								onClick={() =>
-									setSelectedDocuments((prev) => prev.filter((a) => a.id !== document.id))
-								}
-								style={{ cursor: "pointer" }}
-							>
-								            <span>{document.name}</span>
-								<CustomIcon name="Close" size={10} />
-							</Tag>
-						))}
-					</div>
-				)}
-				<DAFTable
-					columns={columns}
-					data={data}
-					loading={loading}
-					hideOnLoading={false}
-					pagination={filter.pagination}
-					rowKey="id"
-					selectOptions={selectOptions}
-					doEmptyRows
-					setShowFilters={setShowFilters}
-					filtersConfig={selectFiltersConfig}
-					onFilterChange={filter.onFiltersChange}
-					showFilters={showFilters}
-					defaultFilters={filter.defaultFilters}
-					onChange={filter.onTableChange}
-				/>
-			</AdminTable>
-
-		
-		</>
-	);
-}