Add compose grouping as default, add compose down/restart commands to group

extension.bundle.ts

@@ -43,5 +43,6 @@ export { DockerImage } from './src/docker/Images';
 export { DockerNetwork } from './src/docker/Networks';
 export { DockerVolume } from './src/docker/Volumes';
 export { CommandTemplate, selectCommandTemplate, defaultCommandTemplates } from './src/commands/selectCommandTemplate';
+export { NonComposeGroupName } from './src/tree/containers/ContainersTreeItem';
 
 export * from 'vscode-azureextensionui';

package.json

@@ -49,6 +49,8 @@
         "onCommand:vscode-docker.containers.start",
         "onCommand:vscode-docker.containers.stop",
         "onCommand:vscode-docker.containers.viewLogs",
+        "onCommand:vscode-docker.containers.composeGroup.restart",
+        "onCommand:vscode-docker.containers.composeGroup.down",
         "onCommand:vscode-docker.debugging.initializeForDebugging",
         "onCommand:vscode-docker.help.reportIssue",
         "onCommand:vscode-docker.images.build",
@@ -145,6 +147,14 @@
                 {
                     "command": "vscode-docker.registries.deployImageToAci",
                     "when": "vscode-docker:newCliPresent"
+                },
+                {
+                    "command": "vscode-docker.containers.composeGroup.restart",
+                    "when": "never"
+                },
+                {
+                    "command": "vscode-docker.containers.composeGroup.down",
+                    "when": "never"
                 }
             ],
             "editor/context": [
@@ -374,6 +384,16 @@
                     "when": "view == dockerContainers && viewItem =~ /container$/i",
                     "group": "containers_2_destructive@1"
                 },
