229 icons for resources and grouped regions (#230)

* Icons for resources and grouped regions Signed-off-by: Rajat Sahrawat <[email protected]> * Updated icons for Library and web resources Signed-off-by: Rushabh Sojitra <[email protected]> * updated changelog Signed-off-by: Rushabh Sojitra <[email protected]> * Refined grouped region icons Signed-off-by: Rajat Sahrawat <[email protected]> * Updated as some icons not visible on linux Signed-off-by: enam-khan <[email protected]> * updated icon for libraryTree Signed-off-by: Rushabh Sojitra <[email protected]> * Updated changelog Signed-off-by: Rushabh Sojitra <[email protected]> * prevent changing library icon on collapse event Signed-off-by: Andrew Twydell <[email protected]> --------- Signed-off-by: Rajat Sahrawat <[email protected]> Signed-off-by: Rushabh Sojitra <[email protected]> Signed-off-by: enam-khan <[email protected]> Signed-off-by: Andrew Twydell <[email protected]> Co-authored-by: Rajat Sahrawat <[email protected]> Co-authored-by: enam-khan <[email protected]> Co-authored-by: Andrew Twydell <[email protected]>
zowe · Feb 13, 2025 · 3ff6d32 · 3ff6d32
1 parent 3915b10
commit 3ff6d32
Show file tree

Hide file tree

Showing 24 changed files with 221 additions and 28 deletions.
diff --git a/packages/vsce/CHANGELOG.md b/packages/vsce/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 All notable changes to the "cics-extension-for-zowe" extension will be documented in this file.
 
+## Recent Changes
+
+- Enhancement: Create icons for library and Web resources. [#229](https://github.com/zowe/cics-for-zowe-client/issues/229)
+
 ## `3.3.3`
 - BugFix: Duplicate CICSplex exist when connecting to a multi-CMAS system. [#227](https://github.com/zowe/cics-for-zowe-client/issues/227)
 - Enhancement: Show CMCI error response codes when failing to make requests. [#220](https://github.com/zowe/cics-for-zowe-client/issues/220)

diff --git a/packages/vsce/resources/imgs/grouped-region-closed-dark.svg b/packages/vsce/resources/imgs/grouped-region-closed-dark.svg
diff --git a/packages/vsce/resources/imgs/grouped-region-closed-light.svg b/packages/vsce/resources/imgs/grouped-region-closed-light.svg
diff --git a/packages/vsce/resources/imgs/grouped-region-open-dark.svg b/packages/vsce/resources/imgs/grouped-region-open-dark.svg
diff --git a/packages/vsce/resources/imgs/grouped-region-open-light.svg b/packages/vsce/resources/imgs/grouped-region-open-light.svg
diff --git a/packages/vsce/resources/imgs/library-dark.svg b/packages/vsce/resources/imgs/library-dark.svg
diff --git a/packages/vsce/resources/imgs/library-dataset-dark.svg b/packages/vsce/resources/imgs/library-dataset-dark.svg
diff --git a/packages/vsce/resources/imgs/library-dataset-light.svg b/packages/vsce/resources/imgs/library-dataset-light.svg
diff --git a/packages/vsce/resources/imgs/library-light.svg b/packages/vsce/resources/imgs/library-light.svg
diff --git a/packages/vsce/resources/imgs/pipeline-dark.svg b/packages/vsce/resources/imgs/pipeline-dark.svg
diff --git a/packages/vsce/resources/imgs/pipeline-light.svg b/packages/vsce/resources/imgs/pipeline-light.svg
diff --git a/packages/vsce/resources/imgs/tcp-ip-service-dark.svg b/packages/vsce/resources/imgs/tcp-ip-service-dark.svg
diff --git a/packages/vsce/resources/imgs/tcp-ip-service-light.svg b/packages/vsce/resources/imgs/tcp-ip-service-light.svg
diff --git a/packages/vsce/resources/imgs/uri-map-dark.svg b/packages/vsce/resources/imgs/uri-map-dark.svg
diff --git a/packages/vsce/resources/imgs/uri-map-light.svg b/packages/vsce/resources/imgs/uri-map-light.svg
diff --git a/packages/vsce/resources/imgs/web-services-dark.svg b/packages/vsce/resources/imgs/web-services-dark.svg
diff --git a/packages/vsce/resources/imgs/web-services-light.svg b/packages/vsce/resources/imgs/web-services-light.svg
diff --git a/packages/vsce/src/extension.ts b/packages/vsce/src/extension.ts
@@ -56,7 +56,7 @@ export async function activate(context: ExtensionContext) {
   } else {
     window.showErrorMessage(
       "Zowe Explorer was not found: either it is not installed or you are using an older version without extensibility API. " +
-        "Please ensure Zowe Explorer v2.0.0-next.202202221200 or higher is installed",
+      "Please ensure Zowe Explorer v2.0.0-next.202202221200 or higher is installed",
     );
     return;
   }
@@ -90,7 +90,7 @@ export async function activate(context: ExtensionContext) {
     );
   };
 
-  const contextMap: { [key: string]: (node: any) => Promise<void> | void } = {
+  const contextMap: { [key: string]: (node: any) => Promise<void> | void; } = {
     cicscombinedprogramtree: expandCombinedTree,
     cicscombinedtransactiontree: expandCombinedTree,
     cicscombinedlocalfiletree: expandCombinedTree,
@@ -161,7 +161,6 @@ export async function activate(context: ExtensionContext) {
       "cicstreelocalfile.",
       "cicstreetask.",
       "cicstreelibrary.",
-      "cicslibrary.",
       "cicstreeweb.",
       "cicstreetcpips.",
       "cicstreepipeline.",
@@ -177,4 +176,4 @@ export async function activate(context: ExtensionContext) {
   });
 
   context.subscriptions.concat(getCommands(treeDataProv, treeview));
-}
+}
diff --git a/packages/vsce/src/trees/treeItems/CICSLibraryDatasets.ts b/packages/vsce/src/trees/treeItems/CICSLibraryDatasets.ts
@@ -28,7 +28,7 @@ export class CICSLibraryDatasets extends TreeItem {
     dataset: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public iconPath = getIconFilePathFromName("library"),
+    public iconPath = getIconFilePathFromName("library-dataset"),
   ) {
     super(`${dataset.dsname}`, TreeItemCollapsibleState.Collapsed);
 

diff --git a/packages/vsce/src/trees/treeItems/CICSLibraryTreeItem.ts b/packages/vsce/src/trees/treeItems/CICSLibraryTreeItem.ts
@@ -13,7 +13,7 @@ import { TreeItemCollapsibleState, TreeItem, window } from "vscode";
 import { CICSRegionTree } from "../CICSRegionTree";
 import { getResource } from "@zowe/cics-for-zowe-sdk";
 import { CICSLibraryDatasets } from "./CICSLibraryDatasets";
-import { getFolderIcon } from "../../utils/iconUtils";
+import { getIconFilePathFromName } from "../../utils/iconUtils";
 import { toArray } from "../../utils/commandUtils";
 
 export class CICSLibraryTreeItem extends TreeItem {
@@ -27,7 +27,7 @@ export class CICSLibraryTreeItem extends TreeItem {
     library: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public iconPath = getFolderIcon(false),
+    public iconPath = getIconFilePathFromName("library"),
   ) {
     super(`${library.name}`, TreeItemCollapsibleState.Collapsed);
 
@@ -69,14 +69,12 @@ export class CICSLibraryTreeItem extends TreeItem {
         const newDatasetItem = new CICSLibraryDatasets(dataset, this.parentRegion, this); //this=CICSLibraryTreeItem
         this.addDataset(newDatasetItem);
       }
-      this.iconPath = getFolderIcon(true);
     } catch (error) {
       if (error.mMessage!.includes("exceeded a resource limit")) {
         window.showErrorMessage(`Resource Limit Exceeded - Set a datasets filter to narrow search`);
       } else if (this.children.length === 0) {
         window.showInformationMessage(`No datasets found`);
         this.label = this.buildLabel([]);
-        this.iconPath = getFolderIcon(true);
       } else {
         window.showErrorMessage(
           `Something went wrong when fetching datasets - ${JSON.stringify(error, Object.getOwnPropertyNames(error)).replace(

diff --git a/packages/vsce/src/trees/treeItems/web/treeItems/CICSPipelineTreeItem.ts b/packages/vsce/src/trees/treeItems/web/treeItems/CICSPipelineTreeItem.ts
@@ -22,7 +22,7 @@ export class CICSPipelineTreeItem extends TreeItem {
     pipeline: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public readonly iconPath = getIconFilePathFromName("program"),
+    public readonly iconPath = getIconFilePathFromName("pipeline"),
   ) {
     super(`${pipeline.name}`, TreeItemCollapsibleState.None);
 

diff --git a/packages/vsce/src/trees/treeItems/web/treeItems/CICSTCPIPServiceTreeItem.ts b/packages/vsce/src/trees/treeItems/web/treeItems/CICSTCPIPServiceTreeItem.ts
@@ -22,7 +22,7 @@ export class CICSTCPIPServiceTreeItem extends TreeItem {
     tcpips: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public readonly iconPath = getIconFilePathFromName("program"),
+    public readonly iconPath = getIconFilePathFromName("tcp-ip-service"),
   ) {
     super(`${tcpips.name}`, TreeItemCollapsibleState.None);
 

diff --git a/packages/vsce/src/trees/treeItems/web/treeItems/CICSURIMapTreeItem.ts b/packages/vsce/src/trees/treeItems/web/treeItems/CICSURIMapTreeItem.ts
@@ -22,7 +22,7 @@ export class CICSURIMapTreeItem extends TreeItem {
     urimap: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public readonly iconPath = getIconFilePathFromName("program"),
+    public readonly iconPath = getIconFilePathFromName("uri-map"),
   ) {
     super(`${urimap.name}`, TreeItemCollapsibleState.None);
 

diff --git a/packages/vsce/src/trees/treeItems/web/treeItems/CICSWebServiceTreeItem.ts b/packages/vsce/src/trees/treeItems/web/treeItems/CICSWebServiceTreeItem.ts
@@ -22,7 +22,7 @@ export class CICSWebServiceTreeItem extends TreeItem {
     webservice: any,
     parentRegion: CICSRegionTree,
     directParent: any,
-    public readonly iconPath = getIconFilePathFromName("program"),
+    public readonly iconPath = getIconFilePathFromName("web-service"),
   ) {
     super(`${webservice.name}`, TreeItemCollapsibleState.None);