Reconfigure files and commands to fit the new revision management UI

package.json

@@ -220,23 +220,23 @@
                 },
                 {
                     "command": "containerApps.chooseRevisionMode",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|revisions$/i",
-                    "group": "2@4"
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && (viewItem =~ /revisionItem(.*)revisionMode:single/i || viewItem =~ /revisionsItem/i)",
+                    "group": "2@1"
                 },
                 {
                     "command": "containerApps.activateRevision",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^inactive;revision[^a-z]/i",
-                    "group": "2@1"
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionMode:multiple(.*)revisionState:inactive/i",
+                    "group": "2@2"
                 },
                 {
                     "command": "containerApps.deactivateRevision",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^active;revision[^a-z]/i",
-                    "group": "2@2"
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionMode:multiple(.*)revisionState:active/i",
+                    "group": "2@3"
                 },
                 {
                     "command": "containerApps.restartRevision",
-                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^active;revision[^a-z]/i",
-                    "group": "2@3"
+                    "when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionState:active/i",
+                    "group": "2@4"
                 },
                 {
                     "command": "containerApps.disableIngress",

src/commands/ingress/editTargetPort/editTargetPort.ts

@@ -4,8 +4,8 @@
 *--------------------------------------------------------------------------------------------*/
 
 import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, createSubscriptionContext, IActionContext } from "@microsoft/vscode-azext-utils";
+import { IngressItem } from "../../../tree/configurations/IngressItem";
 import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
-import { IngressItem } from "../../../tree/IngressItem";
 import { createActivityContext } from "../../../utils/activityUtils";
 import { localize } from "../../../utils/localize";
 import { pickContainerApp } from "../../../utils/pickContainerApp";

src/commands/ingress/toggleIngressVisibility/toggleIngressVisibility.ts

