chore: use organization display name

jaaydenh · jaaydenh · commit cfcba256293a · 2024-07-11T03:25:37.000Z
diff --git a/site/src/modules/templates/TemplateCard/TemplateCard.stories.tsx b/site/src/modules/templates/TemplateCard/TemplateCard.stories.tsx
@@ -31,7 +31,7 @@ export const LongContentTemplate: Story = {
     template: {
       ...MockTemplate,
       display_name: "Very Long Template Name",
-      organization_name: "Very Long Organization Name",
+      organization_display_name: "Very Long Organization Name",
       description:
         "This is a very long test description. This is a very long test description. This is a very long test description. This is a very long test description",
       active_user_count: 999,
diff --git a/site/src/modules/templates/TemplateCard/TemplateCard.tsx b/site/src/modules/templates/TemplateCard/TemplateCard.tsx
@@ -43,7 +43,7 @@ export const TemplateCard: FC<TemplateCardProps> = ({
                 ? template.display_name
                 : template.name
             }
-            subtitle={template.organization_name}
+            subtitle={template.organization_display_name}
             avatar={
               hasIcon && (
                 <ExternalAvatar variant="square" fitImage src={template.icon} />
diff --git a/site/src/pages/TemplatesPage/MultiOrgTemplatePage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/MultiOrgTemplatePage/TemplatesPageView.tsx
@@ -56,21 +56,27 @@ export interface TemplatesPageViewProps {
   error?: unknown;
 }
 
-export type TemplatesByOrg = Record<string, number>;
+export type TemplatesByOrg = Record<
+  string,
+  { displayName: string; count: number }
+>;
 
 const getTemplatesByOrg = (templates: Template[]): TemplatesByOrg => {
   const orgs: TemplatesByOrg = {
-    all: 0,
+    all: { displayName: "All Organizations", count: 0 },
   };
 
   templates.forEach((template) => {
     if (orgs[template.organization_name]) {
-      orgs[template.organization_name] += 1;
+      orgs[template.organization_name].count += 1;
     } else {
-      orgs[template.organization_name] = 1;
+      orgs[template.organization_name] = {
+        displayName: template.organization_display_name,
+        count: 1,
+      };
     }
 
-    orgs.all += 1;
+    orgs.all.count += 1;
   });
 
   return orgs;
@@ -116,14 +122,13 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = ({
       <Stack direction="row" spacing={4} alignItems="flex-start">
         <Stack css={{ width: 208, flexShrink: 0, position: "sticky", top: 48 }}>
           <span css={styles.filterCaption}>ORGANIZATION</span>
-          {Object.keys(templatesByOrg).map((org) => (
+          {Object.entries(templatesByOrg).map(([key, value]) => (
             <Link
-              key={org}
-              to={org !== "all" ? `?filter=organization:${org}` : "?"}
-              css={[styles.tagLink, org === activeOrg && styles.tagLinkActive]}
+              key={key}
+              to={key !== "all" ? `?filter=organization:${key}` : "?"}
+              css={[styles.tagLink, key === activeOrg && styles.tagLinkActive]}
             >
-              {org === "all" ? "All Organizations" : org} (
-              {templatesByOrg[org] ?? 0})
+              {value.displayName} ({value.count ?? 0})
             </Link>
           ))}
         </Stack>

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ export const TemplateCard: FC<TemplateCardProps> = ({`
`43`	`43`	`? template.display_name`
`44`	`44`	`: template.name`
`45`	`45`	`}`
`46`		`- subtitle={template.organization_name}`
	`46`	`+ subtitle={template.organization_display_name}`
`47`	`47`	`avatar={`
`48`	`48`	`hasIcon && (`
`49`	`49`	`<ExternalAvatar variant="square" fitImage src={template.icon} />`