Merge branch 'main' into PRWLR-4393-Setup-NextAuth-client-session

components/ui/sidebar/SidebarItems.tsx

@@ -126,12 +126,6 @@ export const sectionItems: SidebarItem[] = [
       //     />
       //   ),
       // },
-      {
-        key: "services",
-        href: "/services",
-        icon: "material-symbols:linked-services-outline",
-        title: "Services",
-      },
       {
         key: "compliance",
         href: "/compliance",
@@ -143,6 +137,24 @@ export const sectionItems: SidebarItem[] = [
           </Chip>
         ),
       },
+      {
+        key: "services",
+        href: "/services",
+        icon: "material-symbols:linked-services-outline",
+        title: "Services",
+      },
+      {
+        key: "categories",
+        href: "/categories",
+        icon: "material-symbols:folder-open-outline",
+        title: "Categories",
+      },
+      {
+        key: "workloads",
+        href: "/workloads",
+        icon: "lucide:tags",
+        title: "Workloads",
+      },
     ],
   },
   {
@@ -190,10 +202,10 @@ export const sectionItems: SidebarItem[] = [
         ),
       },
       {
-        key: "integration",
-        href: "/integration",
+        key: "integrations",
+        href: "/integrations",
         icon: "tabler:puzzle",
-        title: "Integration",
+        title: "Integrations",
       },
       {
         key: "settings",
@@ -213,9 +225,9 @@ export const sectionItemsWithTeams: SidebarItem[] = [
     items: [
       {
         key: "users",
-        href: "#",
+        href: "/users",
         title: "Users",
-        startContent: <TeamAvatar name="Users page" />,
+        icon: "ci:users",
       },
       {
         key: "roles",

components/ui/table/StatusBadge.tsx

@@ -7,7 +7,9 @@ type Status =
   | "cancelled"
   | "fail"
   | "success"
-  | "muted";
+  | "muted"
+  | "active"
+  | "inactive";
 
 const statusColorMap: Record<
   Status,
@@ -19,6 +21,8 @@ const statusColorMap: Record<
   fail: "danger",
   success: "success",
   muted: "default",
+  active: "success",
+  inactive: "default",
 };
 
 export const StatusBadge = ({ status }: { status: Status }) => {