From e1eaacc381d7d4a43d4942d293a3401d4d3b585c Mon Sep 17 00:00:00 2001
From: Shalom Ben Zvi Kazaz <shalom938@gmail.com>
Date: Mon, 24 Jul 2023 18:01:08 +0300
Subject: [PATCH 1/2] fix show tabs

---
 src/components/InstallationWizard/InstallStep/index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/InstallationWizard/InstallStep/index.tsx b/src/components/InstallationWizard/InstallStep/index.tsx
index e8749eb6f..5139fe949 100644
--- a/src/components/InstallationWizard/InstallStep/index.tsx
+++ b/src/components/InstallationWizard/InstallStep/index.tsx
@@ -48,7 +48,7 @@ export const InstallStep = (props: InstallStepProps) => {
   const [isAutoInstallationFinished, setIsAutoInstallationFinished] =
     useState(false);
   const [areTabsVisible, setAreTabsVisible] = useState(
-    !config.isDockerInstalled || !config.isDockerComposeInstalled
+      !config.isDigmaEngineInstalled && !isAutoInstallationFlow
   );
   const [isAutoInstallTabVisible, setIsAutoInstallTabVisible] = useState(false);
   const [isEngineOperationInProgress, setIsEngineOperationInProgress] =

From b1b1e6fe67e7377f6c3cd7fb00d3d7b1fae4a7a5 Mon Sep 17 00:00:00 2001
From: Shay Keren <shay.keren@gmail.com>
Date: Thu, 27 Jul 2023 18:02:34 +0300
Subject: [PATCH 2/2] change tab order and skip user installation selection

---
 .../InstallationWizard/InstallStep/index.tsx  | 58 +++++++++----------
 src/components/InstallationWizard/index.tsx   | 11 ++--
 2 files changed, 36 insertions(+), 33 deletions(-)

diff --git a/src/components/InstallationWizard/InstallStep/index.tsx b/src/components/InstallationWizard/InstallStep/index.tsx
index 5139fe949..3a38f57a5 100644
--- a/src/components/InstallationWizard/InstallStep/index.tsx
+++ b/src/components/InstallationWizard/InstallStep/index.tsx
@@ -241,30 +241,33 @@ export const InstallStep = (props: InstallStepProps) => {
         ]
       : []),
     {
-      icon: DockerLogoIcon,
-      title: "Docker Desktop",
+      icon: CodeIcon,
+      title: "Docker Compose",
       content: (
         <>
           <s.TabContentContainer>
             <s.SectionTitle>
-              <DockerLogoIcon size={24} color={"#2396ed"} />
-              Install Digma Docker extension
+              Run the following from the terminal/command line to start the
+              Digma backend:
             </s.SectionTitle>
             <SectionDescription>
               (You&apos;ll need{" "}
+              <Link onClick={() => openLinkInDefaultBrowser(DOCKER_URL)}>
+                Docker
+              </Link>{" "}
+              and{" "}
               <Link
-                onClick={() => openLinkInDefaultBrowser(DOCKER_DESKTOP_URL)}
+                onClick={() => openLinkInDefaultBrowser(DOCKER_COMPOSE_URL)}
               >
-                Docker Desktop
+                Docker Compose
               </Link>{" "}
-              4.10.0 or higher installed)
+              installed)
             </SectionDescription>
-            <s.GetDockerExtensionButton
-              buttonType={"secondary"}
-              onClick={handleInstallDigmaButtonClick}
-            >
-              Get Digma Docker Extension
-            </s.GetDockerExtensionButton>
+            <s.DockerComposeTabs
+              tabs={dockerComposeOSTabs}
+              onSelect={handleSelectDockerComposeOSTab}
+              selectedTab={selectedDockerComposeOSTab}
+            />
           </s.TabContentContainer>
           <s.CommonContentContainer>
             {renderLoader()}
@@ -274,33 +277,30 @@ export const InstallStep = (props: InstallStepProps) => {
       )
     },
     {
-      icon: CodeIcon,
-      title: "Docker Compose",
+      icon: DockerLogoIcon,
+      title: "Docker Desktop",
       content: (
         <>
           <s.TabContentContainer>
             <s.SectionTitle>
-              Run the following from the terminal/command line to start the
-              Digma backend:
+              <DockerLogoIcon size={24} color={"#2396ed"} />
+              Install Digma Docker extension
             </s.SectionTitle>
             <SectionDescription>
               (You&apos;ll need{" "}
-              <Link onClick={() => openLinkInDefaultBrowser(DOCKER_URL)}>
-                Docker
-              </Link>{" "}
-              and{" "}
               <Link
-                onClick={() => openLinkInDefaultBrowser(DOCKER_COMPOSE_URL)}
+                onClick={() => openLinkInDefaultBrowser(DOCKER_DESKTOP_URL)}
               >
-                Docker Compose
+                Docker Desktop
               </Link>{" "}
-              installed)
+              4.10.0 or higher installed)
             </SectionDescription>
-            <s.DockerComposeTabs
-              tabs={dockerComposeOSTabs}
-              onSelect={handleSelectDockerComposeOSTab}
-              selectedTab={selectedDockerComposeOSTab}
-            />
+            <s.GetDockerExtensionButton
+              buttonType={"secondary"}
+              onClick={handleInstallDigmaButtonClick}
+            >
+              Get Digma Docker Extension
+            </s.GetDockerExtensionButton>
           </s.TabContentContainer>
           <s.CommonContentContainer>
             {renderLoader()}
diff --git a/src/components/InstallationWizard/index.tsx b/src/components/InstallationWizard/index.tsx
index a25a7ca35..08748cbfb 100644
--- a/src/components/InstallationWizard/index.tsx
+++ b/src/components/InstallationWizard/index.tsx
@@ -115,6 +115,9 @@ export const InstallationWizard = () => {
     InstallationType | undefined
   >(preselectedInstallationType);
 
+  const isStartAutoInstall = true
+
+
   const theme = useTheme();
   const themeKind = getThemeKind(theme);
   const [email, setEmail] = useState(config.userEmail);
@@ -267,7 +270,7 @@ export const InstallationWizard = () => {
     setInstallationType(installationType);
     window.sendMessageToDigma({
       action: globalActions.SEND_TRACKING_EVENT,
-      payload: {
+      payload: { 
         eventName: trackingEvents.INSTALLATION_TYPE_BUTTON_CLICKED,
         data: {
           installationType
@@ -383,7 +386,7 @@ export const InstallationWizard = () => {
 
   return (
     <s.Container>
-      {installationType ? (
+      {isStartAutoInstall || installationType ? (
         <s.Header>
           <s.HeaderTitle>Install Digma</s.HeaderTitle>
           <s.HeaderSubtitle>
@@ -485,7 +488,7 @@ export const InstallationWizard = () => {
           </s.InstallationTypeButtonsContainer>
         </s.WelcomeContainer>
       )}
-      {installationType &&
+      {(isStartAutoInstall || installationType) &&
         steps.map((step, i) => (
           <Step
             key={step.key}
@@ -498,7 +501,7 @@ export const InstallationWizard = () => {
         ))}
 
       <s.Footer>
-        {installationType && (
+        {(isStartAutoInstall || installationType) && (
           <CSSTransition
             in={currentStep === steps.length - 1}
             timeout={TRANSITION_DURATION}