Merge branch 'main' into axon-1530-thinking-block-reopen

Author: jwang19-atlassian

CODEOWNERS

@@ -5,11 +5,11 @@
 # the repo. Unless a later match takes precedence,
 # @global-owner1 and @global-owner2 will be requested for
 # review when someone opens a pull request.
-# AXON TEAM: @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura
+# AXON TEAM: @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura @jwang19-atlassian @teg-atlassian
 # SOFTSERVE TEAM: @bhorai-atl @om-ukr @sspanchenko
 # BBY FOLKS: @Blastoplex @mattcolman @matt-lassian @dchiew-atl @amarg-at @ccallcottstevens
 
-*       @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura @bhorai-atl @om-ukr @sspanchenko @Blastoplex @mattcolman @matt-lassian @dchiew-atl @amarg-at @ccallcottstevens
+*       @bwieger-atlassian-com @sdzh-atlassian @cabella-dot @marcomura @jwang19-atlassian @teg-atlassian @bhorai-atl @om-ukr @sspanchenko @Blastoplex @mattcolman @matt-lassian @dchiew-atl @amarg-at @ccallcottstevens
 
 # Order is important; the last matching pattern takes the most
 # precedence. When someone opens a pull request that only

package.json

@@ -46,7 +46,7 @@
     ],
     "main": "./build/extension/extension",
     "rovoDev": {
-        "version": "0.13.6"
+        "version": "0.13.11"
     },
     "scripts": {
         "vscode:uninstall": "node ./build/extension/uninstall.js",

src/util/rovo-dev-entitlement/rovoDevEntitlementChecker.test.ts

@@ -20,8 +20,12 @@ describe('RovoDevEntitlementChecker', () => {
     let mockClientManager: any;
     let mockConfig: any;
     let mockFeatureGateClient: any;
-
+    let mockSiteManager: any;
     beforeEach(() => {
+        mockSiteManager = {
+            onDidSitesAvailableChange: jest.fn().mockReturnValue({ dispose: jest.fn() }),
+        };
+        (Container as any).siteManager = mockSiteManager;
         mockAnalyticsClient = {
             sendTrackEvent: jest.fn(),
         } as any;
@@ -43,6 +47,7 @@ describe('RovoDevEntitlementChecker', () => {
         (Container as any).clientManager = mockClientManager;
         (Container as any).config = mockConfig;
         (Container as any).featureFlagClient = mockFeatureGateClient;
+        (Container as any).siteManager = mockSiteManager;
         (Logger.debug as jest.Mock).mockImplementation(() => {});
         (Logger.error as jest.Mock).mockImplementation(() => {});
         (rovoDevEntitlementCheckEvent as jest.Mock).mockResolvedValue({});

src/util/rovo-dev-entitlement/rovoDevEntitlementChecker.ts

@@ -34,14 +34,21 @@ export class RovoDevEntitlementChecker extends Disposable {
 
     private _enabled: boolean;
 
+    private _cachedEntitlement: EntitlementResponse | null;
+
     private disposable: Disposable;
 
     constructor(analyticsClient: AnalyticsClient) {
         super(() => this._dispose());
         this._analyticsClient = analyticsClient;
         this._enabled = Container.config.rovodev.showEntitlementNotifications;
-
-        this.disposable = Disposable.from(configuration.onDidChange(this.onDidChangeConfiguration, this));
+        this._cachedEntitlement = null;
+        this.disposable = Disposable.from(
+            configuration.onDidChange(this.onDidChangeConfiguration, this),
+            Container.siteManager.onDidSitesAvailableChange(() => {
+                this._cachedEntitlement = null;
+            }, this),
+        );
     }
 
     private onDidChangeConfiguration(e: ConfigurationChangeEvent) {
@@ -52,6 +59,10 @@ export class RovoDevEntitlementChecker extends Disposable {
 
     public async checkEntitlement(): Promise<EntitlementResponse> {
         try {
+            if (this._cachedEntitlement) {
+                Logger.debug(`Cached entitlement response: ${this._cachedEntitlement.type}`);
+                return this._cachedEntitlement;
+            }
             const credentials = await Container.clientManager.getCloudPrimarySite();
 
             if (!credentials) {
@@ -96,10 +107,11 @@ export class RovoDevEntitlementChecker extends Disposable {
                 this._analyticsClient.sendTrackEvent(e);
             });
 
-            return {
+            this._cachedEntitlement = {
                 isEntitled: true,
                 type: value.trim() as RovoDevEntitlementType,
             };
+            return this._cachedEntitlement;
         } catch (err) {
             Logger.error(err, 'Unable to check Rovo Dev entitlement');
             const errType: string =

src/webviews/components/issue/view-issue-screen/JiraIssuePage.tsx

@@ -376,7 +376,7 @@ export default class JiraIssuePage extends AbstractIssueEditorPage<Emit, Accept,
                     loadingField: field.key,
                     fieldValues: { ...this.state.fieldValues, ...{ [field.key]: typedVal } },
                 });
-                if (typedVal === undefined) {
+                if (typedVal === undefined || typedVal === '') {
                     typedVal = null;
                 }
                 await this.handleEditIssue(field.key, typedVal, teamId);