conflicts cleanup

weaveworks · Mar 1, 2022 · 1f3b9c8 · 1f3b9c8
1 parent 1906053
commit 1f3b9c8
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 38 deletions.
diff --git a/ui/components/AutomationsTable.tsx b/ui/components/AutomationsTable.tsx
@@ -4,7 +4,6 @@ import { Automation } from "../hooks/automations";
 import { formatURL } from "../lib/nav";
 import { AutomationType, V2Routes } from "../lib/types";
 import DataTable, { SortType } from "./DataTable";
-import KubeStatusIndicator from "./KubeStatusIndicator";
 import Link from "./Link";
 
 type Props = {
@@ -47,22 +46,6 @@ function AutomationsTable({ className, automations }: Props) {
           label: "Namespace",
           value: "namespace",
         },
-        {
-          label: "Cluster",
-          value: "cluster",
-        },
-        {
-          label: "Status",
-          value: (a: Automation) =>
-            a.conditions.length > 0 ? (
-              <KubeStatusIndicator conditions={a.conditions} />
-            ) : null,
-        },
-        {
-          label: "Revision",
-          value: "lastAttemptedRevision",
-        },
-        { label: "Last Synced At", value: "lastHandledReconciledAt" },
       ]}
       rows={automations}
     />

diff --git a/ui/components/Layout.tsx b/ui/components/Layout.tsx
@@ -10,11 +10,8 @@ import Breadcrumbs from "./Breadcrumbs";
 import Flex from "./Flex";
 import Link from "./Link";
 import Logo from "./Logo";
-<<<<<<< HEAD
-import UserSettings from "./UserSettings";
-=======
 import Spacer from "./Spacer";
->>>>>>> b0a4020d (breadcrumbs)
+import UserSettings from "./UserSettings";
 
 type Props = {
   className?: string;
@@ -142,13 +139,9 @@ function Layout({ className, children }: Props) {
       <AppContainer>
         <TopToolBar start align>
           <Logo />
-<<<<<<< HEAD
           {authFlag ? <UserSettings /> : null}
-=======
           <Spacer padding="xxl" />
           <Breadcrumbs />
-          {/* code for account icon - disabled while no account functionality exists <UserAvatar size="xl" type={IconType.Account} color="white" /> */}
->>>>>>> b0a4020d (breadcrumbs)
         </TopToolBar>
         <Main wide>
           <NavContainer>

diff --git a/ui/components/ReconciledObjectsTable.tsx b/ui/components/ReconciledObjectsTable.tsx
@@ -8,14 +8,10 @@ import {
   UnstructuredObject,
 } from "../lib/api/core/types.pb";
 import DataTable, { SortType } from "./DataTable";
-<<<<<<< HEAD
 import KubeStatusIndicator, {
   computeMessage,
   computeReady,
 } from "./KubeStatusIndicator";
-=======
-import KubeStatusIndicator, { computeReady } from "./KubeStatusIndicator";
->>>>>>> b0a4020d (breadcrumbs)
 
 type Props = {
   className?: string;
@@ -46,11 +42,6 @@ function ReconciledObjectsTable({
           {
             value: "name",
             label: "Name",
-<<<<<<< HEAD
-=======
-            sortType: SortType.string,
-            sortValue: ({ name }) => name,
->>>>>>> b0a4020d (breadcrumbs)
           },
           {
             label: "Type",
@@ -71,11 +62,7 @@ function ReconciledObjectsTable({
                 <KubeStatusIndicator conditions={u.conditions} />
               ) : null,
             sortType: SortType.bool,
-<<<<<<< HEAD
             sortValue: ({ conditions }) => computeReady(conditions),
-=======
-            sortValue: (u: UnstructuredObject) => computeReady(u.conditions),
->>>>>>> b0a4020d (breadcrumbs)
           },
           {
             label: "Message",