datastake-daf 0.6.765 → 0.6.766

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

@@ -5,60 +5,64 @@ import KeyIndicatorsWidget from "./components/KeyIndicatorsWidget/index.jsx";
 import UserStatistics from "./components/UserStatistics/index.jsx";
 
 export default function AdminDashboard({
-	actionWidgetConfig,
-	loading,
-	data,
-	goTo,
-	adminTranslationIdentifier,
-	t,
-	loadingUserGrowth,
-	fetchUserGrowth = () => {},
+  actionWidgetConfig,
+  loading,
+  data,
+  goTo,
+  adminTranslationIdentifier,
+  t,
+  loadingUserGrowth,
+  fetchUserGrowth = () => {},
+  userGrowthData,
 }) {
-	const { keyIndicatorsData } = data;
+  const keyIndicatorsCards = Array.isArray(data?.keyIndicatorsData)
+    ? data.keyIndicatorsData
+    : [];
 
-	return (
-		<div className="daf-analysis admin-dashboard">
-			<Header title={t(`${adminTranslationIdentifier}::dashboard`)} />
-			<div className="content">
-				<div className="view-content">
-					<div className="daf-analysis-layout">
-						<div className="sections-cont w-pt">
-							<section>
-								{actionWidgetConfig.map((widgetConfig) => {
-									return (
-										<ActionWidget
-											key={widgetConfig.title}
-											{...widgetConfig}
-											onClick={() => goTo(widgetConfig.goToPath)}
-											title={t(`admin::${widgetConfig.title}`)}
-										/>
-									);
-								})}
-							</section>
+  console.log("AdminDashboard:data", data);
 
-							<section>
-								<KeyIndicatorsWidget
-									data={keyIndicatorsData}
-									loading={loading}
-									goTo={goTo}
-									t={t}
-								/>
-							</section>
+  return (
+    <div className="daf-analysis admin-dashboard">
+      <Header title={t(`${adminTranslationIdentifier}::dashboard`)} />
+      <div className="content">
+        <div className="view-content">
+          <div className="daf-analysis-layout">
+            <div className="sections-cont w-pt">
+              <section>
+                {actionWidgetConfig.map((widgetConfig) => (
+                  <ActionWidget
+                    key={widgetConfig.title}
+                    {...widgetConfig}
+                    onClick={() => goTo(widgetConfig.goToPath)}
+                    title={t(`${widgetConfig.title}`)}
+                  />
+                ))}
+              </section>
 
-							<section>
-								<UserStatistics
-									data={data}
-									loading={loading}
-									t={t}
-									loadingUserGrowth={loadingUserGrowth}
-									fetchUserGrowth={fetchUserGrowth}
-									translationKeys={adminTranslationIdentifier}
-								></UserStatistics>
-							</section>
-						</div>
-					</div>
-				</div>
-			</div>
-		</div>
-	);
+              <section>
+                <KeyIndicatorsWidget
+                  data={keyIndicatorsCards}   
+                  loading={loading}
+                  goTo={goTo}
+                  t={t}
+                />
+              </section>
+
+              <section>
+                <UserStatistics
+                  data={{ ...data }}
+                  userGrowthData={userGrowthData}    
+                  loading={loading}
+                  t={t}
+                  loadingUserGrowth={loadingUserGrowth}
+                  fetchUserGrowth={fetchUserGrowth}
+                  translationKeys={adminTranslationIdentifier}
+                />
+              </section>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  );
 }

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

@@ -1,77 +1,62 @@
 import React, { useMemo } from "react";
 import AdminDashboard from "../AdminDashboard/index.jsx";
 
