@appcorp/fusion-storybook 0.1.72 → 0.1.74

package/base-modules/rbac/context.d.ts

@@ -1,10 +1,10 @@
+import { type RowAction, type TableRow } from "@appcorp/shadcn/components/enhanced-table";
 import { PermissionBE, RoleBE, RolePermissionBE } from "../../type";
 export declare const RBAC_DRAWER: {
     readonly FILTER_DRAWER: string;
     readonly FORM_DRAWER: string;
     readonly VIEW_DRAWER: string;
     readonly MORE_ACTIONS_DRAWER: string;
-    readonly ASSIGN_PERMISSIONS_DRAWER: string;
 };
 export declare const RBAC_ACTION_TYPES: {
     readonly RESET_FORM: "RESET_FORM";
@@ -106,24 +106,6 @@ export declare const RBAC_ACTION_TYPES: {
     drawer: null;
     modal: null;
 }>;
-/**
- * Extended action types for permission-specific state mutations.
- */
-export declare const RBAC_EXTENDED_ACTION_TYPES: {
-    readonly SET_AVAILABLE_PERMISSIONS: "SET_AVAILABLE_PERMISSIONS";
-    readonly SET_TOGGLING_PERMISSION: "SET_TOGGLING_PERMISSION";
-    readonly RESET_FORM: "RESET_FORM";
-    readonly SET_CURRENT_PAGE: "SET_CURRENT_PAGE";
-    readonly SET_PAGE_LIMIT: "SET_PAGE_LIMIT";
-    readonly SET_SEARCH_QUERY: "SET_SEARCH_QUERY";
-    readonly SET_DRAWER: "SET_DRAWER";
-    readonly SET_ITEMS: "SET_ITEMS";
-    readonly SET_FORM_DATA: "SET_FORM_DATA";
-    readonly SET_DISABLE_SAVE_BUTTON: "SET_DISABLE_SAVE_BUTTON";
-    readonly SET_INPUT_FIELD: "SET_INPUT_FIELD";
-    readonly SET_ERRORS: "SET_ERRORS";
-    readonly SET_FILTERS: "SET_FILTERS";
-};
 /**
  * Backward-compatible alias used by dashboard-providers.tsx
  */
@@ -139,10 +121,9 @@ export declare const useRbacModule: () => {
     deleteLoading: boolean;
     handleChange: (key: string, value: string | number | boolean | undefined) => void;
     handleCreate: () => void;
-    handleDelete: (row?: unknown) => void;
-    handleEdit: (row?: unknown) => void;
+    handleDelete: (row?: TableRow) => void;
+    handleEdit: (row?: TableRow) => Promise<void>;
     handleFilters: () => void;
-    handleManagePermissions: (row?: unknown) => Promise<void>;
     handleMoreActions: () => void;
     handleNextClick: () => void;
     handlePageChange: (page: number) => void;
@@ -151,7 +132,7 @@ export declare const useRbacModule: () => {
     handleSearch: (query: string) => void;
     handleSubmit: () => void;
     handleTogglePermission: (permissionId: string) => Promise<void>;
-    handleView: (row?: unknown) => void;
+    handleView: (row?: TableRow) => void;
     headerActions: {
         enabled: boolean;
         handleOnClick: () => void;
@@ -161,12 +142,7 @@ export declare const useRbacModule: () => {
     listError: Error | undefined;
     listFetchNow: (url?: string, config?: import("@react-pakistan/util-functions/hooks/use-fetch").FetchConfig) => void;
     listLoading: boolean;
-    rowActions: {
-        enabled: boolean;
-        handleOnClick: (row?: unknown) => void;
-        label: string;
-        order: number;
-    }[];
+    rowActions: RowAction[];
     updateLoading: boolean;
     state: {
         description: string;

package/base-modules/rbac/context.js

@@ -15,7 +15,6 @@
  * - `RbacProvider` — provider component used by the page
  * - `RbacStateContextProvider` — backward-compat alias
  * - `RBAC_ACTION_TYPES` — action type constants (from factory)
- * - `RBAC_EXTENDED_ACTION_TYPES` — extended action types for permissions
  * - `RBAC_DRAWER` — drawer type constants
  * - `useRbacModule()` — hook that returns state, dispatch, and handlers
  */
@@ -39,7 +38,6 @@ export const RBAC_DRAWER = {
     FORM_DRAWER: DRAWER_TYPES.FORM_DRAWER,
     VIEW_DRAWER: DRAWER_TYPES.VIEW_DRAWER,
     MORE_ACTIONS_DRAWER: DRAWER_TYPES.MORE_ACTIONS_DRAWER,
-    ASSIGN_PERMISSIONS_DRAWER: "ASSIGN_PERMISSIONS_DRAWER",
 };
 const rbacConfig = {
     name: "Rbac",
@@ -73,10 +71,6 @@ const rbacConfig = {
 // 1.3 CREATE RBAC MODULE
 // ============================================================================
 export const { actionTypes: RBAC_ACTION_TYPES, config: rbacModuleConfig, initialState: initialRbacState, Provider: RbacProvider, reducer: rbacReducer, useContext: useRbacContext, } = createGenericModule(rbacConfig);
-/**
- * Extended action types for permission-specific state mutations.
- */
-export const RBAC_EXTENDED_ACTION_TYPES = Object.assign(Object.assign({}, RBAC_ACTION_TYPES), { SET_AVAILABLE_PERMISSIONS: "SET_AVAILABLE_PERMISSIONS", SET_TOGGLING_PERMISSION: "SET_TOGGLING_PERMISSION" });
 /**
  * Backward-compatible alias used by dashboard-providers.tsx
  */
@@ -260,26 +254,27 @@ export const useRbacModule = () => {
     }, [dispatch]);
     // row actions
     const handleView = useCallback((row) => {
-        const record = row;
-        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: record === null || record === void 0 ? void 0 : record.id } });
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: row === null || row === void 0 ? void 0 : row.id } });
         dispatch({
             type: RBAC_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: RBAC_DRAWER.VIEW_DRAWER },
         });
     }, [byIdFetchNow, dispatch]);
