Templates alphabetically ordered in dashboard

Co-authored-by: Alessandro Cannarella <cannarella.dev@gmail.com>
netgroup-polito · Mar 17, 2022 · b285de1 · b285de1
1 parent 4bfa563
commit b285de1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/frontend/src/components/workspaces/Templates/TemplatesTableLogic/TemplatesTableLogic.tsx b/frontend/src/components/workspaces/Templates/TemplatesTableLogic/TemplatesTableLogic.tsx
@@ -93,15 +93,17 @@ const TemplatesTableLogic: FC<ITemplateTableLogicProps> = ({ ...props }) => {
     onError: apolloErrorCatcher,
     onCompleted: data =>
       setDataTemplate(
-        data.templateList?.templates?.map(t =>
-          makeGuiTemplate({
-            original: t ?? {},
-            alias: {
-              id: t?.metadata?.name ?? '',
-              name: t?.spec?.prettyName ?? '',
-            },
-          })
-        ) ?? []
+        data.templateList?.templates
+          ?.map(t =>
+            makeGuiTemplate({
+              original: t ?? {},
+              alias: {
+                id: t?.metadata?.name ?? '',
+                name: t?.spec?.prettyName ?? '',
+              },
+            })
+          )
+          .sort((a, b) => a.name.localeCompare(b.name)) ?? []
       ),
     fetchPolicy: fetchPolicy_networkOnly,
   });

diff --git a/frontend/src/utilsLogic.tsx b/frontend/src/utilsLogic.tsx
@@ -106,7 +106,7 @@ export const updateQueryWorkspaceTemplatesQuery = (
                 name: template?.spec?.prettyName ?? '',
               },
             }),
-          ].sort((a, b) => a.id.localeCompare(b.id))
+          ].sort((a, b) => a.name.localeCompare(b.name))
         );
       }
     }