Skip to content

Commit 6511189

Browse files
MicroFish91MicroFish91
authored
Reconfigure files and commands to fit the new revision management UI (#390)
1 parent bbb6c4c commit 6511189

File tree

17 files changed

+139
-84
lines changed

17 files changed

+139
-84
lines changed

‎package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -220,23 +220,23 @@
220220
},
221221
{
222222
"command": "containerApps.chooseRevisionMode",
223-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|revisions$/i",
224-
"group": "2@4"
223+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && (viewItem =~ /revisionItem(.*)revisionMode:single/i || viewItem =~ /revisionsItem/i)",
224+
"group": "2@1"
225225
},
226226
{
227227
"command": "containerApps.activateRevision",
228-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^inactive;revision[^a-z]/i",
229-
"group": "2@1"
228+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionMode:multiple(.*)revisionState:inactive/i",
229+
"group": "2@2"
230230
},
231231
{
232232
"command": "containerApps.deactivateRevision",
233-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^active;revision[^a-z]/i",
234-
"group": "2@2"
233+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionMode:multiple(.*)revisionState:active/i",
234+
"group": "2@3"
235235
},
236236
{
237237
"command": "containerApps.restartRevision",
238-
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionmode:single|^active;revision[^a-z]/i",
239-
"group": "2@3"
238+
"when": "view =~ /(azureResourceGroups|azureFocusView)/ && viewItem =~ /revisionItem(.*)revisionState:active/i",
239+
"group": "2@4"
240240
},
241241
{
242242
"command": "containerApps.disableIngress",

‎resources/02889-icon-menu-Container-Revision-Management.svg‎

Lines changed: 29 additions & 0 deletions
Loading

‎src/commands/ingress/editTargetPort/editTargetPort.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { AzureWizard, AzureWizardExecuteStep, AzureWizardPromptStep, createSubscriptionContext, IActionContext } from "@microsoft/vscode-azext-utils";
7+
import { IngressItem } from "../../../tree/configurations/IngressItem";
78
import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
8-
import { IngressItem } from "../../../tree/IngressItem";
99
import { createActivityContext } from "../../../utils/activityUtils";
1010
import { localize } from "../../../utils/localize";
1111
import { pickContainerApp } from "../../../utils/pickContainerApp";

‎src/commands/ingress/toggleIngressVisibility/toggleIngressVisibility.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import type { Ingress } from "@azure/arm-appcontainers";
22
import { AzureWizard, AzureWizardExecuteStep, IActionContext, createSubscriptionContext, nonNullValueAndProp } from "@microsoft/vscode-azext-utils";
33
import { IngressConstants } from "../../../constants";
44
import type { ContainerAppItem } from "../../../tree/ContainerAppItem";
5-
import type { IngressItem } from "../../../tree/IngressItem";
5+
import type { IngressItem } from "../../../tree/configurations/IngressItem";
66
import { createActivityContext } from "../../../utils/activityUtils";
77
import { localize } from "../../../utils/localize";
88
import { pickContainerApp } from "../../../utils/pickContainerApp";

‎src/commands/registerCommands.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { registerCommandWithTreeNodeUnwrapping, registerErrorHandler, registerReportIssueCommand } from '@microsoft/vscode-azext-utils';
77
import { browseContainerAppNode } from './browseContainerApp';
8-
import { chooseRevisionMode } from './chooseRevisionMode';
98
import { createContainerApp } from './createContainerApp/createContainerApp';
109
import { createManagedEnvironment } from './createManagedEnvironment/createManagedEnvironment';
1110
import { deleteContainerApp } from './deleteContainerApp/deleteContainerApp';
@@ -22,9 +21,10 @@ import { toggleIngressVisibility } from './ingress/toggleIngressVisibility/toggl
2221
import { startStreamingLogs } from './logStream/startStreamingLogs';
2322
import { stopStreamingLogs } from './logStream/stopStreamingLogs';
2423
import { openConsoleInPortal } from './openConsoleInPortal';
25-
import { activateRevision } from './revisionCommands/activateRevision';
26-
import { deactivateRevision } from './revisionCommands/deactivateRevision';
27-
import { restartRevision } from './revisionCommands/restartRevision';
24+
import { activateRevision } from './revision/activateRevision';
25+
import { chooseRevisionMode } from './revision/chooseRevisionMode';
26+
import { deactivateRevision } from './revision/deactivateRevision';
27+
import { restartRevision } from './revision/restartRevision';
2828
import { addScaleRule } from './scaling/addScaleRule/addScaleRule';
2929
import { editScalingRange } from './scaling/editScalingRange';
3030

src/commands/revisionCommands/activateRevision.ts renamed to src/commands/revision/activateRevision.ts

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
* Licensed under the MIT License. See License.txt in the project root for license information.
44
*--------------------------------------------------------------------------------------------*/
55

6-
import { IActionContext } from "@microsoft/vscode-azext-utils";
7-
import { ContainerAppItem } from "../../tree/ContainerAppItem";
8-
import { RevisionItem } from "../../tree/RevisionItem";
6+
import type { IActionContext } from "@microsoft/vscode-azext-utils";
7+
import type { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
98
import { executeRevisionOperation } from "./changeRevisionActiveState";
109

11-
export function activateRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
10+
export function activateRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
1211
return executeRevisionOperation(context, node, 'activateRevision');
1312
}

src/commands/revisionCommands/changeRevisionActiveState.ts renamed to src/commands/revision/changeRevisionActiveState.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
import { ContainerAppsAPIClient } from "@azure/arm-appcontainers";
77
import { IActionContext, nonNullProp } from "@microsoft/vscode-azext-utils";
88
import { ext } from "../../extensionVariables";
9-
import { ContainerAppItem } from "../../tree/ContainerAppItem";
10-
import { RevisionItem } from "../../tree/RevisionItem";
9+
import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
1110
import { createContainerAppsClient } from "../../utils/azureClients";
1211
import { localize } from "../../utils/localize";
1312
import { pickContainerApp } from "../../utils/pickContainerApp";
1413

15-
export async function executeRevisionOperation(context: IActionContext, node: ContainerAppItem | RevisionItem | undefined, operation: RevisionOperation): Promise<void> {
14+
export async function executeRevisionOperation(context: IActionContext, node: RevisionItem | undefined, operation: RevisionOperation): Promise<void> {
1615
const item = node ?? await pickContainerApp(context);
1716

1817
await ext.state.runWithTemporaryDescription(item.id, revisionOperationDescriptions[operation], async () => {

src/commands/chooseRevisionMode.ts renamed to src/commands/revision/chooseRevisionMode.ts

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { KnownActiveRevisionsMode } from "@azure/arm-appcontainers";
7-
import { IActionContext, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
7+
import type { IActionContext, IAzureQuickPickItem } from "@microsoft/vscode-azext-utils";
88
import { ProgressLocation, window } from "vscode";
9-
import { ext } from "../extensionVariables";
10-
import { ContainerAppModel } from "../tree/ContainerAppItem";
11-
import { ContainerAppsItem } from "../tree/ContainerAppsBranchDataProvider";
12-
import { localize } from "../utils/localize";
13-
import { pickContainerApp } from "../utils/pickContainerApp";
14-
import { updateContainerApp } from "./deployContainerApp/updateContainerApp";
15-
16-
export async function chooseRevisionMode(context: IActionContext, node?: ContainerAppsItem): Promise<void> {
9+
import { ext } from "../../extensionVariables";
10+
import type { ContainerAppModel } from "../../tree/ContainerAppItem";
11+
import type { RevisionsItem } from "../../tree/revisionManagement/RevisionsItem";
12+
import { localize } from "../../utils/localize";
13+
import { pickContainerApp } from "../../utils/pickContainerApp";
14+
import { updateContainerApp } from "../deployContainerApp/updateContainerApp";
15+
16+
export async function chooseRevisionMode(context: IActionContext, node?: RevisionsItem): Promise<void> {
1717
const { subscription, containerApp } = node ?? await pickContainerApp(context);
1818

1919
const pickedRevisionMode = await pickRevisionsMode(context, containerApp);

src/commands/revisionCommands/deactivateRevision.ts renamed to src/commands/revision/deactivateRevision.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { IActionContext } from "@microsoft/vscode-azext-utils";
7-
import { ContainerAppItem } from "../../tree/ContainerAppItem";
8-
import { RevisionItem } from "../../tree/RevisionItem";
7+
import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
98
import { executeRevisionOperation } from "./changeRevisionActiveState";
109

11-
export function deactivateRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
10+
export function deactivateRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
1211
return executeRevisionOperation(context, node, 'deactivateRevision');
1312
}

src/commands/revisionCommands/restartRevision.ts renamed to src/commands/revision/restartRevision.ts

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,9 @@
44
*--------------------------------------------------------------------------------------------*/
55

66
import { IActionContext } from "@microsoft/vscode-azext-utils";
7-
import { ContainerAppItem } from "../../tree/ContainerAppItem";
8-
import { RevisionItem } from "../../tree/RevisionItem";
7+
import { RevisionItem } from "../../tree/revisionManagement/RevisionItem";
98
import { executeRevisionOperation } from "./changeRevisionActiveState";
109

11-
export function restartRevision(context: IActionContext, node?: ContainerAppItem | RevisionItem): Promise<void> {
10+
export function restartRevision(context: IActionContext, node?: RevisionItem): Promise<void> {
1211
return executeRevisionOperation(context, node, 'restartRevision');
1312
}

0 commit comments

Comments
 (0)
⚡