-    const handleEdit = useCallback((row) => {
-        const record = row;
-        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: record === null || record === void 0 ? void 0 : record.id } });
+    const handleEdit = useCallback(async (row) => {
+        byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: row === null || row === void 0 ? void 0 : row.id } });
+        // loadAvailablePermissions is declared below in 1.4.7
+        // await loadAvailablePermissions();
         dispatch({
             type: RBAC_ACTION_TYPES.SET_DRAWER,
             payload: { drawer: RBAC_DRAWER.FORM_DRAWER },
         });
     }, [byIdFetchNow, dispatch]);
     const handleDelete = useCallback((row) => {
-        const record = row;
-        if (confirm(t("messagesDeleteConfirmation"))) {
-            deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, { params: { id: record === null || record === void 0 ? void 0 : record.id } });
-        }
+        if (!confirm(t("messagesDeleteConfirmation")))
+            return;
+        deleteFetchNow === null || deleteFetchNow === void 0 ? void 0 : deleteFetchNow(undefined, {
+            body: JSON.stringify({ id: row === null || row === void 0 ? void 0 : row.id }),
+        });
     }, [deleteFetchNow, t]);
     // header actions
     const handleCreate = useCallback(() => {
@@ -361,40 +356,34 @@ export const useRbacModule = () => {
             },
         });
     }, [dispatch, showToast, t, updateFetchNow, updateParams]);