+                {
+                    "command": "vscode-docker.containers.composeGroup.restart",
+                    "when": "view == dockerContainers && viewItem =~ /composeGroup$/i && !vscode-docker:aciContext",
+                    "group": "composeGroup_1_destructive@1"
+                },
+                {
+                    "command": "vscode-docker.containers.composeGroup.down",
+                    "when": "view == dockerContainers && viewItem =~ /composeGroup$/i && !vscode-docker:aciContext",
+                    "group": "composeGroup_1_destructive@2"
+                },
                 {
                     "command": "vscode-docker.images.run",
                     "when": "view == dockerImages && viewItem == image",
@@ -1741,7 +1761,7 @@
                 },
                 "docker.containers.groupBy": {
                     "type": "string",
-                    "default": "None",
+                    "default": "Compose Project Name",
                     "description": "%vscode-docker.config.docker.containers.groupBy%",
                     "enum": [
                         "Compose Project Name",
@@ -2286,6 +2306,16 @@
                 "title": "%vscode-docker.commands.containers.viewLogs%",
                 "category": "%vscode-docker.commands.category.dockerContainers%"
             },
+            {
+                "command": "vscode-docker.containers.composeGroup.restart",
+                "title": "%vscode-docker.commands.containers.composeGroup.restart%",
+                "category": "%vscode-docker.commands.category.dockerContainers%"
+            },
+            {
+                "command": "vscode-docker.containers.composeGroup.down",
+                "title": "%vscode-docker.commands.containers.composeGroup.down%",
+                "category": "%vscode-docker.commands.category.dockerContainers%"
+            },
             {
                 "command": "vscode-docker.debugging.initializeForDebugging",
                 "title": "%vscode-docker.commands.debugging.initializeForDebugging%",

package.nls.json

@@ -188,6 +188,8 @@
     "vscode-docker.commands.containers.start": "Start",
     "vscode-docker.commands.containers.stop": "Stop",
     "vscode-docker.commands.containers.viewLogs": "View Logs",
+    "vscode-docker.commands.containers.composeGroup.restart": "Compose Restart",
+    "vscode-docker.commands.containers.composeGroup.down": "Compose Down",
     "vscode-docker.commands.debugging.initializeForDebugging": "Initialize for Docker debugging",
     "vscode-docker.commands.help.reportIssue": "Report Issue",
     "vscode-docker.commands.images.build": "Build Image...",

src/commands/compose.ts

@@ -74,7 +74,7 @@ export async function composeRestart(context: IActionContext, dockerComposeFileU
     return await compose(context, ['down', 'up'], localize('vscode-docker.commands.compose.chooseRestart', 'Choose Docker Compose file to restart'), dockerComposeFileUri, selectedComposeFileUris);
 }
 
-async function rewriteCommandForNewCliIfNeeded(command: string): Promise<string> {
+export async function rewriteCommandForNewCliIfNeeded(command: string): Promise<string> {
     if ((await ext.dockerContextManager.getCurrentContext()).Type === 'aci') {
         // Replace 'docker-compose ' at the start of a string with 'docker compose ', and '--build' anywhere with ''
         return command.replace(/^docker-compose /, 'docker compose ').replace(/--build/, '');

src/commands/containers/composeGroup.ts

@@ -0,0 +1,40 @@
+/*---------------------------------------------------------------------------------------------
+ *  Copyright (c) Microsoft Corporation. All rights reserved.
+ *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
+ *--------------------------------------------------------------------------------------------*/
+
+import { IActionContext } from 'vscode-azureextensionui';
+import { ContainerGroupTreeItem } from '../../tree/containers/ContainerGroupTreeItem';
+import { ContainerTreeItem } from '../../tree/containers/ContainerTreeItem';
+import { executeAsTask } from '../../utils/executeAsTask';
+import { rewriteCommandForNewCliIfNeeded } from '../compose';
+
+export async function composeGroupRestart(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
+    return composeGroup(context, 'restart', node);
+}
+
+export async function composeGroupDown(context: IActionContext, node: ContainerGroupTreeItem): Promise<void> {
+    return composeGroup(context, 'down', node);
+}
+
+async function composeGroup(context: IActionContext, composeCommand: 'restart' | 'down', node: ContainerGroupTreeItem): Promise<void> {
+    const workingDirectory = getComposeWorkingDirectory(node);
+    const filesArgument = getComposeFiles(node).map(f => `-f ${f}`).join(' ');
+
+    const terminalCommand = `docker-compose ${filesArgument} ${composeCommand}`;
+
+    await executeAsTask(context, await rewriteCommandForNewCliIfNeeded(terminalCommand), 'Docker Compose', { addDockerEnv: true, cwd: workingDirectory, });
+}
+
+function getComposeWorkingDirectory(node: ContainerGroupTreeItem): string {
+    // Find a container with the `com.docker.compose.project.working_dir` label, which gives the working directory in which to execute the compose command
+    const container = (node.ChildTreeItems as ContainerTreeItem[]).find(c => c.labels['com.docker.compose.project.working_dir']);
+    return container.labels['com.docker.compose.project.working_dir'];
+}
+
+function getComposeFiles(node: ContainerGroupTreeItem): string[] {
+    // Find a container with the `com.docker.compose.project.config_files` label, which gives all the compose files (within the working directory) used to up this container
+    const container = (node.ChildTreeItems as ContainerTreeItem[]).find(c => c.labels['com.docker.compose.project.config_files']);
+    const filesLabel = container.labels['com.docker.compose.project.config_files'];
+    return filesLabel.split(',');
+}

src/commands/registerCommands.ts

@@ -14,6 +14,7 @@ import { viewAzureTaskLogs } from "../utils/lazyLoad";
 import { composeDown, composeRestart, composeUp } from "./compose";
 import { attachShellContainer } from "./containers/attachShellContainer";
 import { browseContainer } from "./containers/browseContainer";
+import { composeGroupDown, composeGroupRestart } from "./containers/composeGroup";
 import { configureContainersExplorer } from "./containers/configureContainersExplorer";
 import { inspectContainer } from "./containers/inspectContainer";
 import { pruneContainers } from "./containers/pruneContainers";
@@ -111,6 +112,8 @@ export function registerCommands(): void {
     registerCommand('vscode-docker.containers.start', startContainer);
     registerCommand('vscode-docker.containers.stop', stopContainer);
     registerWorkspaceCommand('vscode-docker.containers.viewLogs', viewContainerLogs);
+    registerCommand('vscode-docker.containers.composeGroup.restart', composeGroupRestart);
+    registerCommand('vscode-docker.containers.composeGroup.down', composeGroupDown);
 
     registerWorkspaceCommand('vscode-docker.images.build', buildImage);
     registerCommand('vscode-docker.images.configureExplorer', configureImagesExplorer);

src/tree/containers/ContainerGroupTreeItem.ts

@@ -3,18 +3,35 @@
  *  Licensed under the MIT License. See LICENSE.md in the project root for license information.
  *--------------------------------------------------------------------------------------------*/
 
+import { TreeItem, TreeItemCollapsibleState } from "vscode";
 import { AzExtTreeItem } from "vscode-azureextensionui";
 import { DockerContainer } from "../../docker/Containers";
 import { getThemedIconPath, IconPath } from "../IconPath";
 import { getImageGroupIcon } from "../images/ImageProperties";
 import { LocalGroupTreeItemBase } from "../LocalGroupTreeItemBase";
+import { LocalRootTreeItemBase } from "../LocalRootTreeItemBase";
 import { ContainerProperty, getContainerStateIcon } from "./ContainerProperties";
 
 export class ContainerGroupTreeItem extends LocalGroupTreeItemBase<DockerContainer, ContainerProperty> {
-    public static readonly contextValue: string = 'containerGroup';
-    public readonly contextValue: string = ContainerGroupTreeItem.contextValue;
     public childTypeLabel: string = 'container';
 
+    public constructor(parent: LocalRootTreeItemBase<DockerContainer, ContainerProperty>, group: string, items: DockerContainer[]) {
+        super(parent, group, items);
+
+        if (this.parent.groupBySetting === 'Compose Project Name') {
+            // Expand compose group nodes by default
+            (this as TreeItem).collapsibleState = TreeItemCollapsibleState.Expanded;
+        }
+    }
+
+    public get contextValue(): string {
+        if (this.parent.groupBySetting === 'Compose Project Name') {
+            return 'containerGroup;composeGroup';
+        }
+
+        return 'containerGroup';
+    }
+
     public get iconPath(): IconPath {
         let icon: string;
         switch (this.parent.groupBySetting) {

src/tree/containers/ContainerTreeItem.ts

@@ -41,6 +41,10 @@ export class ContainerTreeItem extends AzExtTreeItemIntermediate {
         return this._item.Image;
     }
 
+    public get labels(): { [key: string]: string } {
+        return this._item.Labels;
+    }
+
     public get label(): string {
         return ext.containersRoot.getTreeItemLabel(this._item);
     }

src/tree/containers/ContainersTreeItem.ts

@@ -124,6 +124,10 @@ export class ContainersTreeItem extends LocalRootTreeItemBase<DockerContainer, C
 export const NonComposeGroupName = localize('vscode-docker.tree.containers.otherContainers', 'Other Containers');
 
 export function getComposeProjectName(container: DockerContainer): string {
+    if (!container.Labels) {
+        return NonComposeGroupName;
+    }
+
     const labels = Object.keys(container.Labels)
         .map(label => ({ label: label, value: container.Labels[label] }));