= any>({
{columns.map(col => {
const align = col.align || "center";
+ const colKey = col.id || col.key;
return (
diff --git a/src/components/customs/PermissionGuard.tsx b/src/components/customs/PermissionGuard.tsx
new file mode 100644
index 0000000..a83851d
--- /dev/null
+++ b/src/components/customs/PermissionGuard.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import type { RootState } from '../../store';
+import { hasPermission } from '../../utils/permissionUtils';
+import type { PermissionNodes, PermissionAction } from '../../types/auth.types';
+
+interface PermissionGuardProps {
+ node: PermissionNodes | string;
+ action?: PermissionAction;
+ children: React.ReactNode;
+ fallback?: React.ReactNode;
+}
+
+export const PermissionGuard: React.FC = ({
+ node,
+ action = 'view',
+ children,
+ fallback = null
+}) => {
+ const permissions = useSelector((state: RootState) => state.auth.permissions);
+ const user = useSelector((state: RootState) => state.auth.user);
+
+ const allowed = hasPermission(permissions, node, action, user);
+
+ if (!allowed) {
+ return <>{fallback};
+ }
+
+ return <>{children};
+};
diff --git a/src/components/customs/Select.tsx b/src/components/customs/Select.tsx
index 8c6883e..8c02f5b 100644
--- a/src/components/customs/Select.tsx
+++ b/src/components/customs/Select.tsx
@@ -101,6 +101,7 @@ export function Select({
+
+ } onClick={() => navigate("/families/new")}>
+ Create Family
+
+
}
/>
diff --git a/src/features/platform/pages/PlatformOverview.tsx b/src/features/platform/pages/PlatformOverview.tsx
new file mode 100644
index 0000000..048085e
--- /dev/null
+++ b/src/features/platform/pages/PlatformOverview.tsx
@@ -0,0 +1,211 @@
+import { useEffect, useState } from "react";
+import { Building2, Users, Package, Image, ShieldCheck, Activity, UserCheck, Play, StopCircle } from "lucide-react";
+import { useNavigate } from "react-router-dom";
+import { PageWrapper } from "../../../components/layouts/PageWrapper";
+import { Breadcrumb } from "../../../components/layouts/Breadcrumb";
+import { Button } from "../../../components/customs/Button";
+import { tenantService } from "../../tenants/services/tenant.service";
+import { useTenant } from "../../tenants/hooks/useTenant";
+import { notify } from "../../../services/toast";
+
+export default function PlatformOverview() {
+ const navigate = useNavigate();
+ const { impersonateTenant, stopImpersonation } = useTenant();
+ const [metrics, setMetrics] = useState(null);
+ const [tenants, setTenants] = useState([]);
+ const [loading, setLoading] = useState(true);
+ const [impersonatingTenantId, setImpersonatingTenantId] = useState(
+ localStorage.getItem("impersonatedTenantId")
+ );
+
+ const loadData = async () => {
+ try {
+ setLoading(true);
+ const [metricRes, tenantRes] = await Promise.all([
+ tenantService.getPlatformMetrics(),
+ tenantService.getPlatformTenants()
+ ]);
+ setMetrics(metricRes);
+ setTenants(tenantRes);
+ } catch (err) {
+ notify.error("Failed to load platform dashboard data");
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ useEffect(() => {
+ loadData();
+ }, []);
+
+ const handleStartImpersonate = async (tenantId: string) => {
+ try {
+ await impersonateTenant(tenantId);
+ setImpersonatingTenantId(tenantId);
+ navigate("/products");
+ } catch (err) {
+ // Handled in hook
+ }
+ };
+
+ const handleStopImpersonate = () => {
+ stopImpersonation();
+ setImpersonatingTenantId(null);
+ };
+
+ return (
+
+ }
+ onClick={() => navigate("/platform/tenants")}
+ >
+ Provision New Tenant
+
+ }
+ />
+
+ {/* Support Impersonation Banner */}
+ {impersonatingTenantId && (
+
+
+
+
+
+
+ Support Impersonation Mode Active
+
+ Currently troubleshooting Tenant ID: {impersonatingTenantId}. Requests are safely scoped to this tenant context.
+
+
+
+ }
+ onClick={handleStopImpersonate}
+ >
+ End Support Mode
+
+
+
+
+
+
+
+ Total SaaS Tenants
+ {loading ? "..." : metrics?.tenants?.total || 0}
+ {metrics?.tenants?.active || 0} Active
+
+
+
+
+
+
+
+
+ Platform Accounts
+ {loading ? "..." : metrics?.users?.total || 0}
+ Across all tenants
+
+
+
+
+
+
+ Total Products
+ {loading ? "..." : metrics?.data?.total_products || 0}
+ Catalog items
+
+
+
+
+
+
+
+
+ Cloudinary DAM Assets
+ {loading ? "..." : metrics?.data?.total_assets || 0}
+ Images & Raw Docs
+
+
+
+
+
+
+ Tenant Provisioning Registry
+
+
+
+
+
+
+
+
+ | Tenant Code |
+ Organization Name |
+ Contact Email |
+ Products |
+ Assets |
+ Status |
+ Support Action |
+
+
+
+ {loading ? (
+
+ | Loading SaaS platform tenants... |
+
+ ) : tenants.length === 0 ? (
+
+ | No tenants provisioned yet. |
+
+ ) : (
+ tenants.map((t) => (
+
+ | {t.tenant_code} |
+ {t.tenant_name} |
+ {t.contact_email || "N/A"} |
+ {t.total_products || 0} |
+ {t.total_assets || 0} |
+
+
+ {t.status ? "Active" : "Suspended"}
+
+ |
+
+ {String(t.id) === String(impersonatingTenantId) ? (
+ Active Session
+ ) : (
+
+ )}
+ |
+
+ ))
+ )}
+
+
+
+
+
+
+ setSearchTerm(e.target.value)}
+ className="w-full pl-9 pr-4 py-2 border border-border rounded-lg text-sm bg-surface focus:outline-none focus:ring-2 focus:ring-primary"
+ />
+
+
+
+
+
+
+ | Tenant Code |
+ Organization |
+ Domain |
+ Contact Email |
+ Products |
+ Assets |
+ Status |
+ Actions |
+
+
+
+ {loading ? (
+
+ | Loading tenants... |
+
+ ) : filteredTenants.length === 0 ? (
+
+ | No matching tenants found. |
+
+ ) : (
+ filteredTenants.map((t: any) => (
+
+ | {t.tenant_code} |
+ {t.tenant_name} |
+ {t.domain || "N/A"} |
+ {t.contact_email} |
+ {t.total_products || 0} |
+ {t.total_assets || 0} |
+
+
+ {t.status ? "Active" : "Suspended"}
+
+ |
+
+
+
+ {String(t.id) === String(impersonatingTenantId) ? (
+
+ ) : (
+
+ )}
+ |
+
+ ))
+ )}
+
+
+
+
+
+
+
+ Provision New Tenant Account
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Tenant Provisioned!
+ Share these setup credentials with your client
+
+
+
+
+
+ Organization:
+ {provisionedSuccessData.tenant?.tenant_name}
+
+
+ Tenant Code:
+ {provisionedSuccessData.tenant?.tenant_code}
+
+
+ Admin Email:
+ {provisionedSuccessData.admin?.email || provisionedSuccessData.tenant?.contact_email}
+
+
+ Admin Password:
+ {provisionedSuccessData.rawPassword || '••••••••'}
+
+
+
+
+
+
+
+
+ {formik.errors.role_name}
)}
-
-
-
- Leave empty for a global platform role.
-
+
+
+ Leave empty for a global platform role.
+
diff --git a/src/features/roles/routes/role.routes.tsx b/src/features/roles/routes/role.routes.tsx
index 6c0a7db..faa6a01 100644
--- a/src/features/roles/routes/role.routes.tsx
+++ b/src/features/roles/routes/role.routes.tsx
@@ -1,13 +1,16 @@
import { Routes, Route } from 'react-router-dom';
import RoleList from '../pages/RoleList';
import NewRoleForm from '../pages/NewRoleForm';
+import { ProtectedRoute } from '../../../components/layouts/ProtectedRoute';
export const RoleRoutes = () => {
return (
-
- } />
- } />
- } />
-
+
+
+ } />
+ } />
+ } />
+
+
);
};
diff --git a/src/features/settings/pages/SettingList.tsx b/src/features/settings/pages/SettingList.tsx
index 16100f1..042319d 100644
--- a/src/features/settings/pages/SettingList.tsx
+++ b/src/features/settings/pages/SettingList.tsx
@@ -1,6 +1,8 @@
-import { useState, useEffect } from "react";
-import { User, Bell, Shield, Plug, Key, Palette, Globe, Database, MessageSquare, Webhook, Box, ChevronRight } from "lucide-react";
+import { useState, useEffect, useEffect } from "react";
+import { User, Bell, Shield, Plug, Key, Palette, Globe, Database, MessageSquare, Webhook, Box, ChevronRight, Save } from "lucide-react";
import { useNavigate } from "react-router-dom";
+import { useSelector } from "react-redux";
+import type { RootState } from "../../../store";
import { PageWrapper } from "../../../components/layouts/PageWrapper";
import { Button } from "../../../components/customs/Button";
import { Breadcrumb } from "../../../components/layouts/Breadcrumb";
@@ -8,12 +10,18 @@ import { Radio } from "../../../components/customs/Radio";
import { usePermissions } from "../../../hooks/usePermission";
import { fileServerService, type FileServerConfig } from "../services/fileServer.service";
+import { settingsService } from "../services/settings.service";
+import { notify } from "../../../services/toast";
+import { ProtectedRoute } from "../../../components/layouts/ProtectedRoute";
+import { Can } from "../../../components/customs/Can";
export default function SettingList() {
const navigate = useNavigate();
const { canView: canViewFileServer } = usePermissions('settings.file_server');
- const [activeTab, setActiveTab] = useState("Integrations");
+ const user = useSelector((state: RootState) => state.auth.user);
+
+ const [activeTab, setActiveTab] = useState("General");
const [requireApproval, setRequireApproval] = useState(true);
const [autoPublish, setAutoPublish] = useState(false);
@@ -79,6 +87,55 @@ export default function SettingList() {
setSaveStatus({ type: 'error', message: err.response?.data?.message || err.message || 'Failed to save settings.' });
}
};
+ const [saving, setSaving] = useState(false);
+
+ const [orgName, setOrgName] = useState(user?.tenant?.name || "Organization");
+ const [subdomain, setSubdomain] = useState(user?.tenant?.tenant_code || user?.tenant?.domain || "org");
+
+ useEffect(() => {
+ if (user?.tenant?.name) {
+ setOrgName(user.tenant.name);
+ }
+ if (user?.tenant?.tenant_code || user?.tenant?.domain) {
+ setSubdomain(user.tenant.tenant_code || user.tenant.domain || "");
+ }
+ }, [user]);
+
+ // Load category settings from API when tab changes
+ useEffect(() => {
+ const loadSettings = async () => {
+ try {
+ const cat = activeTab.toLowerCase();
+ const data = await settingsService.getCategorySettings(cat);
+ if (data) {
+ if (data.orgName) setOrgName(data.orgName);
+ if (data.subdomain) setSubdomain(data.subdomain);
+ if (data.requireApproval !== undefined) setRequireApproval(data.requireApproval);
+ if (data.autoPublish !== undefined) setAutoPublish(data.autoPublish);
+ }
+ } catch (err) {
+ // Silently fallback to defaults
+ }
+ };
+ loadSettings();
+ }, [activeTab]);
+
+ const handleSaveGeneral = async () => {
+ setSaving(true);
+ try {
+ await settingsService.updateCategorySettings("general", {
+ orgName,
+ subdomain,
+ requireApproval,
+ autoPublish
+ });
+ notify.success("General settings saved successfully!");
+ } catch (err: any) {
+ notify.error(err?.message || "Failed to save settings");
+ } finally {
+ setSaving(false);
+ }
+ };
const horizontalTabs = [
{ id: "General", icon: User },
@@ -92,8 +149,9 @@ export default function SettingList() {
return (
-
-
+
+
+
{/* Horizontal Tabs Header */}
@@ -133,12 +191,22 @@ export default function SettingList() {
-
-
+
+
+
+
+
);
}
diff --git a/src/features/settings/services/settings.service.ts b/src/features/settings/services/settings.service.ts
index deb645d..09c0d76 100644
--- a/src/features/settings/services/settings.service.ts
+++ b/src/features/settings/services/settings.service.ts
@@ -1,55 +1,12 @@
-import type { Setting, SettingCreateRequest, SettingUpdateRequest } from '../types/settings.types';
-
-const STORAGE_KEY = 'pim_settings';
-
-const getStored = (): Setting[] => {
- const stored = localStorage.getItem(STORAGE_KEY);
- if (!stored) return [];
- return JSON.parse(stored);
-};
-
-const setStored = (items: Setting[]) => {
- localStorage.setItem(STORAGE_KEY, JSON.stringify(items));
-};
+import axiosInstance from '../../../api/axiosInstance';
export const settingsService = {
- getAll: async (): Promise => {
- return new Promise((resolve) => setTimeout(() => resolve(getStored()), 300));
- },
- getById: async (id: string): Promise => {
- return new Promise((resolve) => setTimeout(() => resolve(getStored().find(p => p.id === id)), 200));
- },
- create: async (req: SettingCreateRequest): Promise => {
- return new Promise((resolve) => {
- setTimeout(() => {
- const list = getStored();
- const newItem: Setting = { ...req, id: String(Date.now()), createdAt: new Date().toISOString() };
- list.push(newItem);
- setStored(list);
- resolve(newItem);
- }, 300);
- });
- },
- update: async (id: string, req: SettingUpdateRequest): Promise => {
- return new Promise((resolve, reject) => {
- setTimeout(() => {
- const list = getStored();
- const index = list.findIndex(p => p.id === id);
- if (index === -1) { reject(new Error('Not found')); return; }
- const updated = { ...list[index], ...req };
- list[index] = updated;
- setStored(list);
- resolve(updated);
- }, 300);
- });
- },
- delete: async (id: string): Promise => {
- return new Promise((resolve) => {
- setTimeout(() => {
- const list = getStored().filter(p => p.id !== id);
- setStored(list);
- resolve(true);
- }, 300);
- });
+ getCategorySettings: async (category: string) => {
+ const response = await axiosInstance.get(`/settings/by-category/${category}`);
+ return response.data.data;
},
+ updateCategorySettings: async (category: string, data: Record) => {
+ const response = await axiosInstance.put(`/settings/by-category/${category}`, data);
+ return response.data;
+ }
};
diff --git a/src/features/tenants/hooks/useTenant.ts b/src/features/tenants/hooks/useTenant.ts
index 84f48c3..fa472cb 100644
--- a/src/features/tenants/hooks/useTenant.ts
+++ b/src/features/tenants/hooks/useTenant.ts
@@ -70,14 +70,80 @@ export function useTenant() {
}
};
+ const fetchPlatformTenants = useCallback(async () => {
+ try {
+ setLoading(true);
+ setError(null);
+ const data = await tenantService.getPlatformTenants();
+ setTenants(data);
+ return data;
+ } catch (err) {
+ setError(err instanceof Error ? err.message : 'Failed to fetch platform tenants');
+ notify.error(err);
+ } finally {
+ setLoading(false);
+ }
+ }, []);
+
+ const provisionTenant = async (data: any) => {
+ try {
+ setLoading(true);
+ const result = await tenantService.provisionTenant(data);
+ notify.success('Tenant provisioned successfully with Admin credentials');
+ return result;
+ } catch (err) {
+ notify.error(err);
+ throw err;
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const updatePlatformStatus = async (id: string, status: boolean) => {
+ try {
+ setLoading(true);
+ const updated = await tenantService.updatePlatformStatus(id, status);
+ setTenants(prev => prev.map(t => t.id === id ? { ...t, status: updated.status } : t));
+ notify.success(`Tenant status updated to ${updated.status ? 'Active' : 'Suspended'}`);
+ return updated;
+ } catch (err) {
+ notify.error(err);
+ throw err;
+ } finally {
+ setLoading(false);
+ }
+ };
+
+ const impersonateTenant = async (tenantId: string) => {
+ try {
+ const result = await tenantService.impersonateTenant(tenantId);
+ localStorage.setItem('impersonatedTenantId', tenantId);
+ notify.success(result.message || 'Support impersonation active');
+ return result;
+ } catch (err) {
+ notify.error(err);
+ throw err;
+ }
+ };
+
+ const stopImpersonation = () => {
+ localStorage.removeItem('impersonatedTenantId');
+ notify.info('Support impersonation ended');
+ };
+
return {
tenants,
loading,
error,
fetchTenants,
+ fetchPlatformTenants,
getTenant,
createTenant,
+ provisionTenant,
updateTenant,
- deleteTenant
+ updatePlatformStatus,
+ deleteTenant,
+ impersonateTenant,
+ stopImpersonation
};
}
diff --git a/src/features/tenants/services/tenant.service.ts b/src/features/tenants/services/tenant.service.ts
index a0a4a63..f29e5e7 100644
--- a/src/features/tenants/services/tenant.service.ts
+++ b/src/features/tenants/services/tenant.service.ts
@@ -25,5 +25,31 @@ export const tenantService = {
delete: async (id: string) => {
const response = await api.delete(`/api/v1/tenants/${id}`);
return (response as any).data;
+ },
+
+ // Platform Admin Endpoints
+ getPlatformTenants: async () => {
+ const response = await api.get('/api/v1/platform/tenants');
+ return (response as any).data;
+ },
+
+ provisionTenant: async (data: any) => {
+ const response = await api.post('/api/v1/platform/tenants', data);
+ return (response as any).data;
+ },
+
+ updatePlatformStatus: async (id: string, status: boolean) => {
+ const response = await api.patch(`/api/v1/platform/tenants/${id}/status`, { status });
+ return (response as any).data;
+ },
+
+ getPlatformMetrics: async () => {
+ const response = await api.get('/api/v1/platform/metrics');
+ return (response as any).data;
+ },
+
+ impersonateTenant: async (tenantId: string) => {
+ const response = await api.post(`/api/v1/platform/impersonate/${tenantId}`);
+ return (response as any).data;
}
};
diff --git a/src/features/tenants/types/tenant.types.ts b/src/features/tenants/types/tenant.types.ts
index a8d2da2..ae6a832 100644
--- a/src/features/tenants/types/tenant.types.ts
+++ b/src/features/tenants/types/tenant.types.ts
@@ -25,3 +25,18 @@ export interface UpdateTenantDTO {
mobile?: string;
status?: boolean;
}
+
+export interface PlatformTenant extends Tenant {
+ total_products?: number;
+ total_assets?: number;
+ total_users?: number;
+}
+
+export interface ProvisionTenantDTO {
+ tenant_name: string;
+ domain?: string;
+ contact_email: string;
+ admin_name?: string;
+ admin_email?: string;
+ admin_password?: string;
+}
diff --git a/src/features/units/components/UnitTable.tsx b/src/features/units/components/UnitTable.tsx
index fdace20..0386486 100644
--- a/src/features/units/components/UnitTable.tsx
+++ b/src/features/units/components/UnitTable.tsx
@@ -27,7 +27,7 @@ export const UnitTable: React.FC = ({
key: "conversionFactor",
label: "CONVERSION",
render: (value: any, row: Unit) =>
- value !== undefined ? `${value} ${row.baseUnit || ''}` : "—"
+ (value !== undefined && value !== null && value !== '') ? `${value} ${row.baseUnit || ''}`.trim() : "—"
},
{
key: "status",
diff --git a/src/features/users/pages/UserList.tsx b/src/features/users/pages/UserList.tsx
index 2532d2d..e24c88b 100644
--- a/src/features/users/pages/UserList.tsx
+++ b/src/features/users/pages/UserList.tsx
@@ -14,6 +14,8 @@ import { tenantService } from "../../tenants/services/tenant.service";
import { notify } from "../../../services/toast";
import type { DBRole, PermissionNode } from "../services/roles.service";
import type { Tenant } from "../../tenants/types/tenant.types";
+import { ProtectedRoute } from "../../../components/layouts/ProtectedRoute";
+import { Can } from "../../../components/customs/Can";
export default function UserList() {
const navigate = useNavigate();
@@ -79,21 +81,18 @@ export default function UserList() {
const [newRoleStatus, setNewRoleStatus] = useState(true);
const isSuperAdminUser = (user: any) => {
- if (!user) return false;
- if (user.email === 'admin@admin.com') return true;
- const userRoles = user.roles || [];
+ if (user?.user_type === 'platform' || user?.type === 'platform') return true;
+ const userRoles = user?.roles || [];
return userRoles.some((r: any) =>
r.role_code === 'SUPER_ADMIN' ||
r.role_code === 'SUPERADMIN' ||
- r.role_name?.toLowerCase().includes('super admin') ||
- r.is_system_role
+ r.role_name?.toLowerCase().includes('super admin')
);
};
const isSuperAdminRole = (role: any) => {
if (!role) return false;
return Boolean(
- role.is_system_role ||
role.role_code === 'SUPER_ADMIN' ||
role.role_code === 'SUPERADMIN' ||
role.role_name?.toLowerCase().includes('super admin')
@@ -378,16 +377,19 @@ export default function UserList() {
];
return (
-
- navigate("new")} className="bg-primary hover:bg-primary-hover text-white">
-
- Invite Member
-
- }
- />
+
+
+
+
+
+ }
+ />
{/* KPI Cards */}
@@ -907,6 +909,7 @@ export default function UserList() {
)}
-
+
+
);
}
diff --git a/src/hooks/usePermission.ts b/src/hooks/usePermission.ts
index ee128cf..3c991fb 100644
--- a/src/hooks/usePermission.ts
+++ b/src/hooks/usePermission.ts
@@ -8,16 +8,17 @@ import { hasPermission } from '../utils/permissionUtils';
* Usage: const { canView, canCreate } = usePermissions('products.items');
*/
export const usePermissions = (nodeCode: PermissionNodes | string) => {
- // Extract permissions from the Redux store
+ // Extract permissions and user from the Redux store
const permissions = useSelector((state: RootState) => state.auth.permissions);
+ const user = useSelector((state: RootState) => state.auth.user);
return {
- canView: hasPermission(permissions, nodeCode, 'view'),
- canCreate: hasPermission(permissions, nodeCode, 'create'),
- canEdit: hasPermission(permissions, nodeCode, 'edit'),
- canDelete: hasPermission(permissions, nodeCode, 'delete'),
- canAlter: hasPermission(permissions, nodeCode, 'alter'),
- canImport: hasPermission(permissions, nodeCode, 'import'),
- canExport: hasPermission(permissions, nodeCode, 'export'),
+ canView: hasPermission(permissions, nodeCode, 'view', user),
+ canCreate: hasPermission(permissions, nodeCode, 'create', user),
+ canEdit: hasPermission(permissions, nodeCode, 'edit', user),
+ canDelete: hasPermission(permissions, nodeCode, 'delete', user),
+ canAlter: hasPermission(permissions, nodeCode, 'alter', user),
+ canImport: hasPermission(permissions, nodeCode, 'import', user),
+ canExport: hasPermission(permissions, nodeCode, 'export', user),
};
};
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index 8e4e0c5..4b52913 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -18,7 +18,7 @@ export function getAssetUrl(url?: string): string {
return url;
}
const cleanUrl = url.startsWith('/') ? url : `/${url}`;
- const baseUrl = (import.meta as any).env?.VITE_API_BASE_URL || 'http://localhost:5000';
+ const baseUrl = (import.meta as any).env?.VITE_API_BASE_URL || (import.meta as any).env?.VITE_API_URL || 'http://localhost:5002';
return `${baseUrl}${cleanUrl}`;
}
diff --git a/src/routes/AppRoutes.tsx b/src/routes/AppRoutes.tsx
index 6b894d7..e078576 100644
--- a/src/routes/AppRoutes.tsx
+++ b/src/routes/AppRoutes.tsx
@@ -1,6 +1,7 @@
// src/routes/AppRoutes.tsx
import { Routes, Route, Navigate } from 'react-router-dom';
-import { AuthGuard } from '../authentication/components/ProtectedRoute';
+import { AuthGuard, PlatformGuard } from '../authentication/components/ProtectedRoute';
+import { ProtectedRoute } from '../components/layouts/ProtectedRoute';
import MainLayout from '../components/layouts/MainLayout';
import { Login, SignUp, ForgotPassword, ResetPassword, AcceptInvite } from '../authentication/routes';
@@ -31,6 +32,8 @@ import { SettingRoutes } from '../features/settings/routes/settings.routes';
import { TenantRoutes } from '../features/tenants/routes/tenant.routes';
import { RoleRoutes } from '../features/roles/routes/role.routes';
import { NotificationRoutes } from '../features/notifications/routes/notifications.routes';
+import PlatformOverview from '../features/platform/pages/PlatformOverview';
+import PlatformTenantsPage from '../features/platform/pages/PlatformTenantsPage';
const AppRoutes = () => {
return (
@@ -47,7 +50,12 @@ const AppRoutes = () => {
{/* Protected Routes with Layout */}
}>
- } />
+ {/* Platform Control Center (Platform Super Admins Only) */}
+ } />
+ } />
+ } />
+
+ } />
{/* Catalog */}
} />
@@ -75,8 +83,8 @@ const AppRoutes = () => {
{/* Users */}
} />
- } />
- } />
+ } />
+ } />
{/* Notifications */}
} />
diff --git a/src/routes/sidebar.config.ts b/src/routes/sidebar.config.ts
index 171e2c4..a5bd364 100644
--- a/src/routes/sidebar.config.ts
+++ b/src/routes/sidebar.config.ts
@@ -19,7 +19,10 @@ import {
Settings,
List,
Layers2,
- Bell
+ Bell,
+ ShieldCheck,
+ Activity,
+ Building2
} from 'lucide-react';
import React from 'react';
@@ -36,10 +39,21 @@ export interface SidebarItem {
href: string;
icon: React.ElementType;
permission?: string;
+ platformOnly?: boolean;
children?: SidebarSubItem[];
}
export const sidebarConfig: SidebarItem[] = [
+ {
+ label: 'Platform Control',
+ href: '/platform',
+ icon: ShieldCheck,
+ platformOnly: true,
+ children: [
+ { label: 'SaaS Overview & Metrics', href: '/platform/overview', icon: Activity },
+ { label: 'Tenant Provisioning', href: '/platform/tenants', icon: Building2 },
+ ]
+ },
{
label: 'Dashboard',
href: '/dashboard',
@@ -95,24 +109,27 @@ export const sidebarConfig: SidebarItem[] = [
label: 'Asset Management',
href: '/assets',
icon: Image,
+ permission: 'media.assets',
children: [
- { label: 'Asset Manager', href: '/assets', icon: Folder },
- { label: 'Asset Types', href: '/asset-types', icon: LayoutGrid },
- { label: 'Asset Families', href: '/asset-families', icon: Layers },
+ { label: 'Asset Manager', href: '/assets', icon: Folder, permission: 'media.assets' },
+ { label: 'Asset Types', href: '/asset-types', icon: LayoutGrid, permission: 'media.taxonomy' },
+ { label: 'Asset Families', href: '/asset-families', icon: Layers, permission: 'media.taxonomy' },
]
},
{
label: 'Workflow & Approvals',
href: '/workflow',
- icon: Workflow
+ icon: Workflow,
+ permission: 'products.items'
},
{
label: 'Channels & Integration',
href: '/channels',
icon: Radio,
+ permission: 'channels.syndication',
children: [
- { label: 'Channel Registry', href: '/channels', icon: Radio },
- { label: 'Channel Types', href: '/channel-types', icon: Layers2, permission: 'channels.types' },
+ { label: 'Channel Registry', href: '/channels', icon: Radio, permission: 'channels.syndication' },
+ { label: 'Channel Types', href: '/channel-types', icon: Layers2, permission: 'channels.syndication' },
{ label: 'Integration Hub', href: '/integrations', icon: Plug, permission: 'settings.integrations' },
]
},
@@ -122,7 +139,6 @@ export const sidebarConfig: SidebarItem[] = [
icon: Users,
children: [
{ label: 'Users', href: '/users', icon: Users, permission: 'settings.users' },
- { label: 'Tenants', href: '/users/tenants', icon: Database, permission: 'settings.tenants' },
{ label: 'Roles', href: '/users/roles', icon: Users, permission: 'settings.roles' }
]
},
diff --git a/src/services/socket.service.ts b/src/services/socket.service.ts
index 8fe57c4..dfebb15 100644
--- a/src/services/socket.service.ts
+++ b/src/services/socket.service.ts
@@ -1,6 +1,6 @@
import { io, Socket } from 'socket.io-client';
-const API_BASE_URL = 'http://localhost:5000';
+const API_BASE_URL = import.meta.env.VITE_API_URL || 'http://localhost:5002';
class SocketServiceClass {
private socket: Socket | null = null;
diff --git a/src/utils/permissionUtils.ts b/src/utils/permissionUtils.ts
index 54c7413..75a5159 100644
--- a/src/utils/permissionUtils.ts
+++ b/src/utils/permissionUtils.ts
@@ -12,8 +12,14 @@ import type { PermissionPayload, PermissionNodes, PermissionAction } from '../ty
export const hasPermission = (
permissions: PermissionPayload | undefined | null,
nodeCode: PermissionNodes | string,
- action: PermissionAction
+ action: PermissionAction,
+ user?: any
): boolean => {
+ // Platform superadmin or tenant admin role bypass
+ if (user?.user_type === 'platform' || user?.role_code === 'TENANT_ADMIN' || user?.roles?.some((r: any) => r.role_code === 'SUPER_ADMIN' || r.role_code === 'TENANT_ADMIN')) {
+ return true;
+ }
+
if (!permissions) return false;
// Superadmin wildcard check
diff --git a/vite.config.ts b/vite.config.ts
index f9cba25..bbf7277 100644
--- a/vite.config.ts
+++ b/vite.config.ts
@@ -7,7 +7,7 @@ export default defineConfig({
server: {
proxy: {
'/uploads': {
- target: 'http://localhost:5000',
+ target: 'http://localhost:5002',
changeOrigin: true,
},
},
|