@@ -2,7 +2,7 @@ import type { Ingress } from "@azure/arm-appcontainers";
 import { AzureWizard, AzureWizardExecuteStep, IActionContext, createSubscriptionContext, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
 import { IngressConstants } from "../../../constants";
 import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
-import type { IngressItem } from "../../../tree/IngressItem";
+import type { IngressItem } from "../../../tree/configurations/IngressItem";
 import { createActivityContext } from "../../../utils/activityUtils";
 import { localize } from "../../../utils/localize";
 import { pickContainerApp } from "../../../utils/pickContainerApp";

src/commands/registerCommands.ts

@@ -5,7 +5,6 @@
 
 import { registerCommandWithTreeNodeUnwrapping, registerErrorHandler, registerReportIssueCommand } from '@microsoft/vscode-azext-utils';
 import { browseContainerAppNode } from './browseContainerApp';
-import { chooseRevisionMode } from './chooseRevisionMode';
 import { createContainerApp } from './createContainerApp/createContainerApp';
 import { createManagedEnvironment } from './createManagedEnvironment/createManagedEnvironment';
 import { deleteContainerApp } from './deleteContainerApp/deleteContainerApp';
@@ -22,9 +21,10 @@ import { toggleIngressVisibility } from './ingress/toggleIngressVisibility/toggl
 import { startStreamingLogs } from './logStream/startStreamingLogs';
 import { stopStreamingLogs } from './logStream/stopStreamingLogs';
 import { openConsoleInPortal } from './openConsoleInPortal';
-import { activateRevision } from './revisionCommands/activateRevision';
-import { deactivateRevision } from './revisionCommands/deactivateRevision';
-import { restartRevision } from './revisionCommands/restartRevision';
+import { activateRevision } from './revision/activateRevision';
+import { chooseRevisionMode } from './revision/chooseRevisionMode';
+import { deactivateRevision } from './revision/deactivateRevision';
+import { restartRevision } from './revision/restartRevision';
 import { addScaleRule } from './scaling/addScaleRule/addScaleRule';
 import { editScalingRange } from './scaling/editScalingRange';
 

src/commands/revisionCommands/activateRevision.ts → src/commands/revision/activateRevision.ts

@@ -3,11 +3,10 @@
  *  Licensed under the MIT License. See License.txt in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
-import { IActionContext } from "@microsoft/vscode-azext-utils";
-import { ContainerAppItem } from "../../tree/ContainerAppItem";
-import { RevisionItem } from "../../tree/RevisionItem";
+import type { IActionContext } from "@microsoft/vscode-azext-utils";
+import type { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
 import { executeRevisionOperation } from "./changeRevisionActiveState";
 
-export function activateRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
+export function activateRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
     return executeRevisionOperation(context, node, 'activateRevision');
 }

src/commands/revisionCommands/changeRevisionActiveState.ts → src/commands/revision/changeRevisionActiveState.ts

@@ -6,13 +6,12 @@
 import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
 import { IActionContext, nonNullProp } from "@microsoft/vscode-azext-utils";
 import { ext } from "../../extensionVariables";
-import { ContainerAppItem } from "../../tree/ContainerAppItem";
-import { RevisionItem } from "../../tree/RevisionItem";
+import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
 import { createContainerAppsClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
 import { pickContainerApp } from "../../utils/pickContainerApp";
 
-export async function executeRevisionOperation(context: IActionContext, node: ContainerAppItem | RevisionItem | undefined, operation: RevisionOperation): Promise<void> {
+export async function executeRevisionOperation(context: IActionContext, node: RevisionItem | undefined, operation: RevisionOperation): Promise<void> {
     const item = node ?? await pickContainerApp(context);
 
     await ext.state.runWithTemporaryDescription(item.id, revisionOperationDescriptions[operation], async () => {

src/commands/chooseRevisionMode.ts → src/commands/revision/chooseRevisionMode.ts

@@ -4,16 +4,16 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
-import { IActionContext, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
+import type { IActionContext, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
 import { ProgressLocation, window } from "vscode";
-import { ext } from "../extensionVariables";
-import { ContainerAppModel } from "../tree/ContainerAppItem";
-import { ContainerAppsItem } from "../tree/ContainerAppsBranchDataProvider";
-import { localize } from "../utils/localize";
-import { pickContainerApp } from "../utils/pickContainerApp";
-import { updateContainerApp } from "./deployContainerApp/updateContainerApp";
-
-export async function chooseRevisionMode(context: IActionContext, node?: ContainerAppsItem): Promise<void> {
+import { ext } from "../../extensionVariables";
+import type { ContainerAppModel } from "../../tree/ContainerAppItem";
+import type { RevisionsItem } from "../../tree/revisionManagement/RevisionsItem";
+import { localize } from "../../utils/localize";
+import { pickContainerApp } from "../../utils/pickContainerApp";
+import { updateContainerApp } from "../deployContainerApp/updateContainerApp";
+
+export async function chooseRevisionMode(context: IActionContext, node?: RevisionsItem): Promise<void> {
     const { subscription, containerApp } = node ?? await pickContainerApp(context);
 
     const pickedRevisionMode = await pickRevisionsMode(context, containerApp);

src/commands/revisionCommands/deactivateRevision.ts → src/commands/revision/deactivateRevision.ts

@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext } from "@microsoft/vscode-azext-utils";
-import { ContainerAppItem } from "../../tree/ContainerAppItem";
-import { RevisionItem } from "../../tree/RevisionItem";
+import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
 import { executeRevisionOperation } from "./changeRevisionActiveState";
 
-export function deactivateRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
+export function deactivateRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
     return executeRevisionOperation(context, node, 'deactivateRevision');
 }

src/commands/revisionCommands/restartRevision.ts → src/commands/revision/restartRevision.ts

@@ -4,10 +4,9 @@
  *--------------------------------------------------------------------------------------------*/
 
 import { IActionContext } from "@microsoft/vscode-azext-utils";
-import { ContainerAppItem } from "../../tree/ContainerAppItem";
-import { RevisionItem } from "../../tree/RevisionItem";
+import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
 import { executeRevisionOperation } from "./changeRevisionActiveState";
 
-export function restartRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
+export function restartRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
     return executeRevisionOperation(context, node, 'restartRevision');
 }

src/tree/ContainerAppItem.ts

@@ -16,11 +16,11 @@ import { createContainerAppsAPIClient, createContainerAppsClient } from "../util
 import { createPortalUrl } from "../utils/createPortalUrl";
 import { localize } from "../utils/localize";
 import { treeUtils } from "../utils/treeUtils";
-import { ConfigurationItem } from "./ConfigurationItem";
 import { ContainerAppsItem, TreeElementBase } from "./ContainerAppsBranchDataProvider";
 import { LogsItem } from "./LogsItem";
-import { RevisionItem } from "./RevisionItem";
-import { RevisionsItem } from "./RevisionsItem";
+import { ConfigurationItem } from "./configurations/ConfigurationItem";
+import { RevisionItem } from "./revisionManagement/RevisionItem";
+import { RevisionsItem } from "./revisionManagement/RevisionsItem";
 
 export interface ContainerAppModel extends ContainerApp {
     id: string;

src/tree/ConfigurationItem.ts → src/tree/configurations/ConfigurationItem.ts

@@ -3,15 +3,17 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { callWithTelemetryAndErrorHandling } from "@microsoft/vscode-azext-utils";
-import { AzureSubscription } from "@microsoft/vscode-azureresources-api";
+import { callWithTelemetryAndErrorHandling, nonNullProp } from "@microsoft/vscode-azext-utils";
+import { AzureSubscription, ViewPropertiesModel } from "@microsoft/vscode-azureresources-api";
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
-import { localize } from "../utils/localize";
-import { ContainerAppModel } from "./ContainerAppItem";
-import { ContainerAppsItem, TreeElementBase } from "./ContainerAppsBranchDataProvider";
+import { localize } from "../../utils/localize";
+import { ContainerAppModel } from "../ContainerAppItem";
+import { ContainerAppsItem, TreeElementBase } from "../ContainerAppsBranchDataProvider";
+import { ActionsTreeItem } from "../gitHub/ActionsTreeItem";
 import { DaprEnabledItem, createDaprDisabledItem } from "./DaprItem";
 import { IngressDisabledItem, IngressItem } from "./IngressItem";
-import { ActionsTreeItem } from "./gitHub/ActionsTreeItem";
+
+const configuration: string = localize('configuration', 'Configuration');
 
 export class ConfigurationItem implements ContainerAppsItem {
     id: string;
@@ -21,6 +23,11 @@ export class ConfigurationItem implements ContainerAppsItem {
         this.id = `${containerApp.id}/Configurations`;
     }
 
+    viewProperties: ViewPropertiesModel = {
+        data: nonNullProp(this.containerApp, 'configuration'),
+        label: `${this.containerApp.name} ${configuration}`,
+    }
+
     async getChildren(): Promise<TreeElementBase[]> {
         const result = await callWithTelemetryAndErrorHandling('getChildren', async (_context) => {
             const children: TreeElementBase[] = [];

src/tree/DaprItem.ts → src/tree/configurations/DaprItem.ts

@@ -7,10 +7,10 @@ import { ContainerApp, Dapr } from "@azure/arm-appcontainers";
 import { createGenericElement } from "@microsoft/vscode-azext-utils";
 import { ViewPropertiesModel } from "@microsoft/vscode-azureresources-api";
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
-import { localize } from "../utils/localize";
-import { treeUtils } from "../utils/treeUtils";
-import { ContainerAppModel } from "./ContainerAppItem";
-import { TreeElementBase } from "./ContainerAppsBranchDataProvider";
+import { localize } from "../../utils/localize";
+import { treeUtils } from "../../utils/treeUtils";
+import { ContainerAppModel } from "../ContainerAppItem";
+import { TreeElementBase } from "../ContainerAppsBranchDataProvider";
 
 export class DaprEnabledItem implements TreeElementBase {
 

src/tree/IngressItem.ts → src/tree/configurations/IngressItem.ts

@@ -7,11 +7,11 @@ import { ContainerApp, Ingress } from "@azure/arm-appcontainers";
 import { createGenericElement } from "@microsoft/vscode-azext-utils";
 import { AzureSubscription, ViewPropertiesModel } from "@microsoft/vscode-azureresources-api";
 import { ThemeIcon, TreeItem, TreeItemCollapsibleState } from "vscode";
-import { IngressConstants, azResourceContextValue } from "../constants";
-import { localize } from "../utils/localize";
-import { treeUtils } from "../utils/treeUtils";
-import { ContainerAppModel } from "./ContainerAppItem";
-import { ContainerAppsItem, TreeElementBase } from "./ContainerAppsBranchDataProvider";
+import { IngressConstants, azResourceContextValue } from "../../constants";
+import { localize } from "../../utils/localize";
+import { treeUtils } from "../../utils/treeUtils";
+import { ContainerAppModel } from "../ContainerAppItem";
+import { ContainerAppsItem, TreeElementBase } from "../ContainerAppsBranchDataProvider";
 
 const label: string = localize('ingress', 'Ingress');