Merge branch 'main' into RHOAIENG-13596_doc_links

opendatahub-io · Oct 1, 2024 · 5510ca3 · 5510ca3
2 parents 80c6181 + 9372a8a
commit 5510ca3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/frontend/.env b/frontend/.env
@@ -8,4 +8,4 @@ ODH_FAVICON=odh-favicon.svg
 ODH_NOTEBOOK_REPO=opendatahub
 
 ########## Change this version with each dashboard release ###########
-INTERNAL_DASHBOARD_VERSION=v2.26.0
+INTERNAL_DASHBOARD_VERSION=v2.27.0
diff --git a/frontend/src/pages/storageClasses/constants.ts b/frontend/src/pages/storageClasses/constants.ts
@@ -14,7 +14,16 @@ export const columns: SortableData<StorageClassKind>[] = [
   {
     field: 'displayName',
     label: ColumnLabel.DisplayName,
-    sortable: (a, b) => a.metadata.name.localeCompare(b.metadata.name),
+    sortable: (a: StorageClassKind, b: StorageClassKind): number => {
+      const configDisplayNameA = getStorageClassConfig(a)?.displayName;
+      const configDisplayNameB = getStorageClassConfig(b)?.displayName;
+
+      if (configDisplayNameA && configDisplayNameB) {
+        return configDisplayNameA.localeCompare(configDisplayNameB);
+      }
+
+      return -1;
+    },
     info: {
       popoverProps: { headerContent: 'Display name' },
       popover: