chore: fix issues w/ merge conflict resolution

coder · khorne3 · Jun 16, 2022 · Jun 10, 2022 · Jun 10, 2022 · Jun 10, 2022
commit dd94acab0f48c250f9445557628c9d5d8f445407
diff --git a/site/src/api/typesGenerated.ts b/site/src/api/typesGenerated.ts
@@ -247,11 +247,7 @@ export interface Template {
   readonly description: string
   readonly max_ttl_ms: number
   readonly min_autostart_interval_ms: number
-<<<<<<< HEAD
-  readonly created_by_id?: string
-=======
   readonly created_by_id: string
->>>>>>> main
   readonly created_by_name: string
 }
 

diff --git a/site/src/components/TemplateStats/TemplateStats.stories.tsx b/site/src/components/TemplateStats/TemplateStats.stories.tsx
@@ -23,12 +23,3 @@ UsedByMany.args = {
   },
   activeVersion: Mocks.MockTemplateVersion,
 }
-
-export const UnknownCreator = Template.bind({})
-UnknownCreator.args = {
-  template: {
-    ...Mocks.MockTemplate,
-    created_by_name: "",
-  },
-  activeVersion: Mocks.MockTemplateVersion,
-}
diff --git a/site/src/components/TemplateStats/TemplateStats.tsx b/site/src/components/TemplateStats/TemplateStats.tsx
@@ -14,10 +14,6 @@ const Language = {
   userPlural: "users",
   userSingular: "user",
   createdByLabel: "Created by",
-<<<<<<< HEAD
-  defaultTemplateCreator: "<unknown>",
-=======
->>>>>>> main
 }
 
 export interface TemplateStatsProps {
@@ -53,11 +49,7 @@ export const TemplateStats: FC<TemplateStatsProps> = ({ template, activeVersion
       <div className={styles.statsDivider} />
       <div className={styles.statItem}>
         <span className={styles.statsLabel}>{Language.createdByLabel}</span>
-<<<<<<< HEAD
-        <span className={styles.statsValue}>{template.created_by_name || Language.defaultTemplateCreator}</span>
-=======
         <span className={styles.statsValue}>{template.created_by_name}</span>
->>>>>>> main
       </div>
     </div>
   )

diff --git a/site/src/pages/TemplatesPage/TemplatesPageView.tsx b/site/src/pages/TemplatesPage/TemplatesPageView.tsx
@@ -24,15 +24,7 @@ import {
   HelpTooltipLinksGroup,
   HelpTooltipText,
   HelpTooltipTitle,
-<<<<<<< HEAD
 } from "../../components/Tooltips/HelpTooltip/HelpTooltip"
-=======
-} from "../../components/HelpTooltip/HelpTooltip"
-import { Margins } from "../../components/Margins/Margins"
-import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
-import { Stack } from "../../components/Stack/Stack"
-import { TableLoader } from "../../components/TableLoader/TableLoader"
->>>>>>> main
 
 dayjs.extend(relativeTime)
 
@@ -58,10 +50,6 @@ export const Language = {
   templateTooltipText: "With templates you can create a common configuration for your workspaces using Terraform.",
   templateTooltipLink: "Manage templates",
   createdByLabel: "Created by",
-<<<<<<< HEAD
-  defaultTemplateCreator: "<unknown>",
-=======
->>>>>>> main
 }
 
 const TemplateHelpTooltip: React.FC = () => {
@@ -151,11 +139,7 @@ export const TemplatesPageView: FC<TemplatesPageViewProps> = (props) => {
                 <TableCell>{Language.developerCount(template.workspace_owner_count)}</TableCell>
 
                 <TableCell data-chromatic="ignore">{dayjs().to(dayjs(template.updated_at))}</TableCell>
-<<<<<<< HEAD
-                <TableCell>{template.created_by_name || Language.defaultTemplateCreator}</TableCell>
-=======
                 <TableCell>{template.created_by_name}</TableCell>
->>>>>>> main
                 <TableCell>
                   <div className={styles.arrowCell}>
                     <KeyboardArrowRight className={styles.arrowRight} />

diff --git a/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx b/site/src/pages/WorkspacesPage/WorkspacesPageView.tsx
@@ -34,15 +34,7 @@ import {
   HelpTooltipLinksGroup,
   HelpTooltipText,
   HelpTooltipTitle,
-<<<<<<< HEAD
 } from "../../components/Tooltips/HelpTooltip/HelpTooltip"
-=======
-} from "../../components/HelpTooltip/HelpTooltip"
-import { Margins } from "../../components/Margins/Margins"
-import { PageHeader, PageHeaderSubtitle, PageHeaderTitle } from "../../components/PageHeader/PageHeader"
-import { Stack } from "../../components/Stack/Stack"
-import { TableLoader } from "../../components/TableLoader/TableLoader"
->>>>>>> main
 import { getFormHelpers, onChangeTrimmed } from "../../util/formUtils"
 import { getDisplayStatus, workspaceFilterQuery } from "../../util/workspace"
 
@@ -138,21 +130,7 @@ export const WorkspacesPageView: FC<WorkspacesPageViewProps> = ({ loading, works
 
   return (
     <Margins>
-<<<<<<< HEAD
-      <PageHeader
-        actions={
-          <PageHeaderText>
-            Create a new workspace from a{" "}
-            <Link component={RouterLink} to="/templates">
-              template
-            </Link>
-            .
-          </PageHeaderText>
-        }
-      >
-=======
       <PageHeader>
->>>>>>> main
         <PageHeaderTitle>
           <Stack direction="row" spacing={1} alignItems="center">
             <span>Workspaces</span>