diff --git a/ui/src/pages/certificates/CertificateList.tsx b/ui/src/pages/certificates/CertificateList.tsx index 10e8d509..3425f3d8 100644 --- a/ui/src/pages/certificates/CertificateList.tsx +++ b/ui/src/pages/certificates/CertificateList.tsx @@ -238,7 +238,7 @@ const CertificateList = () => { () => { const { columnKey: sorterKey, order: sorterOrder } = sorter; let sort: string | undefined; - sort = sorterKey === "validity" ? "validityNotAfter" : ""; + sort = sorterKey === "validity" ? "validityNotAfter" : void 0; sort = sort && (sorterOrder === "ascend" ? `${sort}` : sorterOrder === "descend" ? `-${sort}` : void 0); return listCertificates({ diff --git a/ui/src/pages/workflows/WorkflowList.tsx b/ui/src/pages/workflows/WorkflowList.tsx index c8a4f82b..ec19e841 100644 --- a/ui/src/pages/workflows/WorkflowList.tsx +++ b/ui/src/pages/workflows/WorkflowList.tsx @@ -235,7 +235,7 @@ const WorkflowList = () => { () => { const { columnKey: sorterKey, order: sorterOrder } = sorter; let sort: string | undefined; - sort = sorterKey === "lastRun" ? "lastRunTime" : ""; + sort = sorterKey === "lastRun" ? "lastRunTime" : void 0; sort = sort && (sorterOrder === "ascend" ? `${sort}` : sorterOrder === "descend" ? `-${sort}` : void 0); return listWorkflows({ diff --git a/ui/src/repository/certificate.ts b/ui/src/repository/certificate.ts index 9c0b4708..a355b8b3 100644 --- a/ui/src/repository/certificate.ts +++ b/ui/src/repository/certificate.ts @@ -55,7 +55,7 @@ export const list = async ({ expand: ["workflowRef"].join(","), fields: [..._commonFields, ..._expandFields].join(","), filter: filters.join(" && "), - sort: sort, + sort: sort || "-created", requestKey: null, }); }; diff --git a/ui/src/repository/workflow.ts b/ui/src/repository/workflow.ts index 947928ac..87bf101b 100644 --- a/ui/src/repository/workflow.ts +++ b/ui/src/repository/workflow.ts @@ -57,7 +57,7 @@ export const list = async ({ expand: expand ? ["lastRunRef"].join(",") : void 0, fields: [..._commonFields, ..._expandFields].join(","), filter: filters.join(" && "), - sort: sort, + sort: sort || "-created", requestKey: null, }); };