Group icons, fix onCommand, remove group by menu items (#841)

StephenWeatherford · web-flow · commit 56e530b78367 · 2019-03-12T23:58:40.000-07:00
diff --git a/explorer/models/imageGroupNode.ts b/explorer/models/imageGroupNode.ts
@@ -12,7 +12,8 @@ import { NodeBase } from './nodeBase';
 export class ImageGroupNode extends NodeBase {
 
     constructor(
-        public readonly label: string
+        public readonly label: string,
+        public readonly iconName: string
     ) {
         super(label);
     }
@@ -28,8 +29,8 @@ export class ImageGroupNode extends NodeBase {
             collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,
             contextValue: this.contextValue,
             iconPath: {
-                light: path.join(imagesPath, 'light', 'application.svg'),
-                dark: path.join(imagesPath, 'dark', 'application.svg')
+                light: path.join(imagesPath, 'light', this.iconName),
+                dark: path.join(imagesPath, 'dark', this.iconName)
             }
         }
     }
diff --git a/explorer/models/rootNode.ts b/explorer/models/rootNode.ts
@@ -177,22 +177,27 @@ export class RootNode extends NodeBase {
             // Determine templates to use
             let groupLabelTemplate: string;
             let leafLabelTemplate: string;
+            let groupIconName: string;
             switch (ext.groupImagesBy) {
                 case ImageGrouping.None:
                     groupLabelTemplate = undefined; // (no group nodes)
                     leafLabelTemplate = '{fullTag} ({createdSince})';
+                    groupIconName = '';
                     break;
                 case ImageGrouping.ImageId:
                     groupLabelTemplate = '{shortImageId}';
                     leafLabelTemplate = '{fullTag} ({createdSince})';
+                    groupIconName = 'ApplicationGroup_16x.svg';
                     break;
                 case ImageGrouping.Repository:
                     groupLabelTemplate = '{repository}';
                     leafLabelTemplate = '{tag} ({createdSince})';
+                    groupIconName = 'Repository_16x.svg';
                     break;
                 case ImageGrouping.RepositoryName:
                     groupLabelTemplate = '{repositoryName}';
                     leafLabelTemplate = '{fullTag} ({createdSince})';
+                    groupIconName = 'ApplicationGroup_16x.svg';
                     break;
                 default:
                     assert(`Unexpected groupImagesBy ${ext.groupImagesBy}`);
@@ -232,7 +237,7 @@ export class RootNode extends NodeBase {
                     let groupLabel = getImageLabel(imageNode.fullTag, imageNode.imageDesc, groupLabelTemplate);
                     if (!groupsMap.has(groupLabel)) {
                         // Need a new top-level group node
-                        let groupNode = new ImageGroupNode(groupLabel);
+                        let groupNode = new ImageGroupNode(groupLabel, groupIconName);
                         groupsMap.set(groupLabel, groupNode);
                     }
 
diff --git a/extension.ts b/extension.ts
@@ -266,10 +266,6 @@ function registerDockerCommands(): void {
   );
 
   registerCommand('vscode-docker.images.selectGroupBy', selectGroupImagesBy);
-  registerCommand('vscode-docker.images.groupBy.none', () => groupImagesBy(ImageGrouping.None));
-  registerCommand('vscode-docker.images.groupBy.repository', () => groupImagesBy(ImageGrouping.Repository));
-  registerCommand('vscode-docker.images.groupBy.imageId', () => groupImagesBy(ImageGrouping.ImageId));
-  registerCommand('vscode-docker.images.groupBy.repositoryName', () => groupImagesBy(ImageGrouping.RepositoryName));
   registerCommand('vscode-docker.acr.createRegistry', createRegistry);
   registerCommand('vscode-docker.acr.deleteImage', deleteAzureImage);
   registerCommand('vscode-docker.acr.deleteRegistry', deleteAzureRegistry);
diff --git a/images/dark/ApplicationGroup_16x.svg b/images/dark/ApplicationGroup_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#c5c5c5;} .icon-vs-fg{fill:#F0EFF1;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 11h-5v5h-11v-11h5v-5h11v11z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M1 15h9v-9h-9v9zm1-6h7v5h-7v-5zm13-8v9h-4v-1h3v-5h-7v1h-1v-4h9z" id="iconBg"/><path class="icon-vs-fg" d="M2 9h7v5h-7v-5zm5-5v1h4v4h3v-5h-7z" id="iconFg" style="display: none;"/></svg>
diff --git a/images/light/ApplicationGroup_16x.svg b/images/light/ApplicationGroup_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"><style type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;}</style><path class="icon-canvas-transparent" d="M16 16h-16v-16h16v16z" id="canvas"/><path class="icon-vs-out" d="M16 11h-5v5h-11v-11h5v-5h11v11z" id="outline" style="display: none;"/><path class="icon-vs-bg" d="M1 15h9v-9h-9v9zm1-6h7v5h-7v-5zm13-8v9h-4v-1h3v-5h-7v1h-1v-4h9z" id="iconBg"/><path class="icon-vs-fg" d="M2 9h7v5h-7v-5zm5-5v1h4v4h3v-5h-7z" id="iconFg" style="display: none;"/></svg>
diff --git a/package.json b/package.json
@@ -66,6 +66,7 @@
     "onCommand:vscode-docker.image.inspect",
     "onCommand:vscode-docker.image.push",
     "onCommand:vscode-docker.image.remove",
+    "onCommand:vscode-docker.images.selectGroupBy",
     "onCommand:vscode-docker.image.tag",
     "onCommand:vscode-docker.setRegistryAsDefault",
     "onCommand:vscode-docker.system.prune",
@@ -94,22 +95,6 @@
         {
           "command": "vscode-docker.setRegistryAsDefault",
           "when": "never"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.none",
-          "when": "never"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.imageId",
-          "when": "never"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.repository",
-          "when": "never"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.repositoryName",
-          "when": "never"
         }
       ],
       "editor/context": [
@@ -294,26 +279,6 @@
           "when": "view == dockerExplorer && viewItem =~ /^(runningLocalContainerNode|stoppedLocalContainerNode|containersRootNode)$/",
           "group": "default"
         },
-        {
-          "command": "vscode-docker.images.groupBy.none",
-          "when": "view == dockerExplorer && viewItem =~ /^imagesRootNode$/",
-          "group": "9_grouping@1"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.repository",
-          "when": "view == dockerExplorer && viewItem =~ /^imagesRootNode$/",
-          "group": "9_grouping@2"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.repositoryName",
-          "when": "view == dockerExplorer && viewItem =~ /^imagesRootNode$/",
-          "group": "9_grouping@3"
-        },
-        {
-          "command": "vscode-docker.images.groupBy.imageId",
-          "when": "view == dockerExplorer && viewItem =~ /^imagesRootNode$/",
-          "group": "9_grouping@4"
-        },
         {
           "command": "vscode-docker.container.start",
           "when": "view == dockerExplorer && viewItem =~ /^(localImageNode|imagesRootNode)$/",
@@ -808,42 +773,6 @@
         },
         "category": "Docker"
       },
-      {
-        "command": "vscode-docker.images.groupBy.none",
-        "title": "No Grouping",
-        "icon": {
-          "light": "images/SortingGrouping_16x.svg",
-          "dark": "images/SortingGrouping_16x.svg"
-        },
-        "category": "Docker"
-      },
-      {
-        "command": "vscode-docker.images.groupBy.imageId",
-        "title": "Group by Image ID",
-        "icon": {
-          "light": "images/SortingGrouping_16x.svg",
-          "dark": "images/SortingGrouping_16x.svg"
-        },
-        "category": "Docker"
-      },
-      {
-        "command": "vscode-docker.images.groupBy.repository",
-        "title": "Group by Repository",
-        "icon": {
-          "light": "images/SortingGrouping_16x.svg",
-          "dark": "images/SortingGrouping_16x.svg"
-        },
-        "category": "Docker"
-      },
-      {
-        "command": "vscode-docker.images.groupBy.repositoryName",
-        "title": "Group by Repository Name",
-        "icon": {
-          "light": "images/SortingGrouping_16x.svg",
-          "dark": "images/SortingGrouping_16x.svg"
-        },
-        "category": "Docker"
-      },
       {
         "command": "vscode-docker.acr.createRegistry",
         "title": "Create Azure Registry",

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@ import { NodeBase } from './nodeBase';`
`12`	`12`	`export class ImageGroupNode extends NodeBase {`
`13`	`13`
`14`	`14`	`constructor(`
`15`		`- public readonly label: string`
	`15`	`+ public readonly label: string,`
	`16`	`+ public readonly iconName: string`
`16`	`17`	`) {`
`17`	`18`	`super(label);`
`18`	`19`	`}`
`@@ -28,8 +29,8 @@ export class ImageGroupNode extends NodeBase {`
`28`	`29`	`collapsibleState: vscode.TreeItemCollapsibleState.Collapsed,`
`29`	`30`	`contextValue: this.contextValue,`
`30`	`31`	`iconPath: {`
`31`		`- light: path.join(imagesPath, 'light', 'application.svg'),`
`32`		`- dark: path.join(imagesPath, 'dark', 'application.svg')`
	`32`	`+ light: path.join(imagesPath, 'light', this.iconName),`
	`33`	`+ dark: path.join(imagesPath, 'dark', this.iconName)`
`33`	`34`	`}`
`34`	`35`	`}`
`35`	`36`	`}`