datastake-daf 0.6.792 → 0.6.794

package/src/@daf/core/components/Screens/Admin/AdminViews/ViewLocation/index.jsx

@@ -0,0 +1,77 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import { getNameByLevel } from "./helpers.js";
+import LocationTable from "../../AdminTables/LocationTable/index.jsx";
+
+const isView = true;
+
+export default function View({
+	userRoles = [],
+	conf,
+	data = {},
+	formOptions = {},
+	t,
+	goTo,
+	location,
+	getRedirectLink,
+	accountStatuses,
+	module,
+}) {
+	const renderItem = (item) => {
+		if (item.type === "location") {
+			return (
+				<LocationTable
+					isView={isView}
+					entityData={data}
+					goTo={goTo}
+					getRedirectLink={getRedirectLink}
+					t={t}
+					location={location}
+					module={module}
+				/>
+			);
+		}
+
+		const getValue = () => {
+			const val =
+				item.getFormApps === true
+					? data?.apps?.find((app) => app.app === module)?.[item?.propertyName]
+					: data?.[item.key];
+
+			if (item.type === "select") {
+				const option = findOptions(val, formOptions[item.optionsName] || []);
+				return option ? t(option) : "-";
+			}
+
+			if (item.type === "administrative") {
+				return getNameByLevel(data?.linking?.SCL, item.level) || "-";
+			}
+
+			return val ?? "-";
+		};
+
+		return (
+			<div className="input" key={item.key}>
+				<p className="label">
+					<span>{t(item.label)}</span>
+				</p>
+				<p className="value">{getValue()}</p>
+			</div>
+		);
+	};
+
+
+
+	return (
+		<div className="content">
+			<div className="wrapper" style={{ width: 700 }}>
+				<div className="group">
+					<div className="daf-title with-subtitle">
+						<h1>{t(conf.title)}</h1>
+					</div>
+
+					{conf.items.map((item) => renderItem(item))}
+				</div>
+			</div>
+		</div>
+	);
+}

package/src/@daf/core/components/Screens/Admin/AdminViews/ViewStakeholder/config.js

@@ -0,0 +1,38 @@
+export const config = [
+	{
+		label: "Core Data",
+		key: "core-data",
+		title: "Core Data",
+		items: [
+			{ 
+				label: "Name", 
+				key: "name", 
+				type: "input" 
+			},
+			{ 
+				label: "Category", 
+				key: "category", 
+				type: "select", 
+				optionsName: "category" 
+			},
+			{ 
+				label: "Country", 
+				key: "country", 
+				type: "select", 
+				optionsName: "countries" 
+			},
+			// { 
+			// 	label: "Province", 
+			// 	key: "administrativeLevel1", 
+			// 	type: "administrative",
+			// 	level: "level_1"
+			// },
+			// { 
+			// 	label: "Territory", 
+			// 	key: "administrativeLevel2", 
+			// 	type: "administrative",
+			// 	level: "level_2"
+			// },
+		],
+	},
+];

package/src/@daf/core/components/Screens/Admin/AdminViews/ViewStakeholder/index.jsx

@@ -0,0 +1,75 @@
+import { findOptions } from "../../../../../../../helpers/StringHelper.js";
+import StakeholderTable from "../../AdminTables/SubjectsTable/index.jsx";
+const isView = true;
+
+export default function View({
+	userRoles = [],
+	conf,
+	data = {},
+	formOptions = {},
+	t,
+	goTo,
+	stakeholder,
+	getRedirectLink,
+	accountStatuses,
+	module,
+}) {
+	const renderItem = (item) => {
+		if (item.type === "stakeholder") {
+			return (
+				<StakeholderTable
+					isView={isView}
+					entityData={data}
+					goTo={goTo}
+					getRedirectLink={getRedirectLink}
+					t={t}
+					stakeholder={stakeholder}
+					module={module}
+				/>
+			);
+		}
+
+		const getValue = () => {
+			const val =
+				item.getFormApps === true
+					? data?.apps?.find((app) => app.app === module)?.[item?.propertyName]
+					: data?.[item.key];
+
+			if (item.type === "select") {
+				const option = findOptions(val, formOptions[item.optionsName] || []);
+				return option ? t(option) : "-";
+			}
+
+			if (item.type === "administrative") {
+				return getNameByLevel(data?.linking?.SCL, item.level) || "-";
+			}
+
+			return val ?? "-";
+		};
+
+		return (
+			<div className="input" key={item.key}>
+				<p className="label">
+					<span>{t(item.label)}</span>
+				</p>
+				<p className="value">{getValue()}</p>
+			</div>
+		);
+	};
+
+
+
+	return (
+		<div className="content">
+			<div className="wrapper" style={{ width: 700 }}>
+				<div className="group">
+					<div className="daf-title with-subtitle">
+						<h1>{t(conf.title)}</h1>
+					</div>
+
+					{conf.items.map((item) => renderItem(item))}
+				</div>
+			</div>
+		</div>
+	);
+}

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Edit/index.jsx

