From 0e0e0368aebe0315473c4e78bba342fe148d77d0 Mon Sep 17 00:00:00 2001
From: Piyush Kumar <piyush.acet@gmail.com>
Date: Fri, 15 Mar 2024 16:19:13 +0530
Subject: [PATCH] fix(app/project/cluster): - add image pull policy of app in
 advanced options - change project review page as per figma - removes vms from
 infra and make cluster tab flat

---
 .../console/page-components/new-project.tsx   | 12 +++++-----
 .../onboarding+/$a+/$cluster+/new-project.tsx |  1 -
 .../$environment+/new-app/app-compute.tsx     | 20 +++++++++--------
 .../$environment+/new-app/app-review.tsx      | 22 +++++++++++--------
 .../_main+/$account+/infra+/_layout.tsx       | 22 +------------------
 .../$account+/infra+/clusters/route.tsx       |  2 +-
 .../routes/_main+/$account+/infra+/vms.tsx    |  7 ------
 7 files changed, 31 insertions(+), 55 deletions(-)
 delete mode 100644 src/apps/console/routes/_main+/$account+/infra+/vms.tsx

diff --git a/src/apps/console/page-components/new-project.tsx b/src/apps/console/page-components/new-project.tsx
index f79a6ce5e..01c7b913d 100644
--- a/src/apps/console/page-components/new-project.tsx
+++ b/src/apps/console/page-components/new-project.tsx
@@ -181,18 +181,16 @@ const NewProject = () => {
                 jumpStep(1);
               }}
             >
-              <div className="flex flex-col p-xl  gap-lg rounded border border-border-default flex-1 overflow-hidden">
-                <div className="flex flex-col gap-md  pb-lg  border-b border-border-default">
+              <div className="flex flex-row justify-between p-xl  gap-lg rounded border border-border-default flex-1 overflow-hidden">
+                <div className="flex flex-col gap-md">
+                  <div className="bodySm text-text-soft">Project name</div>
                   <div className="bodyMd-semibold text-text-default">
-                    Project name
+                    {values.name}
                   </div>
-                  <div className="bodySm text-text-soft">{values.name}</div>
                 </div>
                 <div className="flex flex-col gap-md">
+                  <div className="bodySm text-text-soft">Cluster</div>
                   <div className="bodyMd-semibold text-text-default">
-                    Cluster
-                  </div>
-                  <div className="bodySm text-text-soft">
                     {values.clusterName}
                   </div>
                 </div>
diff --git a/src/apps/console/routes/_a+/onboarding+/$a+/$cluster+/new-project.tsx b/src/apps/console/routes/_a+/onboarding+/$a+/$cluster+/new-project.tsx
index 633298b3d..c5b5ca390 100644
--- a/src/apps/console/routes/_a+/onboarding+/$a+/$cluster+/new-project.tsx
+++ b/src/apps/console/routes/_a+/onboarding+/$a+/$cluster+/new-project.tsx
@@ -4,7 +4,6 @@ import { ensureAccountSet } from '~/console/server/utils/auth-utils';
 import logger from '~/root/lib/client/helpers/log';
 import { IRemixCtx } from '~/root/lib/types/common';
 
-
 const _NewProject = () => {
   return <NewProject />;
 };
diff --git a/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx b/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx
index 514b4cada..af04395b4 100644
--- a/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx
+++ b/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-compute.tsx
@@ -334,15 +334,17 @@ const AppCompute = () => {
           />
         )}
 
-        <Checkbox
-          label="Image Pull Policy"
-          checked={values.imagePullPolicy === 'Always'}
-          onChange={(val) => {
-            const imagePullPolicy = val ? 'Always' : 'IfNotPresent';
-            console.log(imagePullPolicy);
-            handleChange('imagePullPolicy')(dummyEvent(imagePullPolicy));
-          }}
-        />
+        {advancedOptions && (
+          <Checkbox
+            label="Image Pull Policy"
+            checked={values.imagePullPolicy === 'Always'}
+            onChange={(val) => {
+              const imagePullPolicy = val ? 'Always' : 'IfNotPresent';
+              console.log(imagePullPolicy);
+              handleChange('imagePullPolicy')(dummyEvent(imagePullPolicy));
+            }}
+          />
+        )}
       </div>
 
       <div className="flex flex-col">
diff --git a/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx b/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx
index 7d4f8e277..01bae8bec 100644
--- a/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx
+++ b/src/apps/console/routes/_main+/$account+/$project+/$environment+/new-app/app-review.tsx
@@ -114,16 +114,20 @@ const AppReview = () => {
             </div>
           </div>
         </ReviewComponent>
-        <ReviewComponent title="Nodepool Details" onEdit={() => {}}>
-          <div className="flex flex-col p-xl gap-md rounded border border-border-default">
-            <div className="bodyMd-semibold text-text-default">
-              Nodepool Selector
-            </div>
-            <div className="bodySm text-text-soft">
-              {app.spec.nodeSelector[keyconstants.nodepoolName]}
+
+        {app.spec.nodeSelector[keyconstants.nodepoolName] !== '' && (
+          <ReviewComponent title="Nodepool Details" onEdit={() => {}}>
+            <div className="flex flex-col p-xl gap-md rounded border border-border-default">
+              <div className="bodyMd-semibold text-text-default">
+                Nodepool Selector
+              </div>
+              <div className="bodySm text-text-soft">
+                {app.spec.nodeSelector[keyconstants.nodepoolName]}
+              </div>
             </div>
-          </div>
-        </ReviewComponent>
+          </ReviewComponent>
+        )}
+
         <ReviewComponent
           title="Environment"
           onEdit={() => {
diff --git a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
index 21ad6164e..473c0f6b2 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/_layout.tsx
@@ -1,28 +1,8 @@
 import { Outlet, useOutletContext } from '@remix-run/react';
-import SidebarLayout from '~/console/components/sidebar-layout';
-import { useSubNavData } from '~/root/lib/client/hooks/use-create-subnav-action';
-import { useHandleFromMatches } from '~/root/lib/client/hooks/use-custom-matches';
 
 const Infra = () => {
   const rootContext = useOutletContext();
-  const subNavAction = useSubNavData();
-  const noLayout = useHandleFromMatches('noLayout', null);
-
-  if (noLayout) {
-    return <Outlet context={rootContext} />;
-  }
-  return (
-    <SidebarLayout
-      navItems={[
-        { label: 'Clusters', value: 'clusters' },
-        { label: 'VM instances', value: 'vms' },
-      ]}
-      parentPath="/infra"
-      headerActions={subNavAction.data}
-    >
-      <Outlet context={rootContext} />
-    </SidebarLayout>
-  );
+  return <Outlet context={rootContext} />;
 };
 
 export default Infra;
diff --git a/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
index ca81ffe46..f10a71d29 100644
--- a/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
+++ b/src/apps/console/routes/_main+/$account+/infra+/clusters/route.tsx
@@ -130,7 +130,7 @@ const Clusters = () => {
         const { pageInfo, totalCount } = clustersData;
         return (
           <Wrapper
-            secondaryHeader={{
+            header={{
               title: 'Clusters',
               action: clusters.length > 0 && (
                 <Button
diff --git a/src/apps/console/routes/_main+/$account+/infra+/vms.tsx b/src/apps/console/routes/_main+/$account+/infra+/vms.tsx
deleted file mode 100644
index a99b90523..000000000
--- a/src/apps/console/routes/_main+/$account+/infra+/vms.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-import Wip from "~/console/components/wip";
-
-const VM = () => {
-  return <Wip />;
-};
-
-export default VM;