Fix OAuth clients table sorting.

phac-nml · Jul 18, 2022 · 3a18305 · 3a18305
1 parent 66ca161
commit 3a18305
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,7 @@
 * [Developer]: Replaced Maven with Gradle for build. See [PR 1300](https://github.com/phac-nml/irida/pull/1300)
 * [Developer/UI]: Switched to pnpm from yarn for frontend dependency management. See [PR 1332](https://github.com/phac-nml/irida/pull/1334)
 * [Developer]: Switched custom exception handling to use built in Spring Boot exception handling. See [PR 1319](https://github.com/phac-nml/irida/pull/1319)
+* [UI]: Fixed issue with sorting OAuth clients table in admin panel. See [PR 1342](https://github.com/phac-nml/irida/pull/1342)
 
 ## [22.05.5] - 2022/06/28
 * [UI]: Fixed bug preventing export of project samples table due to invalid url. [PR 1331](https://github.com/phac-nml/irida/pull/1331)
@@ -123,4 +124,4 @@
 [22.01.3]: https://github.com/phac-nml/irida/compare/22.01.2...22.01.3
 [22.01.2]: https://github.com/phac-nml/irida/compare/22.01.1...22.01.2
 [22.01.1]: https://github.com/phac-nml/irida/compare/22.01...22.01.1
-[22.01]: https://github.com/phac-nml/irida/compare/21.09.2...22.01
+[22.01]: https://github.com/phac-nml/irida/compare/21.09.2...22.01
diff --git a/.../java/ca/corefacility/bioinformatics/irida/ria/web/ajax/dto/clients/ClientTableModel.java b/.../java/ca/corefacility/bioinformatics/irida/ria/web/ajax/dto/clients/ClientTableModel.java
@@ -20,6 +20,10 @@ public IridaClientDetails getDetails() {
 		return details;
 	}
 
+	public String getClientId() {
+		return details.getClientId();
+	}
+
 	public int getTokens() {
 		return tokens;
 	}

diff --git a/src/main/webapp/resources/js/pages/admin/components/clients/listing/ClientsTables.jsx b/src/main/webapp/resources/js/pages/admin/components/clients/listing/ClientsTables.jsx
@@ -44,12 +44,12 @@ export function ClientsTable() {
     {
       title: i18n("ClientsTable.column.id"),
       width: 80,
-      dataIndex: ["details", "identifier"],
+      dataIndex: "id",
       sorter: true,
     },
     {
       title: i18n("ClientsTable.column.clientId"),
-      dataIndex: ["details", "clientId"],
+      dataIndex: "clientId",
       ellipsis: true,
       sorter: true,
       render(name) {
@@ -86,7 +86,7 @@ export function ClientsTable() {
     {
       ...dateColumnFormat(),
       title: i18n("ClientsTable.column.created"),
-      dataIndex: ["details", "createdDate"],
+      dataIndex: "createdDate",
     },
     {
       title: i18n("ClientsTable.column.grants"),