-/**
- * Admin Dashboard 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 for translations (e.g., "wazi", "tazama")
- * @param {Function} config.goTo - Navigation function (useNavigate)
- * @param {Function} config.t - Translation function (useTranslation)
- * @param {Function} config.getRedirectLink - Function to get redirect links
- * @param {Function} config.getActionWidgetsConfig - Function that returns action widgets config
- * @param {Function} config.getKeyIndicatorsConfig - Function that returns key indicators config
- * @param {Function} config.useWidgetFetch - Hook to fetch dashboard data
- */
 export default function AdminDashboardScreen({ config }) {
-	const {
-		appName = "app",
-		goTo,
-		t,
-		getRedirectLink,
-		getActionWidgetsConfig,
-		getKeyIndicatorsConfig,
-		useWidgetFetch,
-	} = config;
+  const {
+    appName = "app",
+    goTo,
+    t,
+    getRedirectLink,
+    getActionWidgetsConfig,
+    getKeyIndicatorsConfig,
+    useWidgetFetch,
+  } = config;
 
-	const {
-		data,
-		loading,
-		userGrowthData,
-		fetchUserGrowth,
-		userGrowthDataLoading,
-	} = useWidgetFetch();
+  const {
+    data,
+    loading,
+    userGrowthData,
+    fetchUserGrowth,
+    userGrowthDataLoading,
+  } = useWidgetFetch();
 
-	const actionsWidgetsConfig = useMemo(
-		() => getActionWidgetsConfig({ getRedirectLink }),
-		[getRedirectLink]
-	);
+  console.log({userGrowthData});
 
-	const keyIndicatorsConfig = useMemo(
-		() =>
-			getKeyIndicatorsConfig({
-				getRedirectLink,
-				keyIndicatorsData: data?.keyInformation,
-			}),
-		[data?.keyInformation, getRedirectLink]
-	);
+  const actionsWidgetsConfig = useMemo(
+    () => getActionWidgetsConfig({ getRedirectLink }),
+    [getRedirectLink, getActionWidgetsConfig]
+  );
 
-	// Dummy data for top contributors if not provided
-	const TOTAL_DUMMY = [
-		{ label: "Contributor 1", Score: 0 },
-		{ label: "Contributor 2", Score: 0 },
-		{ label: "Contributor 3", Score: 0 },
-		{ label: "Contributor 4", Score: 0 },
-		{ label: "Contributor 5", Score: 0 },
-	];
+  const keyIndicatorsConfig = useMemo(
+    () =>
+      getKeyIndicatorsConfig({
+        getRedirectLink,
+        keyIndicators: data?.keyIndicators ?? data?.keyInformation,
+      }),
+    [data?.keyIndicators, data?.keyInformation, getRedirectLink, getKeyIndicatorsConfig]
+  );
+
+  const safeUserActivity = Array.isArray(data?.data?.userActivity) ? data.data.userActivity : [];
+  const safeTopContributors = Array.isArray(data?.topContributors) ? data.topContributors : [];
+  const safeUserGrowth = Array.isArray(data?.userGrowthData) ? data.userGrowthData : [];
 
-	return (
-		<AdminDashboard
-			t={t}
-			loading={loading}
-			goTo={goTo}
-			actionWidgetConfig={actionsWidgetsConfig}
-			loadingUserGrowth={userGrowthDataLoading}
-			fetchUserGrowth={fetchUserGrowth}
-			data={{
-				keyIndicatorsData: keyIndicatorsConfig,
-				userActivityData: data?.userActivity,
-				topContributorsData: data?.topContributors || TOTAL_DUMMY,
-				userGrowthData: userGrowthData,
-			}}
-			adminTranslationIdentifier={appName}
-		/>
-	);
-}
 
+  return (
+    <AdminDashboard
+      t={t}
+      goTo={goTo}
+      loading={loading}
+      actionWidgetConfig={actionsWidgetsConfig}
+      loadingUserGrowth={userGrowthDataLoading}
+      fetchUserGrowth={fetchUserGrowth}
+      adminTranslationIdentifier={appName}
+      data={{
+        keyIndicatorsData: keyIndicatorsConfig,
+        userActivityData: safeUserActivity,
+        topContributorsData: safeTopContributors,
+        userGrowthData: safeUserGrowth,
+        data: data,
+      }}
+    />
+  );
+}

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

