diff --git a/src/app/[orgId]/settings/resources/page.tsx b/src/app/[orgId]/settings/resources/page.tsx index f4ba9d16..eadb19d4 100644 --- a/src/app/[orgId]/settings/resources/page.tsx +++ b/src/app/[orgId]/settings/resources/page.tsx @@ -43,7 +43,7 @@ export default async function ResourcesPage(props: ResourcesPageProps) { await authCookieHeader() ); resources = res.data.data.resources; - } catch (e) {} + } catch (e) { } let siteResources: ListAllSiteResourcesByOrgResponse["siteResources"] = []; try { @@ -51,7 +51,7 @@ export default async function ResourcesPage(props: ResourcesPageProps) { AxiosResponse >(`/org/${params.orgId}/site-resources`, await authCookieHeader()); siteResources = res.data.data.siteResources; - } catch (e) {} + } catch (e) { } let org = null; try { @@ -88,8 +88,8 @@ export default async function ResourcesPage(props: ResourcesPageProps) { resource.passwordId !== null || resource.whitelist || resource.headerAuthId - ? "protected" - : "not_protected", + ? "protected" + : "not_protected", enabled: resource.enabled, domainId: resource.domainId || undefined, ssl: resource.ssl @@ -128,6 +128,10 @@ export default async function ResourcesPage(props: ResourcesPageProps) { defaultView={ env.flags.enableClients ? defaultView : "proxy" } + defaultSort={{ + id: "name", + desc: false + }} /> diff --git a/src/components/ResourcesTable.tsx b/src/components/ResourcesTable.tsx index ad8b4fab..c9fb9c04 100644 --- a/src/components/ResourcesTable.tsx +++ b/src/components/ResourcesTable.tsx @@ -100,6 +100,10 @@ type ResourcesTableProps = { internalResources: InternalResourceRow[]; orgId: string; defaultView?: "proxy" | "internal"; + defaultSort?: { + id: string; + desc: boolean; + }; }; @@ -143,7 +147,8 @@ export default function ResourcesTable({ resources, internalResources, orgId, - defaultView = "proxy" + defaultView = "proxy", + defaultSort }: ResourcesTableProps) { const router = useRouter(); const searchParams = useSearchParams(); @@ -171,12 +176,16 @@ export default function ResourcesTable({ const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false); const [sites, setSites] = useState([]); - const [proxySorting, setProxySorting] = useState([]); + const [proxySorting, setProxySorting] = useState( + defaultSort ? [defaultSort] : [] + ); const [proxyColumnFilters, setProxyColumnFilters] = useState([]); const [proxyGlobalFilter, setProxyGlobalFilter] = useState([]); - const [internalSorting, setInternalSorting] = useState([]); + const [internalSorting, setInternalSorting] = useState( + defaultSort ? [defaultSort] : [] + ); const [internalColumnFilters, setInternalColumnFilters] = useState([]); const [internalGlobalFilter, setInternalGlobalFilter] = useState([]);