feat: defaultlandscape introduction

packages/app-studio-toolkit/package.json

@@ -121,23 +121,17 @@
         }
       },
       {
-        "command": "local-extension.landscape.default-on",
-        "title": "Make this the landscape as the default",
-        "icon": {
-          "light": "resources/common/joule.svg",
-          "dark": "resources/common/joule.svg"
-        }
+        "command": "app-studio-toolkit.devspace-manager.landscape.default-on",
+        "title": "Set as default landscape",
+        "icon": "$(vm-outline)"
       },
       {
-        "command": "local-extension.landscape.default-off",
-        "title": "Remove this landscape as the default",
-        "icon": {
-          "light": "resources/common/joule-full.svg",
-          "dark": "resources/common/joule-full.svg"
-        }
+        "command": "app-studio-toolkit.devspace-manager.landscape.default-off",
+        "title": "Deselect default landscape",
+        "icon": "$(vm-active)"
       },
       {
-        "command": "local-extension.landscape.get-default-landscape",
+        "command": "app-studio-toolkit.devspace-manager.get-default-landscape",
         "title": "Returns the landscape marked as the default"
       }
     ],
@@ -204,15 +198,15 @@
       "commandPalette": [
         {
           "when": "false",
-          "command": "local-extension.landscape.get-default-landscape"
+          "command": "app-studio-toolkit.devspace-manager.get-default-landscape"
         },
         {
           "when": "false",
-          "command": "local-extension.landscape.default-on"
+          "command": "app-studio-toolkit.devspace-manager.landscape.default-on"
         },
         {
           "when": "false",
-          "command": "local-extension.landscape.default-off"
+          "command": "app-studio-toolkit.devspace-manager.landscape.default-off"
         },
         {
           "when": "false",
@@ -338,12 +332,12 @@
           "group": "inline@2"
         },
         {
-          "command": "local-extension.landscape.default-on",
+          "command": "app-studio-toolkit.devspace-manager.landscape.default-on",
           "when": "view == dev-spaces && viewItem =~ /.*landscape-.*default-off.*/",
           "group": "inline@1"
         },
         {
-          "command": "local-extension.landscape.default-off",
+          "command": "app-studio-toolkit.devspace-manager.landscape.default-off",
           "when": "view == dev-spaces && viewItem =~ /.*landscape-.*default-on.*/",
           "group": "inline@1"
         }
@@ -379,7 +373,7 @@
   ],
   "dependencies": {
     "@sap/artifact-management": "1.39.0",
-    "@sap/bas-sdk": "^3.8.9",
+    "@sap/bas-sdk": "^3.9.0",
     "@vscode-logging/wrapper": "2.0.0",
     "axios": "^1.7.4",
     "body-parser": "1.20.2",

packages/app-studio-toolkit/src/authentication/auth-utils.ts

@@ -6,7 +6,7 @@ import { createHttpTerminator, HttpTerminator } from "http-terminator";
 import { platform } from "os";
 import { getLogger } from "../logger/logger";
 import { BasRemoteAuthenticationProvider } from "./authProvider";
-import { core, helpers } from "@sap/bas-sdk";
+import { core } from "@sap/bas-sdk";
 import { messages } from "../../src/devspace-manager/common/messages";
 import {
   eventEmitter,
@@ -200,6 +200,6 @@ export async function getJwt(landscapeUrl: string): Promise<string> {
 
 export async function hasJwt(landscapeUrl: string): Promise<boolean> {
   return getJwt(landscapeUrl)
-    .then((jwt) => !helpers.isJwtExpired(jwt))
+    .then((jwt) => !core.isJwtExpired(jwt))
     .catch((_) => false);
 }

packages/app-studio-toolkit/src/devspace-manager/instance.ts

@@ -37,7 +37,7 @@ export function initBasRemoteExplorer(context: ExtensionContext): void {
   /* istanbul ignore next */
   context.subscriptions.push(
     commands.registerCommand(
-      "local-extension.landscape.default-on",
+      "app-studio-toolkit.devspace-manager.landscape.default-on",
       async (node?: LandscapeNode): Promise<boolean> => {
         return setDefaultLandscape(node?.url);
       }
@@ -46,7 +46,7 @@ export function initBasRemoteExplorer(context: ExtensionContext): void {
 
   context.subscriptions.push(
     commands.registerCommand(
-      "local-extension.landscape.default-off",
+      "app-studio-toolkit.devspace-manager.landscape.default-off",
       async (node: LandscapeNode): Promise<void> => {
         await clearDefaultLandscape();
         void commands.executeCommand("local-extension.tree.refresh");
@@ -56,7 +56,7 @@ export function initBasRemoteExplorer(context: ExtensionContext): void {
 
   context.subscriptions.push(
     commands.registerCommand(
-      "local-extension.landscape.get-default-landscape",
+      "app-studio-toolkit.devspace-manager.get-default-landscape",
       () => {
         return getDefaultLandscape();
       }

packages/app-studio-toolkit/src/devspace-manager/landscape/landscape.ts

@@ -8,7 +8,7 @@ import {
   window,
   workspace,
 } from "vscode";
-import { helpers } from "@sap/bas-sdk";
+import { core } from "@sap/bas-sdk";
 import { compact, isEmpty, size, trim, uniqBy } from "lodash";
 import { hasJwt } from "../../authentication/auth-utils";
 import { URL } from "node:url";
@@ -138,7 +138,7 @@ export async function cmdLoginToLandscape(node: LandscapeNode): Promise<void> {
     );
     if (session?.accessToken) {
       // auto refresh util jwt expired
-      autoRefresh(30 * 1000, helpers.timeUntilJwtExpires(session.accessToken));
+      autoRefresh(30 * 1000, core.timeUntilJwtExpires(session.accessToken));
     }
   } finally {
     void commands.executeCommand("local-extension.tree.refresh");
@@ -190,7 +190,7 @@ function selectLandscape(
   items.push({ label: "", kind: QuickPickItemKind.Separator }); // action section separator
   items.push({ label: LBL_ADD_LANDSCAPE });
   return window.showQuickPick(items, {
-    placeHolder: "Select the landscape in which you want to use as default",
+    placeHolder: "Select a landscape for AI metering",
     ignoreFocusOut: true,
   }) as Promise<QuickPickLandscape | undefined>;
 }

packages/app-studio-toolkit/src/devspace-manager/tree/devSpacesProvider.ts

@@ -60,10 +60,7 @@ export class DevSpaceDataProvider implements TreeDataProvider<TreeItem> {
         this.extensionPath,
         landscape.name,
         TreeItemCollapsibleState.Expanded,
-        getSvgIconPath(
-          this.extensionPath,
-          `landscape${landscape.default ? "_ai" : ""}`
-        ),
+        getSvgIconPath(this.extensionPath, `landscape`),
         "",
         landscape.default ? `${tooltip} ${messages.lbl_ai_enabled}` : tooltip,
         landscape.name,

packages/app-studio-toolkit/src/devspace-manager/tree/treeItems.ts

@@ -17,7 +17,6 @@ export function getSvgIconPath(
 ): IconPath {
   const icons = {
     landscape: { path: "common", name: "land.svg" },
-    landscape_ai: { path: "common", name: "land-ai.svg" },
     basic_error: { path: "devspace", name: "basic_error.svg" },
     basic_running: { path: "devspace", name: "basic_running.svg" },
     basic_not_running: { path: "devspace", name: "basic_not_running.svg" },

packages/app-studio-toolkit/test/devspace-manager/instance.spec.ts

@@ -114,9 +114,9 @@ describe("extension unit test", () => {
             `local-extension.landscape.set`,
             `local-extension.login`,
             `local-extension.dev-space.open-in-code`,
-            `local-extension.landscape.default-on`,
-            `local-extension.landscape.default-off`,
-            `local-extension.landscape.get-default-landscape`,
+            `app-studio-toolkit.devspace-manager.landscape.default-on`,
+            `app-studio-toolkit.devspace-manager.landscape.default-off`,
+            `app-studio-toolkit.devspace-manager.get-default-landscape`,
           ]
         )
       ).to.be.empty;
@@ -133,27 +133,31 @@ describe("extension unit test", () => {
       instance.initBasRemoteExplorer(context);
     });
 
-    it("command `local-extension.landscape.default-off`", async () => {
+    it("command `app-studio-toolkit.devspace-manager.landscape.default-off`", async () => {
       commandsMock
         .expects(`executeCommand`)
         .withExactArgs(`local-extension.tree.refresh`)
         .resolves();
       instance.initBasRemoteExplorer(context);
-      // eslint-disable-next-line @typescript-eslint/await-thenable -- ignore
-      expect(await registry.get(`local-extension.landscape.default-off`)!()).be
-        .undefined;
+      expect(
+        // eslint-disable-next-line @typescript-eslint/await-thenable -- ignore
+        await registry.get(
+          `app-studio-toolkit.devspace-manager.landscape.default-off`
+        )!()
+      ).be.undefined;
     });
 
-    it("command `local-extension.landscape.get-default-landscape`", () => {
+    it("command `app-studio-toolkit.devspace-manager.get-default-landscape`", () => {
       instance.initBasRemoteExplorer(context);
-      // eslint-disable-next-line @typescript-eslint/await-thenable -- ignore
-      expect(registry.get(`local-extension.landscape.get-default-landscape`)!())
-        .be.empty;
+      expect(
+        registry.get(
+          `app-studio-toolkit.devspace-manager.get-default-landscape`
+        )!()
+      ).be.empty;
     });
 
     it("command `local-extension.tree.refresh`", () => {
       instance.initBasRemoteExplorer(context);
-      // eslint-disable-next-line @typescript-eslint/await-thenable -- ignore
       expect(registry.get(`local-extension.tree.refresh`)!()).be.undefined;
     });
 

packages/app-studio-toolkit/test/devspace-manager/landscape/landscape.cont.spec.ts

@@ -185,6 +185,7 @@ describe("Landscape Module Tests", function () {
   });
 
   describe("setDefaultLandscape", function () {
+    const placeHolderText = "Select a landscape for AI metering";
     let mockCommands: SinonMock;
     let mockWindow: SinonMock;
 
@@ -217,8 +218,7 @@ describe("Landscape Module Tests", function () {
       mockWindow
         .expects("showQuickPick")
         .withExactArgs(items, {
-          placeHolder:
-            "Select the landscape in which you want to use as default",
+          placeHolder: placeHolderText,
           ignoreFocusOut: true,
         })
         .resolves(items[1]);
@@ -269,8 +269,7 @@ describe("Landscape Module Tests", function () {
       mockWindow
         .expects("showQuickPick")
         .withExactArgs(items, {
-          placeHolder:
-            "Select the landscape in which you want to use as default",
+          placeHolder: placeHolderText,
           ignoreFocusOut: true,
         })
         .resolves(undefined);
@@ -336,8 +335,7 @@ describe("Landscape Module Tests", function () {
       mockWindow
         .expects("showQuickPick")
         .withExactArgs(items, {
-          placeHolder:
-            "Select the landscape in which you want to use as default",
+          placeHolder: placeHolderText,
           ignoreFocusOut: true,
         })
         .resolves(items[items.length - 1]);
@@ -362,8 +360,7 @@ describe("Landscape Module Tests", function () {
       mockWindow
         .expects("showQuickPick")
         .withExactArgs(modifiedItems, {
-          placeHolder:
-            "Select the landscape in which you want to use as default",
+          placeHolder: placeHolderText,
           ignoreFocusOut: true,
         })
         .resolves(modifiedItems[2]);