-    const loadAvailablePermissions = useCallback(async () => {
-        try {
-            const res = await fetch(`${RBAC_API_ROUTES.PERMISSIONS_LIST}?pageLimit=1000`, {
-                headers: {
-                    "Content-Type": "application/json",
-                    "x-api-token": process.env.NEXT_PUBLIC_API_KEY,
-                },
-            });
-            if (!res.ok)
-                throw new Error("Failed to load permissions");
-            const data = (await res.json());
-            dispatch({
-                type: RBAC_EXTENDED_ACTION_TYPES.SET_AVAILABLE_PERMISSIONS,
-                payload: { permissions: data.items },
-            });
-        }
-        catch (_a) {
-            showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
-        }
-    }, [dispatch, showToast, t]);
-    const handleManagePermissions = useCallback(async (row) => {
-        const record = row;
-        await (byIdFetchNow === null || byIdFetchNow === void 0 ? void 0 : byIdFetchNow(undefined, { params: { id: record === null || record === void 0 ? void 0 : record.id } }));
-        await loadAvailablePermissions();
-        dispatch({
-            type: RBAC_ACTION_TYPES.SET_DRAWER,
-            payload: { drawer: RBAC_DRAWER.ASSIGN_PERMISSIONS_DRAWER },
-        });
-    }, [byIdFetchNow, dispatch, loadAvailablePermissions]);
+    // const loadAvailablePermissions = useCallback(async () => {
+    //   try {
+    //     const res = await fetch(
+    //       `${RBAC_API_ROUTES.PERMISSIONS_LIST}?pageLimit=1000`,
+    //       {
+    //         headers: {
+    //           "Content-Type": "application/json",
+    //           "x-api-token": process.env.NEXT_PUBLIC_API_KEY!,
+    //         },
+    //       }
+    //     );
+    //     if (!res.ok) throw new Error("Failed to load permissions");
+    //     const data = (await res.json()) as { items: PermissionBE[] };
+    //     // Use SET_INPUT_FIELD — the generic reducer handles it via state[key] = value.
+    //     // Custom action types hit the reducer's default case and are silently ignored.
+    //     dispatch({
+    //       type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+    //       payload: { key: "availablePermissions", value: data.items },
+    //     });
+    //   } catch {
+    //     showToast(t("messagesFetchFailed"), TOAST_VARIANT.ERROR);
+    //   }
+    // }, [dispatch, showToast, t]);
     const handleTogglePermission = useCallback(async (permissionId) => {
         const existing = state.rolePermissions.find((rp) => rp.permissionId === permissionId);
         dispatch({
-            type: RBAC_EXTENDED_ACTION_TYPES.SET_TOGGLING_PERMISSION,
-            payload: { toggling: true },
+            type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+            payload: { key: "togglingPermission", value: true },
         });
         try {
             if (existing) {
@@ -426,8 +415,8 @@ export const useRbacModule = () => {
         }
         finally {
             dispatch({
-                type: RBAC_EXTENDED_ACTION_TYPES.SET_TOGGLING_PERMISSION,
-                payload: { toggling: false },
+                type: RBAC_ACTION_TYPES.SET_INPUT_FIELD,
+                payload: { key: "togglingPermission", value: false },
             });
         }
     }, [byIdFetchNow, dispatch, showToast, state.id, state.rolePermissions, t]);
@@ -436,7 +425,7 @@ export const useRbacModule = () => {
     // ============================================================================
     const headerActions = useMemo(() => [
         {
-            enabled: true,
+            enabled: false,
             handleOnClick: handleMoreActions,
             label: t("actionsButtonMoreActions"),
             order: 0,
@@ -467,19 +456,13 @@ export const useRbacModule = () => {
             label: t("actionsButtonEdit"),
             order: 2,
         },
-        {
-            enabled: true,
-            handleOnClick: handleManagePermissions,
-            label: t("actionsButtonManagePermissions"),
-            order: 3,
-        },
         {
             enabled: true,
             handleOnClick: handleDelete,
             label: t("actionsButtonDelete"),
             order: 4,
         },
-    ], [handleDelete, handleEdit, handleManagePermissions, handleView, t]);
+    ], [handleDelete, handleEdit, handleView, t]);
     // ============================================================================
     // 1.4.9 EFFECTS
     // ============================================================================
@@ -520,7 +503,6 @@ export const useRbacModule = () => {
         handleDelete,
         handleEdit,
         handleFilters,
-        handleManagePermissions,
         handleMoreActions,
         handleNextClick,
         handlePageChange,

package/base-modules/rbac/form.js

@@ -1,13 +1,15 @@
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /**
  * RBAC Form Component
  *
  * Create/edit form for roles.
  */
 import { EnhancedInput } from "@appcorp/shadcn/components/enhanced-input";
+import { Separator } from "@appcorp/shadcn/components/ui/separator";
 import { useRbacModule } from "./context";
+import { AssignPermissions } from "./assign-permissions";
 export const RbacForm = () => {
     const { state, handleChange } = useRbacModule();
-    return (_jsx("div", { className: "space-y-4", children: _jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: "Role Name", required: true, type: "text", value: state.name || "", onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: "e.g. Class Teacher, Admin, Accountant", info: "A unique, descriptive name for this role" }), _jsx(EnhancedInput, { id: "description", label: "Description", type: "text", value: state.description || "", onChange: (e) => handleChange("description", e.target.value || undefined), error: state.errors.description, placeholder: "Brief description of what this role can do", info: "Optional description to clarify the role's purpose" })] }) }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "grid grid-cols-1 gap-4", children: [_jsx(EnhancedInput, { id: "name", label: "Role Name", required: true, type: "text", value: state.name || "", onChange: (e) => handleChange("name", e.target.value), error: state.errors.name, placeholder: "e.g. Class Teacher, Admin, Accountant", info: "A unique, descriptive name for this role" }), _jsx(EnhancedInput, { id: "description", label: "Description", type: "text", value: state.description || "", onChange: (e) => handleChange("description", e.target.value || undefined), error: state.errors.description, placeholder: "Brief description of what this role can do", info: "Optional description to clarify the role's purpose" })] }), state.id && (_jsxs(_Fragment, { children: [_jsx(Separator, {}), _jsxs("div", { className: "space-y-2", children: [_jsx("p", { className: "text-sm font-medium", children: "Permissions" }), _jsx(AssignPermissions, {})] })] }))] }));
 };

