AXON-762: fix upstream logic

Author: sspanchenko

src/react/atlascode/startwork/v3/StartWorkPageV3.tsx

@@ -45,10 +45,11 @@ const StartWorkPageV3: React.FunctionComponent = () => {
                 setSelectedBranchType(defaultRepo.branchTypes[0]);
             }
 
-            // Set default upstream
-            setUpstream(defaultRepo.workspaceRepo.mainSiteRemote.remote.name);
+            if (!upstream) {
+                setUpstream(defaultRepo.workspaceRepo.mainSiteRemote.remote.name);
+            }
         }
-    }, [state.repoData]);
+    }, [state.repoData, upstream]);
 
     // Generate branch name when dependencies change
     useEffect(() => {
@@ -63,19 +64,22 @@ const StartWorkPageV3: React.FunctionComponent = () => {
         }
     }, [selectedRepository, selectedBranchType, state.issue, state.customTemplate]);
 
-    const handleRepositoryChange = useCallback((repository: RepoData) => {
-        setSelectedRepository(repository);
-        const defaultSourceBranch = getDefaultSourceBranch(repository);
-        setSourceBranch(defaultSourceBranch);
+    const handleRepositoryChange = useCallback(
+        (repository: RepoData) => {
+            setSelectedRepository(repository);
+            const defaultSourceBranch = getDefaultSourceBranch(repository);
+            setSourceBranch(defaultSourceBranch);
 
-        // Set default branch type for new repository
-        if (repository.branchTypes && repository.branchTypes.length > 0) {
-            setSelectedBranchType(repository.branchTypes[0]);
-        }
+            if (repository.branchTypes && repository.branchTypes.length > 0) {
+                setSelectedBranchType(repository.branchTypes[0]);
+            }
 
-        // Set default upstream for new repository
-        setUpstream(repository.workspaceRepo.mainSiteRemote.remote.name);
-    }, []);
+            if (!upstream) {
+                setUpstream(repository.workspaceRepo.mainSiteRemote.remote.name);
+            }
+        },
+        [upstream],
+    );
 
     const handleBranchTypeChange = useCallback((branchType: { kind: string; prefix: string }) => {
         setSelectedBranchType(branchType);

src/react/atlascode/startwork/v3/components/BranchPrefixSelector.tsx

@@ -34,7 +34,6 @@ export const BranchPrefixSelector: React.FC<BranchPrefixSelectorProps> = ({
 
     const hasOptions = (selectedRepository?.branchTypes?.length || 0) > 0 || convertedCustomPrefixes.length > 0;
 
-    // Don't render if no options available
     if (!hasOptions) {
         return null;
     }

src/react/atlascode/startwork/v3/components/ExistingBranchesSection.tsx

@@ -45,7 +45,6 @@ export const ExistingBranchesSection: React.FC<ExistingBranchesSectionProps> = (
         ];
     }, [selectedRepository, issueKey]);
 
-    // Don't render if no existing branches
     if (existingBranches.length === 0) {
         return null;
     }

src/react/atlascode/startwork/v3/components/RepositorySelector.tsx

@@ -24,7 +24,6 @@ export const RepositorySelector: React.FC<RepositorySelectorProps> = ({
         [onRepositoryChange, repoData],
     );
 
-    // Don't render if only one repository
     if (repoData.length <= 1) {
         return null;
     }

src/react/atlascode/startwork/v3/components/UpstreamSelector.tsx

@@ -18,7 +18,6 @@ export const UpstreamSelector: React.FC<UpstreamSelectorProps> = ({
         onUpstreamChange(event.target.value as string);
     };
 
-    // Don't render if there's only one remote or no repository
     if (!selectedRepository || selectedRepository.workspaceRepo.siteRemotes.length <= 1) {
         return null;
     }