Merge branch 'dev' into feature/tenant-user-list-ui-improvement

adminfront/src/features/tenants/routes/TenantListPage.tsx

@@ -29,10 +29,19 @@ import {
 import * as React from "react";
 import { Link, useNavigate } from "react-router-dom";
 import {
-  type SortConfig,
-  type SortResolverMap,
+  SortableTableHead,
+  sortableTableHeadBaseClassName,
+  sortableTableHeaderClassName,
+} from "../../../../../common/core/components/sort";
+import {
+  commonTableShellClass,
+  commonTableViewportClass,
+} from "../../../../../common/ui/table";
+import {
   sortItems,
   toggleSort,
+  type SortConfig,
+  type SortResolverMap,
 } from "../../../../../common/core/utils";
 import { RoleGuard } from "../../../components/auth/RoleGuard";
 import { Badge } from "../../../components/ui/badge";
@@ -257,7 +266,10 @@ function TenantListPage() {
   const [selectedIds, setSelectedIds] = React.useState<string[]>([]);
   const [search, setSearch] = React.useState("");
   const [sortConfig, setSortConfig] =
-    React.useState<SortConfig<TenantSortKey> | null>(null);
+    React.useState<SortConfig<TenantSortKey> | null>({
+      key: "createdAt",
+      direction: "desc",
+    });
   const fileInputRef = React.useRef<HTMLInputElement | null>(null);
   const [importMessage, setImportMessage] = React.useState("");
   const [previewRows, setPreviewRows] = React.useState<
@@ -444,9 +456,8 @@ function TenantListPage() {
   }
 
   if (
-    profile &&
     profileRole === "tenant_admin" &&
-    (profile.manageableTenants?.length ?? 0) <= 1
+    (profile?.manageableTenants?.length ?? 0) <= 1
   ) {
     return null;
   }
@@ -487,17 +498,6 @@ function TenantListPage() {
     setSortConfig((current) => toggleSort(current, key));
   };
 
-  const getSortIcon = (key: TenantSortKey) => {
-    if (!sortConfig || sortConfig.key !== key) {
-      return <ArrowUpDown size={14} className="ml-1 opacity-50" />;
-    }
-    return sortConfig.direction === "asc" ? (
-      <ArrowUp size={14} className="ml-1" />
-    ) : (
-      <ArrowDown size={14} className="ml-1" />
-    );
-  };
-
   const deletableTenants = React.useMemo(
     () => allTenants.filter((tenant) => !isSeedTenant(tenant)),
     [allTenants],