Single revision only (reduce amount of code to review)

Author: MicroFish91

src/commands/registerCommands.ts

@@ -26,9 +26,7 @@ import { activateRevision } from './revision/activateRevision';
 import { chooseRevisionMode } from './revision/chooseRevisionMode';
 import { deactivateRevision } from './revision/deactivateRevision';
 import { restartRevision } from './revision/restartRevision';
-import { createRevisionDraft } from './revisionDraft/createRevisionDraft';
 import { discardRevisionDraft } from './revisionDraft/discardRevisionDraft';
-import { editRevisionDraft } from './revisionDraft/editRevisionDraft';
 import { addScaleRule } from './scaling/addScaleRule/addScaleRule';
 import { editScalingRange } from './scaling/editScalingRange';
 
@@ -64,8 +62,8 @@ export function registerCommands(): void {
     registerCommandWithTreeNodeUnwrapping('containerApps.restartRevision', restartRevision);
 
     // revision draft
-    registerCommandWithTreeNodeUnwrapping('containerApps.createRevisionDraft', createRevisionDraft);
-    registerCommandWithTreeNodeUnwrapping('containerApps.editRevisionDraft', editRevisionDraft);
+    registerCommandWithTreeNodeUnwrapping('containerApps.createRevisionDraft', () => { throw new Error('Create revision draft not yet implemented.') });
+    registerCommandWithTreeNodeUnwrapping('containerApps.editRevisionDraft', () => { throw new Error('Edit revision draft not yet implemented.') });
     registerCommandWithTreeNodeUnwrapping('containerApps.deployRevisionDraft', () => { throw new Error('Deploy revision draft not yet implemented.') });
     registerCommandWithTreeNodeUnwrapping('containerApps.discardRevisionDraft', discardRevisionDraft);
 

src/commands/revisionDraft/createRevisionDraft.ts

@@ -33,12 +33,8 @@ export class RevisionItem implements RevisionsItemModel {
         this.revisionsMode = containerApp.revisionsMode;
     }
 
-    get contextValue(): string {
+    private get contextValue(): string {
         const values: string[] = [RevisionItem.contextValue];
-
-        // Enable more granular tree item filtering by revision name
-        values.push(nonNullProp(this.revision, 'name'));
-
         values.push(this.revision.active ? revisionStateActiveContextValue : revisionStateInactiveContextValue);
         values.push(this.revisionsMode === KnownActiveRevisionsMode.Single ? revisionModeSingleContextValue : revisionModeMultipleContextValue);
         return createContextValue(values);
@@ -80,7 +76,7 @@ export class RevisionItem implements RevisionsItemModel {
 
     private get iconPath(): TreeItemIconPath {
         if (this.revisionsMode === KnownActiveRevisionsMode.Single) {
-            return treeUtils.getIconPath('02885-icon-menu-Container-Revision-Active');
+            return treeUtils.getIconPath('active-revision');
         }
 
         let id: string;

src/commands/revisionDraft/editRevisionDraft.ts

@@ -3,57 +3,41 @@
 *  Licensed under the MIT License. See License.txt in the project root for license information.
 *--------------------------------------------------------------------------------------------*/
 
-import { Revision } from "@azure/arm-appcontainers";
 import { uiUtils } from "@microsoft/vscode-azext-azureutils";
 import { TreeElementBase, callWithTelemetryAndErrorHandling, createContextValue, createSubscriptionContext } from "@microsoft/vscode-azext-utils";
 import type { AzureSubscription } from "@microsoft/vscode-azureresources-api";
 import { TreeItem, TreeItemCollapsibleState } from "vscode";
-import { revisionDraftFalseContextValue, revisionDraftTrueContextValue } from "../../constants";
-import { ext } from "../../extensionVariables";
 import { createContainerAppsAPIClient } from "../../utils/azureClients";
 import { localize } from "../../utils/localize";
 import { treeUtils } from "../../utils/treeUtils";
 import type { ContainerAppModel } from "../ContainerAppItem";
 import type { ContainerAppsItem } from "../ContainerAppsBranchDataProvider";
-import { RevisionDraftItem } from "./RevisionDraftItem";
 import { RevisionItem } from "./RevisionItem";
 
 export class RevisionsItem implements ContainerAppsItem {
-    static readonly idSuffix: string = 'revisions';
     static readonly contextValue: string = 'revisionsItem';
     static readonly contextValueRegExp: RegExp = new RegExp(RevisionsItem.contextValue);
 
     id: string;
 
-    constructor(readonly subscription: AzureSubscription, readonly containerApp: ContainerAppModel) {
-        this.id = `${containerApp.id}/${RevisionsItem.idSuffix}`;
+    constructor(public readonly subscription: AzureSubscription, public readonly containerApp: ContainerAppModel) {
+        this.id = `${containerApp.id}/Revisions`;
     }
 
-    get contextValue(): string {
+    private get contextValue(): string {
         const values: string[] = [RevisionsItem.contextValue];
-        values.push(ext.revisionDraftFileSystem.doesContainerAppsItemHaveRevisionDraft(this) ? revisionDraftTrueContextValue : revisionDraftFalseContextValue);
+        // values.push(ext.revisionDraftFileSystem.doesContainerAppsItemHaveRevisionDraft(this) ? 'revisionDraft:true' : 'revisionDraft:false');
         return createContextValue(values);
     }
 
     async getChildren(): Promise<TreeElementBase[]> {
-        const revisionDraftBaseName: string | undefined = ext.revisionDraftFileSystem.getRevisionDraftFile(this)?.baseRevisionName;
-        let draftBaseRevision: Revision | undefined;
-
-        const result = (await callWithTelemetryAndErrorHandling('getChildren', async (context) => {
+        const result = await callWithTelemetryAndErrorHandling('getChildren', async (context) => {
             const client = await createContainerAppsAPIClient([context, createSubscriptionContext(this.subscription)]);
             const revisions = await uiUtils.listAllIterator(client.containerAppsRevisions.listRevisions(this.containerApp.resourceGroup, this.containerApp.name));
-            return revisions.map(revision => {
-                if (revision.name === revisionDraftBaseName) {
-                    draftBaseRevision = revision;
-                }
-                return new RevisionItem(this.subscription, this.containerApp, revision)
-            });
-        }))?.reverse() ?? [];
+            return revisions.map(revision => new RevisionItem(this.subscription, this.containerApp, revision));
+        });
 
-        return draftBaseRevision ? [
-            new RevisionDraftItem(this.subscription, this.containerApp, draftBaseRevision),
-            ...result.filter(item => item.revision.name !== revisionDraftBaseName)
-        ] : result;
+        return result?.reverse() ?? [];
     }
 
     getTreeItem(): TreeItem {