@@ -0,0 +1,96 @@
+import React, { useCallback } from "react";
+import { message } from "antd";
+import LocationTable from "../AdminTables/LocationTable/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 = "location",
+		breadcrumbs,
+		refetchTrigger,
+		getData
+	} = config;
+
+	const handleMergeLocations = useCallback(
+		async (mergeData) => {
+			try {
+				if (AdminService.mergeLocations) {
+					await AdminService.mergeLocations(mergeData);
+					message.success(t("Locations merged successfully"));
+				} else {
+					console.warn("AdminService.mergeLocations is not implemented");
+					message.success(t("Locations merged successfully"));
+				}
+			} catch (err) {
+				handleError?.(err);
+			}
+		},
+		[AdminService, t, handleError]
+	);
+
+	// Use custom getData if provided, otherwise use default AdminService.getLocations
+	const getLocations = useCallback((params) => {
+		if (getData) {
+			return getData(params);
+		}
+		return AdminService.getLocations(params);
+	}, [getData, AdminService]);
+
+	return (
+		<LocationTable
+			t={t}
+			goTo={goTo}
+			getRedirectLink={getRedirectLink}
+			location={location}
+			module={module}
+			headerTitle={headerTitle}
+			getData={getLocations}
+			isMobile={isMobile}
+			defaultPageSize={defaultPageSize}
+			view={view}
+			breadcrumbs={breadcrumbs}
+			mergeSubjectsFunction={handleMergeLocations}
+			refetchTrigger={refetchTrigger}
+			config={{
+				options: {
+					category: options?.category,
+					countries: options?.countries,
+				},
+			}}
+		/>
+	);
+}
+

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