@@ -37,7 +37,7 @@ export default function Edit({
 
 	const deleteUser = useCallback(
 		(id) => {
-			// TODO: add call
+			// TODO: add call 
 			console.log("DELETE", id);
 			fetchData();
 		},
@@ -174,6 +174,8 @@ export default function Edit({
 		);
 	};
 
+	console.log(conf,"data");
+
 	return (
 		<div className="form-edit flex-row">
 			<Form

package/src/@daf/core/components/Screens/Admin/AdminViews/components/SidebarMenu/index.jsx

@@ -1,7 +1,9 @@
 import { Menu } from "antd";
-import { config } from "../../config";
+import { config as defaultConfig } from "../../config";
 
-export default function SideBarMenu({ selectedGroup, onChange = () => {}, t }) {
+export default function SideBarMenu({ selectedGroup, onChange = () => {}, t, config }) {
+	const menuConfig = config || defaultConfig;
+	
 	return (
 		<Menu
 			mode="inline"
@@ -12,7 +14,7 @@ export default function SideBarMenu({ selectedGroup, onChange = () => {}, t }) {
 				onChange(g.key);
 			}}
 			items={
-				config.map((conf) => {
+				menuConfig.map((conf) => {
 					return {
 						key: conf.key,
 						label: t(conf.label),

package/src/@daf/core/components/Screens/Admin/AdminViews/components/Users/helper.js

@@ -167,10 +167,7 @@ export const getColumns = ({
 	return cols.filter((v) => v.show);
 };
 
-export const checkboxConfig = {
-	name: "Name",
-	datastakeId: "ID",
-};
+export const checkboxConfig = {};
 
 export const selectFiltersConfig = {
 	userRole: {
@@ -194,9 +191,17 @@ export const selectFiltersConfig = {
 };
 
 export const filtersConfig = {
-	name: "",
-	datastakeId: "",
+	search: "",
+};
+
+export const defaultUrlParams = {
+	search: "",
+	userRole: null,
+	status: null,
 };
 
-export const defaultUrlParams = {};
-export const defaultTableFilters = {};
+export const defaultTableFilters = {
+	search: "",
+	userRole: null,
+	status: null,
+};

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

@@ -60,10 +60,10 @@ export default function Users({
 			userRole: userRoles.filter((u) => !u.isForAppAdmin),
 			status: accountStatuses,
 		};
-	}, [userRoles]);
+	}, [userRoles, accountStatuses]);
 
 	const canClearSearch = useMemo(() => {
-		return !!activeFilters.search;
+		return !!activeFilters.search || !!activeFilters.userRole || !!activeFilters.status;
 	}, [activeFilters]);
 
 	const onDeleteUserClick = useCallback(

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

@@ -55,7 +55,6 @@ function AdminView({
 	}, [data]);
 
 	const goToView = useCallback(() => {
-		console.log("goToView");
 		changeNotificationState({
 			onYes: () => {
 				setEditData(data);
@@ -63,7 +62,7 @@ function AdminView({
 				goTo(`/app/accounts/view/${id}/${group}`);
 			},
 		});
-	}, [goTo, changeNotificationState, data]);
+	}, [goTo, changeNotificationState, data, id, group]);
 
 	const breadCrumbs = useMemo(() => {
 		return renderBreadCrumbs({
@@ -99,9 +98,9 @@ function AdminView({
 			setIsChanged(false);
 			setLoading(false);
 		} catch (err) {
-			console.log(err);
+			handleError?.(err);
 		}
-	}, [id]);
+	}, [id, getAccountData, module, handleError]);
 
 	useEffect(() => {
 		fetchData();

package/src/@daf/core/components/Screens/Admin/adminRoutes.js

@@ -5,6 +5,7 @@ import AdminAccountsScreen from "./AdminScreens/Accounts.jsx";
 import AdminAccountsViewScreen from "./AdminScreens/AccountsView.jsx";
 import AdminSubjectsScreen from "./AdminScreens/Subjects.jsx";
 import AdminLocationScreen from "./AdminScreens/Location.jsx";
+import AdminSubjectsViewScreen from "./AdminScreens/SubjectsView.jsx";
 
 export function getAdminRoutes(config) {
   const {
@@ -15,6 +16,8 @@ export function getAdminRoutes(config) {
     useAdminAccountsViewConfig,
     useAdminSubjectsConfig,
     useAdminLocationConfig,
+    useAdminSubjectsViewConfig,
+    useAdminLocationViewConfig,
     userIsAdmin,
   } = config;
 
@@ -56,6 +59,38 @@ export function getAdminRoutes(config) {
     return <AdminLocationScreen config={locationConfig} />;
   }
 
+  function LocationViewWrapper() {
+    const locationViewConfig =
+      typeof useAdminLocationViewConfig === "function"
+        ? useAdminLocationViewConfig()
+        : undefined;
+    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location" }} />;
+  }
+
+  function StakeholderViewWrapper() {
+    const stakeholderViewConfig =
+      typeof useAdminSubjectsViewConfig === "function"
+        ? useAdminSubjectsViewConfig()
+        : undefined;
+    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder" }} />;
+  }
+
+  function LocationEditWrapper() {
+    const locationViewConfig =
+      typeof useAdminLocationViewConfig === "function"
+        ? useAdminLocationViewConfig()
+        : undefined;
+    return <AdminSubjectsViewScreen config={{ ...locationViewConfig, subject: "location", mode: "edit" }} />;
+  }
+
+  function StakeholderEditWrapper() {
+    const stakeholderViewConfig =
+      typeof useAdminSubjectsViewConfig === "function"
+        ? useAdminSubjectsViewConfig()
+        : undefined;
+    return <AdminSubjectsViewScreen config={{ ...stakeholderViewConfig, subject: "stakeholder", mode: "edit" }} />;
+  }
+
   const subjectsIndexComponent =
     typeof useAdminLocationConfig === "function"
       ? <LocationWrapper />
@@ -104,7 +139,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminLocationConfig === "function"
       ? [
           {
-            path: "subjects/location",
+            path: "management/subjects/location",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -115,7 +150,7 @@ export function getAdminRoutes(config) {
     ...(typeof useAdminSubjectsConfig === "function"
       ? [
           {
-            path: "subjects/stakeholder",
+            path: "management/subjects/stakeholder",
             key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
             exact: true,
             visible: (user) => userIsAdmin(user),
@@ -123,6 +158,50 @@ export function getAdminRoutes(config) {
           },
         ]
       : []),
+    ...(typeof useAdminLocationViewConfig === "function"
+      ? [
+          {
+            path: "management/subject/location/:id",
+            key: `${APP_PREFIX}_ADMIN_LOCATION_VIEW`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <LocationViewWrapper />,
+          },
+        ]
+      : []),
+    ...(typeof useAdminSubjectsViewConfig === "function"
+      ? [
+          {
+            path: "management/subject/stakeholder/:id",
+            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_VIEW`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <StakeholderViewWrapper />,
+          },
+        ]
+      : []),
+    ...(typeof useAdminLocationViewConfig === "function"
+      ? [
+          {
+            path: "management/subject/location/edit/:id",
+            key: `${APP_PREFIX}_ADMIN_LOCATION_EDIT`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <LocationEditWrapper />,
+          },
+        ]
+      : []),
+    ...(typeof useAdminSubjectsViewConfig === "function"
+      ? [
+          {
+            path: "management/subject/stakeholder/edit/:id",
+            key: `${APP_PREFIX}_ADMIN_STAKEHOLDER_EDIT`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <StakeholderEditWrapper />,
+          },
+        ]
+      : []),
   ];
 
   return routes;

package/src/@daf/core/components/Table/NavigationAction/index.jsx

@@ -1,18 +1,20 @@
 import React from 'react'
 import CustomIcon from '../../Icon/CustomIcon.jsx';
 
-const NavigationAction = ({onClick, theme}) => {
+const NavigationAction = ({onClick, theme, disabled = false}) => {
   return ( 
         <div style={{ display: "flex", justifyContent: "center" }}>
             <button 
                 onClick={onClick}
+                disabled={disabled}
                 style={{ 
-                    cursor: 'pointer', 
                     border: 'none', 
                     background: 'transparent',
                     padding: 0,
                     display: 'flex',
-                    alignItems: 'center'
+                    alignItems: 'center',
+                    opacity: disabled ? 0.5 : 1,
+                    cursor: disabled ? 'not-allowed' : 'pointer',
                 }}
             >
                 <CustomIcon name="Link" size={15} color={theme.baseGray70} />