AXON-762: fix tests and status bug

Author: sspanchenko

src/commands/jira/startWorkOnIssue.ts

@@ -8,16 +8,20 @@ import { FeatureFlagClient, Features } from '../../util/featureFlags';
 export async function startWorkOnIssue(issueOrKeyAndSite: MinimalIssueOrKeyAndSite<DetailedSiteInfo>) {
     let issue: MinimalIssue<DetailedSiteInfo>;
 
-    if (isMinimalIssue(issueOrKeyAndSite)) {
-        issue = issueOrKeyAndSite;
-    } else {
+    if (FeatureFlagClient.checkGate(Features.StartWorkV3)) {
         issue = await fetchMinimalIssue(issueOrKeyAndSite.key, issueOrKeyAndSite.siteDetails);
-
-        if (!issue) {
-            throw new Error(`Jira issue ${issueOrKeyAndSite.key} not found in site ${issueOrKeyAndSite.siteDetails}`);
+    } else {
+        if (isMinimalIssue(issueOrKeyAndSite)) {
+            issue = issueOrKeyAndSite;
+        } else {
+            issue = await fetchMinimalIssue(issueOrKeyAndSite.key, issueOrKeyAndSite.siteDetails);
         }
     }
 
+    if (!issue) {
+        throw new Error(`Jira issue ${issueOrKeyAndSite.key} not found in site ${issueOrKeyAndSite.siteDetails}`);
+    }
+
     const { startWorkV3WebviewFactory, startWorkWebviewFactory } = Container;
 
     const factory = FeatureFlagClient.checkGate(Features.StartWorkV3)

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

@@ -101,19 +101,6 @@ const StartWorkPageV3: React.FunctionComponent = () => {
         setSubmitState('submitting');
 
         try {
-            console.log('Form data:', {
-                transitionIssueEnabled,
-                selectedTransition,
-                branchSetupEnabled,
-                pushBranchEnabled,
-                localBranch,
-                sourceBranch,
-                selectedRepository,
-                selectedBranchType,
-                upstream,
-            });
-
-            // TODO: Replace with actual API call
             if (!selectedRepository) {
                 throw new Error('No repository selected');
             }
@@ -149,7 +136,6 @@ const StartWorkPageV3: React.FunctionComponent = () => {
         localBranch,
         sourceBranch,
         selectedRepository,
-        selectedBranchType,
         upstream,
     ]);
 

src/webview/startwork/vscStartWorkActionApi.test.ts

@@ -7,12 +7,22 @@ import { Container } from '../../container';
 import { ConfigSection, ConfigSubSection } from '../../lib/ipc/models/config';
 import { Logger } from '../../logger';
 import { Branch, RefType } from '../../typings/git';
+import { FeatureFlagClient } from '../../util/featureFlags';
 import { VSCStartWorkActionApi } from './vscStartWorkActionApi';
 
 // Mock external dependencies
 jest.mock('../../logger');
 jest.mock('../../bitbucket/bbUtils');
 jest.mock('../../container');
+jest.mock('../../util/featureFlags', () => ({
+    FeatureFlagClient: {
+        checkGate: jest.fn(),
+        checkExperimentValue: jest.fn(),
+    },
+    Features: {
+        StartWorkV3: 'startWorkV3',
+    },
+}));
 
 describe('VSCStartWorkActionApi', () => {
     let api: VSCStartWorkActionApi;
@@ -174,6 +184,8 @@ describe('VSCStartWorkActionApi', () => {
         // Mock clientForSite
         (clientForSite as jest.Mock).mockResolvedValue(mockBbClient);
 
+        (FeatureFlagClient.checkGate as jest.Mock).mockReturnValue(false);
+
         api = new VSCStartWorkActionApi();
     });