package/base-modules/rbac/page.js

@@ -16,16 +16,15 @@
  * - `RbacPage` — root component that wraps with RbacProvider
  */
 "use client";
-import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from "react";
 import { COMPONENT_TYPE } from "@appcorp/shadcn/components/enhanced-table";
 import { createGenericModulePage, } from "@react-pakistan/util-functions/factory/generic-component-factory";
-import { RBAC_ACTION_TYPES, RbacProvider, useRbacModule, RBAC_DRAWER, } from "./context";
+import { RBAC_ACTION_TYPES, RbacProvider, useRbacModule } from "./context";
 import { RbacFilter } from "./filter";
 import { RbacForm } from "./form";
 import { RbacMoreActions } from "./more-actions";
 import { RbacView } from "./view";
-import { AssignPermissions } from "./assign-permissions";
 import { resolveRbacPermissions } from "../../utils/resolve-rbac-permissions";
 import { RbacNoAccess } from "../../components/rbac-no-access";
 // ============================================================================
@@ -61,7 +60,6 @@ const createComponentInstances = () => ({
     form: _jsx(RbacForm, {}),
     moreActions: _jsx(RbacMoreActions, {}),
     view: _jsx(RbacView, {}),
-    assignPermissions: _jsx(AssignPermissions, {}),
 });
 const createRbacConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, drawerTitleRbac, tableColumnHeaderActions, tableColumnHeaderDescription, tableColumnHeaderId, tableColumnHeaderName, tableColumnHeaderPermissions, tableDescription, tableSearchPlaceholder, tableTitle, }) => {
     const components = createComponentInstances();
@@ -93,9 +91,6 @@ const createRbacConfig = ({ dispatch, drawerButtonCancel, drawerButtonSave, draw
 // STABLE PAGE COMPONENT (created once, outside render)
 // ============================================================================
 const GenericRbacPage = createGenericModulePage();
-// ============================================================================
-// INNER PAGE (requires RbacProvider context)
-// ============================================================================
 const RbacPageInner = (props) => {
     const context = useRbacModule();
     // Memoize config creation — destructure props to avoid object reference changes
@@ -133,10 +128,9 @@ const RbacPageInner = (props) => {
     if (!hasPermission) {
         return _jsx(RbacNoAccess, { moduleName: "Workspace" });
     }
-    // If the assign-permissions drawer is open, render it inline instead
-    if (context.state.drawer === RBAC_DRAWER.ASSIGN_PERMISSIONS_DRAWER) {
-        return (_jsxs("div", { className: "p-4", children: [_jsx("div", { className: "mb-4 flex items-center gap-2", children: _jsx("button", { className: "text-muted-foreground text-sm underline", onClick: () => context.closeDrawer(), children: "\u2190 Back to roles" }) }), _jsx(AssignPermissions, {})] }));
-    }
     return (_jsx("div", { className: "p-4", children: _jsx(GenericRbacPage, { context: context, overrideConfig: rbacConfig, tableBodyCols: tableBodyCols }) }));
 };
+// ============================================================================
+// PAGE EXPORTS
+// ============================================================================
 export const RbacPage = (props) => (_jsx(RbacProvider, { children: _jsx(RbacPageInner, Object.assign({}, props)) }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appcorp/fusion-storybook",
-  "version": "0.1.72",
+  "version": "0.1.74",
   "scripts": {
     "build-storybook": "storybook build",
     "build:next": "next build",