4819 - Fix Deployment dialog tabs in Deployment screen 2

Author: kresimir-coko

client/src/pages/automation/project-deployments/components/project-deployment-dialog/ProjectDeploymentDialog.tsx

@@ -52,6 +52,7 @@ interface ProjectDeploymentDialogProps {
     projectDeployment?: ProjectDeployment;
     projectDeployments?: ProjectDeployment[];
     projectDeploymentsLoading?: boolean;
+    showTabs?: boolean;
     triggerNode?: ReactNode;
 }
 
@@ -63,6 +64,7 @@ const ProjectDeploymentDialog = ({
     projectDeployment,
     projectDeployments,
     projectDeploymentsLoading,
+    showTabs,
     triggerNode,
 }: ProjectDeploymentDialogProps) => {
     const [activeStepIndex, setActiveStepIndex] = useState(0);
@@ -199,6 +201,7 @@ const ProjectDeploymentDialog = ({
                     projectDeployments={projectDeployments}
                     projectDeploymentsLoading={projectDeploymentsLoading}
                     setValue={setValue}
+                    showTabs={showTabs}
                 />
             ),
             name: 'Basic',
@@ -414,7 +417,8 @@ const ProjectDeploymentDialog = ({
                                         disabled={
                                             basicStepTab === 'change-version' &&
                                             !projectDeploymentsLoading &&
-                                            (projectDeployments?.length ?? 0) === 0
+                                            (projectDeployments?.length ?? 0) === 0 &&
+                                            showTabs
                                         }
                                         label="Next"
                                         onClick={handleSubmit(handleNextClick)}

client/src/pages/automation/project-deployments/components/project-deployment-dialog/ProjectDeploymentDialogBasicStep.tsx

@@ -30,6 +30,7 @@ interface ProjectDialogBasicStepProps {
     projectDeployments?: ProjectDeployment[];
     projectDeploymentsLoading?: boolean;
     setValue: UseFormSetValue<ProjectDeployment>;
+    showTabs?: boolean;
 }
 
 const ProjectDeploymentDialogBasicStep = ({
@@ -41,6 +42,7 @@ const ProjectDeploymentDialogBasicStep = ({
     projectDeployments,
     projectDeploymentsLoading,
     setValue,
+    showTabs,
 }: ProjectDialogBasicStepProps) => {
     const [selectedDeploymentId, setSelectedDeploymentId] = useState<string | undefined>();
     const [currentProjectId, setCurrentProjectId] = useState(getValues('projectId'));
@@ -100,8 +102,6 @@ const ProjectDeploymentDialogBasicStep = ({
     };
 
     const hasDeployments = (projectDeployments?.length ?? 0) > 0;
-    const shouldShowTabs =
-        changeProjectVersion || projectDeployment?.id != null || projectDeployment?.projectId != null;
 
     const newDeploymentForm = (
         <>
@@ -238,7 +238,7 @@ const ProjectDeploymentDialogBasicStep = ({
         </>
     );
 
-    if (!shouldShowTabs) {
+    if (!showTabs) {
         return <div className="flex flex-col gap-4">{newDeploymentForm}</div>;
     }
 

client/src/pages/automation/projects/components/project-list/ProjectListItem.tsx

@@ -399,6 +399,7 @@ const ProjectListItem = ({project, projectGitConfiguration, remainingTags}: Proj
                                             }}
                                             projectDeployments={projectDeploymentsQuery.data}
                                             projectDeploymentsLoading={projectDeploymentsQuery.isFetching}
+                                            showTabs
                                             triggerNode={
                                                 <Button
                                                     className="hover:bg-surface-neutral-primary-hover"