@@ -0,0 +1,96 @@
+import React, { useCallback } from "react";
+import { message } from "antd";
+import SubjectsTable from "../AdminTables/SubjectsTable/index.jsx";
+
+/**
+ * Admin Subjects 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 AdminSubjectsScreen({ config }) {
+	const {
+		appName = "app",
+		module,
+		goTo,
+		t,
+		location,
+		isMobile,
+		getRedirectLink,
+		AdminService,
+		options,
+		handleError,
+		defaultPageSize = 20,
+		view,
+		headerTitle = "subjects",
+		breadcrumbs,
+		refetchTrigger,
+		getData,
+	} = config;
+
+	const handleMergeSubjects = useCallback(
+		async (mergeData) => {
+			try {
+				if (AdminService.mergeSubjects) {
+					await AdminService.mergeSubjects(mergeData);
+					message.success(t("Subjects merged successfully"));
+				} else {
+					console.warn("AdminService.mergeSubjects is not implemented");
+					message.success(t("Subjects merged successfully"));
+				}
+			} catch (err) {
+				handleError?.(err);
+			}
+		},
+		[AdminService, t, handleError]
+	);
+
+	// Use custom getData if provided, otherwise use default AdminService.getSubjects
+	const getSubjects = useCallback((params) => {
+		if (getData) {
+			return getData(params);
+		}
+		return AdminService.getSubjects(params);
+	}, [getData, AdminService]);
+
+	return (
+		<SubjectsTable
+			t={t}
+			goTo={goTo}
+			getRedirectLink={getRedirectLink}
+			location={location}
+			module={module}
+			headerTitle={headerTitle}
+			getData={getSubjects}
+			isMobile={isMobile}
+			defaultPageSize={defaultPageSize}
+			view={view}
+			breadcrumbs={breadcrumbs}
+			mergeSubjectsFunction={handleMergeSubjects}
+			refetchTrigger={refetchTrigger}
+			config={{
+				options: {
+					category: options?.category,
+					countries: options?.countries,
+				},
+			}}
+		/>
+	);
+}
+

package/src/@daf/core/components/Screens/Admin/AdminScreens/index.js

@@ -8,4 +8,5 @@ export { default as AdminDashboardScreen } from "./Dashboard.jsx";
 export { default as AdminUsersScreen } from "./Users.jsx";
 export { default as AdminAccountsScreen } from "./Accounts.jsx";
 export { default as AdminAccountsViewScreen } from "./AccountsView.jsx";
-
+export { default as AdminSubjectsScreen } from "./Subjects.jsx";
+export { default as AdminLocationScreen } from "./Location.jsx";

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

@@ -3,102 +3,129 @@ import AdminDashboardScreen from "./AdminScreens/Dashboard.jsx";
 import AdminUsersScreen from "./AdminScreens/Users.jsx";
 import AdminAccountsScreen from "./AdminScreens/Accounts.jsx";
 import AdminAccountsViewScreen from "./AdminScreens/AccountsView.jsx";
+import AdminSubjectsScreen from "./AdminScreens/Subjects.jsx";
+import AdminLocationScreen from "./AdminScreens/Location.jsx";
 
-/**
- * Generate Admin Routes for any application
- * 
- * This function returns a complete set of admin routes that can be used directly
- * in  application's route configuration. Just provide the configuration and
- * you get back ready-to-use routes.
- * 
- * @param {Object} config - Application-specific configuration
- * @param {string} config.appName - Application name (e.g., "wazi", "tazama")
- * @param {Function} config.useAdminDashboardConfig - Hook that returns dashboard config
- * @param {Function} config.useAdminUsersConfig - Hook that returns users config
- * @param {Function} config.useAdminAccountsConfig - Hook that returns accounts config
- * @param {Function} config.useAdminAccountsViewConfig - Hook that returns accounts view config
- * @param {Function} config.userIsAdmin - Function to check if user is admin
- * 
- * @returns {Array} Array of route objects ready to be used with React Router
- * 
- * @example
- * ```javascript
- * import { getAdminRoutes } from "datastake-daf/dist/admin";
- * 
- * const routes = getAdminRoutes({
- *   appName: "wazi",
- *   useAdminDashboardConfig,
- *   useAdminUsersConfig,
- *   useAdminAccountsConfig,
- *   useAdminAccountsViewConfig,
- *   userIsAdmin: (user) => user?.role === 'admin'
- * });
- * 
- * export default routes;
- * ```
- */
 export function getAdminRoutes(config) {
-	const {
-		appName,
-		useAdminDashboardConfig,
-		useAdminUsersConfig,
-		useAdminAccountsConfig,
-		useAdminAccountsViewConfig,
-		userIsAdmin,
-	} = config;
+  const {
+    appName,
+    useAdminDashboardConfig,
+    useAdminUsersConfig,
+    useAdminAccountsConfig,
+    useAdminAccountsViewConfig,
+    useAdminSubjectsConfig,
+    useAdminLocationConfig,
+    userIsAdmin,
+  } = config;
 
-	const APP_PREFIX = `APP_${appName.toUpperCase()}`;
+  const APP_PREFIX = `APP_${appName.toUpperCase()}`;
 
-	// Wrapper components that use the configuration hooks
-	function DashboardWrapper() {
-		const dashboardConfig = useAdminDashboardConfig();
-		return <AdminDashboardScreen config={dashboardConfig} />;
-	}
+  function DashboardWrapper() {
+    const dashboardConfig = useAdminDashboardConfig();
+    return <AdminDashboardScreen config={dashboardConfig} />;
+  }
 
-	function UsersWrapper() {
-		const usersConfig = useAdminUsersConfig();
-		return <AdminUsersScreen config={usersConfig} />;
-	}
+  function UsersWrapper() {
+    const usersConfig = useAdminUsersConfig();
+    return <AdminUsersScreen config={usersConfig} />;
+  }
 
-	function AccountsWrapper() {
-		const accountsConfig = useAdminAccountsConfig();
-		return <AdminAccountsScreen config={accountsConfig} />;
-	}
+  function AccountsWrapper() {
+    const accountsConfig = useAdminAccountsConfig();
+    return <AdminAccountsScreen config={accountsConfig} />;
+  }
 
-	function AccountsViewWrapper() {
-		const accountsViewConfig = useAdminAccountsViewConfig();
-		return <AdminAccountsViewScreen config={accountsViewConfig} />;
-	}
+  function AccountsViewWrapper() {
+    const accountsViewConfig = useAdminAccountsViewConfig();
+    return <AdminAccountsViewScreen config={accountsViewConfig} />;
+  }
 
-	return [
-		{
-			path: "",
-			key: `${APP_PREFIX}_DASHBOARD`,
-			exact: true,
-			visible: () => true,
-			component: <DashboardWrapper />,
-		},
-		{
-			path: "accounts",
-			key: `${APP_PREFIX}_ACCOUNTS`,
-			exact: true,
-			visible: (user) => userIsAdmin(user),
-			component: <AccountsWrapper />,
-		},
-		{
-			path: "admin-users",
-			key: `${APP_PREFIX}_ADMIN_USERS`,
-			exact: true,
-			visible: (user) => userIsAdmin(user),
-			component: <UsersWrapper />,
-		},
-		{
-			path: "accounts/:mode/:id/:group",
-			key: `${APP_PREFIX}_ADMIN_VIEW`,
-			exact: true,
-			visible: (user) => userIsAdmin(user),
-			component: <AccountsViewWrapper />,
-		},
-	];
+  function SubjectsWrapper() {
+    const subjectsConfig =
+      typeof useAdminSubjectsConfig === "function"
+        ? useAdminSubjectsConfig()
+        : undefined;
+    return <AdminSubjectsScreen config={subjectsConfig} />;
+  }
+
+  function LocationWrapper() {
+    const locationConfig =
+      typeof useAdminLocationConfig === "function"
+        ? useAdminLocationConfig()
+        : undefined;
+    return <AdminLocationScreen config={locationConfig} />;
+  }
+
+  const subjectsIndexComponent =
+    typeof useAdminLocationConfig === "function"
+      ? <LocationWrapper />
+      : typeof useAdminSubjectsConfig === "function"
+      ? <SubjectsWrapper />
+      : <div />;
+
+  const routes = [
+    {
+      path: "",
+      key: `${APP_PREFIX}_DASHBOARD`,
+      exact: true,
+      visible: (user) => userIsAdmin(user),
+      component: <DashboardWrapper />,
+    },
+    {
+      path: "accounts",
+      key: `${APP_PREFIX}_ACCOUNTS`,
+      exact: true,
+      visible: (user) => userIsAdmin(user),
+      component: <AccountsWrapper />,
+    },
+    {
+      path: "admin-users",
+      key: `${APP_PREFIX}_ADMIN_USERS`,
+      exact: true,
+      visible: (user) => userIsAdmin(user),
+      component: <UsersWrapper />,
+    },
+    {
+      path: "accounts/:mode/:id/:group",
+      key: `${APP_PREFIX}_ADMIN_VIEW`,
+      exact: true,
+      visible: (user) => userIsAdmin(user),
+      component: <AccountsViewWrapper />,
+    },
+
+    {
+      path: "subjects",
+      key: `${APP_PREFIX}_SUBJECTS_INDEX`,
+      exact: true,
+      visible: (user) => userIsAdmin(user),
+      component: subjectsIndexComponent,
+    },
+
+    ...(typeof useAdminLocationConfig === "function"
+      ? [
+          {
+            path: "subjects/location",
+            key: `${APP_PREFIX}_ADMIN_SUBJECTS_LOCATIONS`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <LocationWrapper />,
+          },
+        ]
+      : []),
+    ...(typeof useAdminSubjectsConfig === "function"
+      ? [
+          {
+            path: "subjects/stakeholder",
+            key: `${APP_PREFIX}_ADMIN_SUBJECTS_STAKEHOLDERS`,
+            exact: true,
+            visible: (user) => userIsAdmin(user),
+            component: <SubjectsWrapper />,
+          },
+        ]
+      : []),
+  ];
+
+  return routes;
 }
 
+export default getAdminRoutes;