datastake-daf 0.6.710 → 0.6.712

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

@@ -0,0 +1,104 @@
+import React from "react";
+import AdminDashboardScreen from "./AdminScreens/Dashboard.jsx";
+import AdminUsersScreen from "./AdminScreens/Users.jsx";
+import AdminAccountsScreen from "./AdminScreens/Accounts.jsx";
+import AdminAccountsViewScreen from "./AdminScreens/AccountsView.jsx";
+
+/**
+ * Generate Admin Routes for any application
+ * 
+ * This function returns a complete set of admin routes that can be used directly
+ * in your 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 APP_PREFIX = `APP_${appName.toUpperCase()}`;
+
+	// Wrapper components that use the configuration hooks
+	function DashboardWrapper() {
+		const dashboardConfig = useAdminDashboardConfig();
+		return <AdminDashboardScreen config={dashboardConfig} />;
+	}
+
+	function UsersWrapper() {
+		const usersConfig = useAdminUsersConfig();
+		return <AdminUsersScreen config={usersConfig} />;
+	}
+
+	function AccountsWrapper() {
+		const accountsConfig = useAdminAccountsConfig();
+		return <AdminAccountsScreen config={accountsConfig} />;
+	}
+
+	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 />,
+		},
+	];
+}
+

package/src/@daf/services/DashboardService.js

@@ -9,21 +9,6 @@ class DashboardService extends BaseService {
           isApp: true,
         });
     }
-
-    getUserGrowth(activeFilter) {
-      return this.apiGet({
-        url: `/accounts/dashboard/user-growth`,
-        isUserManager: true,
-        params: { activeFilter },
-      });
-    }
-
-    getAdminDashboard() { 
-      return this.apiGet({
-        url: `/accounts/dashboard`,
-        isUserManager: true,
-      });
-    }
 }
 
 export default createLazyService(DashboardService);

package/src/helpers/StringHelper.js

@@ -184,10 +184,4 @@ export const cleanJSON = (json) => {
       */
   }
   return json;
-}
-
-export function formatToKebabCase(str) {
-  return str
-    .replace(/([a-z])([A-Z])/g, "$1-$2")
-    .toLowerCase();
 }

package/src/index.js

@@ -146,13 +146,31 @@ export { default as StakeholderMappings } from "./@daf/core/components/Graphs/St
 
 //* ------------------------------ Screens ------------------------------
 export { default as BaseScreen } from "./@daf/core/components/Screens/BaseScreen/index.jsx";
-// Admin
+// Admin - Base Components
 export { default as AdminDashboard } from "./@daf/core/components/Screens/Admin/AdminDashboard/index.jsx";
 export { default as UserTable } from "./@daf/core/components/Screens/Admin/AdminTables/UserTable/index.jsx";
 export { default as AccountTable } from "./@daf/core/components/Screens/Admin/AdminTables/AccountTable/index.jsx";
 export { default as LocationTable } from "./@daf/core/components/Screens/Admin/AdminTables/LocationTable/index.jsx";
 export { default as SubjectsTable } from "./@daf/core/components/Screens/Admin/AdminTables/SubjectsTable/index.jsx";
 export { default as AdminView } from "./@daf/core/components/Screens/Admin/AdminViews/index.jsx";
+
+// Admin - Ready-to-use Screen Components (Route Wrappers)
+export {
+	AdminDashboardScreen,
+	AdminUsersScreen,
+	AdminAccountsScreen,
+	AdminAccountsViewScreen,
+} from "./@daf/core/components/Screens/Admin/AdminScreens/index.js";
+
+// Admin - Modals
+export {
+	AddAccountModal,
+	AddUserModal,
+	AddUserToAccountModal,
+} from "./@daf/core/components/Screens/Admin/AdminModals/index.js";
+
+// Admin - Routes Generator
+export { getAdminRoutes } from "./@daf/core/components/Screens/Admin/adminRoutes.js";
 //Error
 export { default as NotFound } from "./@daf/core/components/Screens/NotFound/index.jsx";
 export { default as InformationUnavailable } from "./@daf/core/components/Screens/InformationUnavailable/index.jsx";

package/src/utils.js

@@ -9,7 +9,7 @@ export { renderTooltip, renderTooltipJsx } from './@daf/utils/tooltip'
 export { getRangeOfTicks } from './helpers/chart'
 
 export { propHasValue } from './helpers/deepFind'
-export { isEmptyOrSpaces, capitalizeAll, capitalize, camelCaseToTitle, snakeCaseToTitleCase, titleToCamelCase, findOptions, getOptionAsObject, nowToIso, renderTemplateString, renderTemplateStringInObject, truncateString, splitStringInMultipleLines, safeJsonParse, cleanJSON, formatToKebabCase } from './helpers/StringHelper.js'
+export { isEmptyOrSpaces, capitalizeAll, capitalize, camelCaseToTitle, snakeCaseToTitleCase, titleToCamelCase, findOptions, getOptionAsObject, nowToIso, renderTemplateString, renderTemplateStringInObject, truncateString, splitStringInMultipleLines, safeJsonParse, cleanJSON } from './helpers/StringHelper.js'
 export { getNkey, groupSubsections, getImageUploadViewValue } from './@daf/core/components/ViewForm/helper'
 export { renderRows } from './@daf/core/components/Table/helper'
 export { filterOptions, filterString, hasNotChanged, filterSelectOptions, mapSubGroupsInSubmit, mapSubGroupsInGet, filterCreateData, changeInputMeta, renderDateFormatted } from './helpers/Forms'

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: