- {(
- [
- { key: 'general', label: 'General Information' },
- { key: 'module', label: 'Module Access' },
- { key: 'settings', label: 'Role Settings' },
- ] as const
- ).map((t) => (
+ {(t) => (
setSubTab(t.key)}
class={`relative py-3.5 text-[13px] font-medium transition-colors ${
@@ -265,7 +263,7 @@ export default function EditInternalRolePage() {
- ))}
+ )}
{/* Error banner */}
diff --git a/src/routes/admin/roles/create.tsx b/src/routes/admin/roles/create.tsx
index cf1c3a9..d6b3eba 100644
--- a/src/routes/admin/roles/create.tsx
+++ b/src/routes/admin/roles/create.tsx
@@ -270,26 +270,26 @@ export default function CreateInternalRolePage() {
{/* Sub-tabs */}
- {(
- [
- { key: "general", label: "General Information" },
- { key: "module", label: "Module Access" },
- { key: "settings", label: "Role Settings" },
- ] as const
- ).map((t) => (
- setSubTab(t.key)}
- class={`relative px-4 py-4 text-[13px] font-semibold transition-colors ${
- subTab() === t.key ? "text-[#111827]" : "text-[#9CA3AF] hover:text-[#6B7280]"
- }`}
- >
- {t.label}
-
-
-
- ))}
+
+ {(t) => (
+ setSubTab(t.key)}
+ class={`relative px-4 py-4 text-[13px] font-semibold transition-colors ${
+ subTab() === t.key ? "text-[#111827]" : "text-[#9CA3AF] hover:text-[#6B7280]"
+ }`}
+ >
+ {t.label}
+
+
+
+ )}
+
{/* Error banner */}
@@ -412,24 +412,26 @@ export default function CreateInternalRolePage() {
{module}
- {ACTIONS.map((action) => {
- const p = () => byAction()[action];
- return (
-
- —}
- >
-
-
- );
- })}
+
+ {(action) => {
+ const p = () => byAction()[action];
+ return (
+
+ —}
+ >
+
+
+ );
+ }}
+
- {(
- [
- {
- key: "all",
- label: "All Roles",
- action: () => {
- setListTab("all");
- void load();
- },
+ {
+ setListTab("all");
+ void load();
},
- {
- key: "create",
- label: "Create Role",
- action: () => {
- setListTab("create");
- openCreate();
- },
+ },
+ {
+ key: "create",
+ label: "Create Role",
+ action: () => {
+ setListTab("create");
+ openCreate();
},
- { key: "view", label: "View Role", action: () => setListTab("view") },
- ] as const
- ).map((tab) => (
-
- {tab.label}
-
- ))}
+ },
+ { key: "view", label: "View Role", action: () => setListTab("view") },
+ ] as const}>
+ {(tab) => (
+
+ {tab.label}
+
+ )}
+
@@ -659,25 +659,25 @@ export default function RoleManagementPage() {
- {(
- [
- ["name_asc", "Name (A-Z)"],
- ["name_desc", "Name (Z-A)"],
- ["users_desc", "Users (High-Low)"],
- ["users_asc", "Users (Low-High)"],
- ] as const
- ).map(([key, label]) => (
- {
- setSortBy(key);
- setSortMenuOpen(false);
- }}
- style={`display:block;width:100%;border-radius:8px;padding:8px 12px;text-align:left;font-size:13px;background:none;border:none;cursor:pointer;color:${sortBy() === key ? "#FF5E13" : "#374151"};background:${sortBy() === key ? "#FFF1EB" : "transparent"}`}
- >
- {label}
-
- ))}
+
+ {([key, label]) => (
+ {
+ setSortBy(key);
+ setSortMenuOpen(false);
+ }}
+ style={`display:block;width:100%;border-radius:8px;padding:8px 12px;text-align:left;font-size:13px;background:none;border:none;cursor:pointer;color:${sortBy() === key ? "#FF5E13" : "#374151"};background:${sortBy() === key ? "#FFF1EB" : "transparent"}`}
+ >
+ {label}
+
+ )}
+
@@ -704,25 +704,25 @@ export default function RoleManagementPage() {
- {(
- [
- ["all", "All Status"],
- ["ACTIVE", "Active"],
- ["INACTIVE", "Inactive"],
- ] as const
- ).map(([key, label]) => (
- {
- setStatusFilter(key as any);
- setFilterMenuOpen(false);
- void load();
- }}
- style={`display:block;width:100%;border-radius:8px;padding:8px 12px;text-align:left;font-size:13px;background:none;border:none;cursor:pointer;color:${statusFilter() === key ? "#FF5E13" : "#374151"};background:${statusFilter() === key ? "#FFF1EB" : "transparent"}`}
- >
- {label}
-
- ))}
+
+ {([key, label]) => (
+ {
+ setStatusFilter(key as any);
+ setFilterMenuOpen(false);
+ void load();
+ }}
+ style={`display:block;width:100%;border-radius:8px;padding:8px 12px;text-align:left;font-size:13px;background:none;border:none;cursor:pointer;color:${statusFilter() === key ? "#FF5E13" : "#374151"};background:${statusFilter() === key ? "#FFF1EB" : "transparent"}`}
+ >
+ {label}
+
+ )}
+
@@ -751,7 +751,7 @@ export default function RoleManagementPage() {
- {[
+ (
-
- {h}
-
- ))}
+ ]}>
+ {(h) => (
+
+ {h}
+
+ )}
+
@@ -947,22 +949,25 @@ export default function RoleManagementPage() {
- {(["general", "permissions", "settings"] as const).map((tab, i) => {
- const labels = ["General Information", "Module Access", "Role Settings"];
- const active = () => formTab() === tab;
- return (
- setFormTab(tab)}
- style={`position:relative;padding:14px 8px;font-size:13px;font-weight:500;background:none;border:none;cursor:pointer;color:${active() ? "#FF5E13" : "#6B7280"}`}
- >
- {labels[i]}
-
-
-
- );
- })}
+
+ {(tab, getI) => {
+ const i = getI();
+ const labels = ["General Information", "Module Access", "Role Settings"];
+ const active = () => formTab() === tab;
+ return (
+ setFormTab(tab)}
+ style={`position:relative;padding:14px 8px;font-size:13px;font-weight:500;background:none;border:none;cursor:pointer;color:${active() ? "#FF5E13" : "#6B7280"}`}
+ >
+ {labels[i]}
+
+
+
+ );
+ }}
+
@@ -1017,15 +1022,17 @@ export default function RoleManagementPage() {
Status
- {(["ACTIVE", "INACTIVE"] as const).map((s) => (
- setStatus(s)}
- style={`flex:1;height:40px;border-radius:10px;font-size:13px;font-weight:600;cursor:pointer;border:1px solid ${status() === s ? "#FF5E13" : "#E5E7EB"};background:${status() === s ? "#FFF3EE" : "white"};color:${status() === s ? "#FF5E13" : "#6B7280"}`}
- >
- {s === "ACTIVE" ? "Active" : "Inactive"}
-
- ))}
+
+ {(s) => (
+ setStatus(s)}
+ style={`flex:1;height:40px;border-radius:10px;font-size:13px;font-weight:600;cursor:pointer;border:1px solid ${status() === s ? "#FF5E13" : "#E5E7EB"};background:${status() === s ? "#FFF3EE" : "white"};color:${status() === s ? "#FF5E13" : "#6B7280"}`}
+ >
+ {s === "ACTIVE" ? "Active" : "Inactive"}
+
+ )}
+
@@ -1206,22 +1213,25 @@ export default function RoleManagementPage() {
- {(["permissions", "users", "logs"] as const).map((tab, i) => {
- const labels = ["Permissions", "Assigned Users", "Activity Logs"];
- const active = () => detailTab() === tab;
- return (
- setDetailTab(tab)}
- style={`position:relative;padding:14px 12px;font-size:13px;font-weight:600;background:none;border:none;cursor:pointer;color:${active() ? "#FF5E13" : "#6B7280"}`}
- >
- {labels[i]}
-
-
-
- );
- })}
+
+ {(tab, getI) => {
+ const i = getI();
+ const labels = ["Permissions", "Assigned Users", "Activity Logs"];
+ const active = () => detailTab() === tab;
+ return (
+ setDetailTab(tab)}
+ style={`position:relative;padding:14px 12px;font-size:13px;font-weight:600;background:none;border:none;cursor:pointer;color:${active() ? "#FF5E13" : "#6B7280"}`}
+ >
+ {labels[i]}
+
+
+
+ );
+ }}
+
diff --git a/src/routes/admin/runtime-roles/index.tsx b/src/routes/admin/runtime-roles/index.tsx
index 37f5a0c..47cb4c6 100644
--- a/src/routes/admin/runtime-roles/index.tsx
+++ b/src/routes/admin/runtime-roles/index.tsx
@@ -128,24 +128,26 @@ export default function ExternalRolesPage() {
{/* Stat cards */}
- {([
+
stats().total, Icon: Globe, bg: 'bg-[#FFF1EB]', color: 'text-[#FF5E13]' },
{ label: 'Active Roles', value: () => stats().active, Icon: ShieldCheck, bg: 'bg-[#ECFDF5]', color: 'text-[#059669]' },
{ label: 'Inactive Roles', value: () => stats().inactive, Icon: ShieldOff, bg: 'bg-[#FEF2F2]', color: 'text-[#DC2626]' },
{ label: 'Total Modules', value: () => roles().reduce((a, r) => a + r.enabledModules.length, 0), Icon: Layers, bg: 'bg-[#EFF6FF]', color: 'text-[#2563EB]' },
- ] as const).map(s => (
-
-
-
-
{s.label}
-
{s.value()}
-
-
-
+ ]}>
+ {(s) => (
+
+
+
+
{s.label}
+
{s.value()}
+
+
+
-
- ))}
+ )}
+
{/* Table card */}
diff --git a/src/routes/admin/tax.tsx b/src/routes/admin/tax.tsx
index 18c464a..429dd4a 100644
--- a/src/routes/admin/tax.tsx
+++ b/src/routes/admin/tax.tsx
@@ -307,29 +307,31 @@ export default function TaxPage() {
No records found. 0}>
- {filteredTaxes().map((item) => (
-
- {item.name}
- {item.rate}%
- {item.description || '—'}
-
-
- {item.is_active !== false ? 'Active' : 'Inactive'}
-
-
-
-
- handleDelete(item.id, item.name)}
- >
- {deleting() === item.id ? 'Deleting...' : 'Delete'}
-
-
-
-
- ))}
+
+ {(item) => (
+
+ {item.name}
+ {item.rate}%
+ {item.description || '—'}
+
+
+ {item.is_active !== false ? 'Active' : 'Inactive'}
+
+
+
+
+ handleDelete(item.id, item.name)}
+ >
+ {deleting() === item.id ? 'Deleting...' : 'Delete'}
+
+
+
+
+ )}
+
diff --git a/src/routes/admin/users/[id]/edit.tsx b/src/routes/admin/users/[id]/edit.tsx
index 6d6c723..f9dcaef 100644
--- a/src/routes/admin/users/[id]/edit.tsx
+++ b/src/routes/admin/users/[id]/edit.tsx
@@ -1,5 +1,5 @@
import { A, useNavigate, useParams } from "@solidjs/router";
-import { createMemo, createResource, createSignal, Show } from "solid-js";
+import { createMemo, createResource, createSignal, For, Show } from "solid-js";
const API = "";
@@ -188,9 +188,9 @@ export default function EditUserPage() {
>
Select role
- {roles()?.map((r) => (
- {r.name}
- ))}
+
+ {(r) => {r.name} }
+
diff --git a/src/routes/admin/users/index.tsx b/src/routes/admin/users/index.tsx
index 8c0dd65..3c6d312 100644
--- a/src/routes/admin/users/index.tsx
+++ b/src/routes/admin/users/index.tsx
@@ -346,14 +346,14 @@ export default function UsersManagementPage() {
- {[
+
(
+ ]}>{(card) => (
{card.label}
@@ -364,13 +364,12 @@ export default function UsersManagementPage() {
{card.value}
- ))}
+ )}
- {(
- [
+ (
+ ] as const}>{(tab) => (
setListTab(tab.key)}
@@ -387,7 +385,7 @@ export default function UsersManagementPage() {
>
{tab.label}
- ))}
+ )}
@@ -509,8 +507,7 @@ export default function UsersManagementPage() {
- {(
- [
+ (
+ ] as const}>{(tab) => (
setDetailTab(tab.key)}
@@ -527,7 +523,7 @@ export default function UsersManagementPage() {
>
{tab.label}
- ))}
+ )}
@@ -721,14 +717,12 @@ export default function UsersManagementPage() {
- {(
- [
+ (
+ ] as const}>{(item) => (
{
@@ -739,7 +733,7 @@ export default function UsersManagementPage() {
>
{item.label}
- ))}
+ )}
Status
- {(
- [
+ (
+ ] as const}>{(item) => (
{
@@ -789,21 +781,19 @@ export default function UsersManagementPage() {
>
{item.label}
- ))}
+ )}
Role Group
- {(
- [
+ (
+ ] as const}>{(item) => (
{
@@ -814,7 +804,7 @@ export default function UsersManagementPage() {
>
{item.label}
- ))}
+ )}
diff --git a/src/routes/admin/verification-status/index.tsx b/src/routes/admin/verification-status/index.tsx
deleted file mode 100644
index ae21af1..0000000
--- a/src/routes/admin/verification-status/index.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-import { useNavigate } from '@solidjs/router';
-import { onMount } from 'solid-js';
-
-export default function VerificationStatusPage() {
- const navigate = useNavigate();
- onMount(() => navigate('/admin/verification', { replace: true }));
- return null;
-}
diff --git a/src/routes/admin/verification/[id].tsx b/src/routes/admin/verification/[id].tsx
index a7b0c5d..6fe5b5c 100644
--- a/src/routes/admin/verification/[id].tsx
+++ b/src/routes/admin/verification/[id].tsx
@@ -391,14 +391,14 @@ export default function VerificationReviewDetailPage() {
- {([
+ (
+ ] as const}>{(item) => (
setTab(item.key)}
@@ -406,7 +406,7 @@ export default function VerificationReviewDetailPage() {
>
{item.label}
- ))}
+ )}
@@ -535,7 +535,7 @@ export default function VerificationReviewDetailPage() {
- {['Document', 'File', 'Status'].map((h) => {h} )} {(h) => {h} }
0} fallback={No documents uploaded yet. {(doc) => (
diff --git a/src/routes/admin/verification/index.tsx b/src/routes/admin/verification/index.tsx
index 0294dc5..b39394f 100644
--- a/src/routes/admin/verification/index.tsx
+++ b/src/routes/admin/verification/index.tsx
@@ -644,10 +644,10 @@ export default function VerificationManagementPage() {
- {([
+ (
+ ] as const}>{(tab) => (
setListTab(tab.key)}
@@ -655,12 +655,12 @@ export default function VerificationManagementPage() {
>
{tab.label}
- ))}
+ )}
- {([
+ (
+ ] as const}>{(tab) => (
setCategoryTab(tab.key)}
@@ -677,7 +677,7 @@ export default function VerificationManagementPage() {
>
{tab.label}
- ))}
+ )}
@@ -702,11 +702,11 @@ export default function VerificationManagementPage() {
- {([
+ (
+ ] as const}>{(item) => (
{ setSortBy(item.key); setSortOpen(false); }}
@@ -714,7 +714,7 @@ export default function VerificationManagementPage() {
>
{item.label}
- ))}
+ )}
@@ -730,7 +730,7 @@ export default function VerificationManagementPage() {
- {([
+ (
+ ] as const}>{(item) => (
{ setStatusFilter(item.key); setFilterOpen(false); }}
@@ -746,7 +746,7 @@ export default function VerificationManagementPage() {
>
{item.label}
- ))}
+ )}
@@ -765,9 +765,9 @@ export default function VerificationManagementPage() {
- {['Submission ID', 'Type', 'Applicant Name', 'Role', 'Submitted On', 'Status', 'Priority', 'Actions'].map((header) => (
+ {(header) => (
{header}
- ))}
+ )}
@@ -933,9 +933,9 @@ export default function VerificationManagementPage() {
- {['Document', 'State', 'View', 'Request'].map((header) => (
+ {(header) => (
{header}
- ))}
+ )}
diff --git a/src/routes/admin/workspace/[menuId].tsx b/src/routes/admin/workspace/[menuId].tsx
deleted file mode 100644
index 14c26c5..0000000
--- a/src/routes/admin/workspace/[menuId].tsx
+++ /dev/null
@@ -1,13 +0,0 @@
-import { onMount } from 'solid-js';
-import { useNavigate, useParams } from '@solidjs/router';
-
-export default function WorkspaceMenuAliasPage() {
- const navigate = useNavigate();
- const params = useParams();
- onMount(() => navigate('/admin', { replace: true }));
- return (
-
-
Redirecting workspace menu {params.menuId} to dashboard...
-