Merge branch 'master' into fix-ctrl-alt-p

zowe · Mar 2, 2021 · 1e7171a · 1e7171a
2 parents 10bb0e0 + b287a02
commit 1e7171a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 13 deletions.
diff --git a/packages/zowe-explorer/src/Profiles.ts b/packages/zowe-explorer/src/Profiles.ts
@@ -1052,12 +1052,13 @@ export class Profiles extends ProfilesCache {
             baseProfile &&
             serviceProfile.profile.host &&
             serviceProfile.profile.port &&
-            baseProfile.profile.host !== serviceProfile.profile.host &&
-            baseProfile.profile.port !== serviceProfile.profile.port
+            ((baseProfile.profile.host !== serviceProfile.profile.host &&
+                baseProfile.profile.port !== serviceProfile.profile.port) ||
+                (baseProfile.profile.host === serviceProfile.profile.host &&
+                    baseProfile.profile.port !== serviceProfile.profile.port))
         ) {
             return serviceProfile;
         }
-
         let session;
         if (!commonApi.getSessionFromCommandArgument) {
             // This is here for extenders

diff --git a/packages/zowe-explorer/src/dataset/DatasetTree.ts b/packages/zowe-explorer/src/dataset/DatasetTree.ts
@@ -979,6 +979,7 @@ export class DatasetTree extends ZoweTreeProvider implements IZoweTree<IZoweData
                 nonFaveNode.tooltip = nonFaveNode.pattern = pattern.toUpperCase();
             }
             const response = await this.getChildren(nonFaveNode);
+            // reset and remove previous search patterns for each child of getChildren
             for (const child of response) {
                 let resetIcon: IIconItem;
                 if (child.collapsibleState === vscode.TreeItemCollapsibleState.Collapsed) {
@@ -998,24 +999,29 @@ export class DatasetTree extends ZoweTreeProvider implements IZoweTree<IZoweData
                     child.pattern = "";
                     this.refreshElement(child);
                 }
+            }
+            // set new search patterns for each child of getChildren
+            for (const child of response) {
                 for (const item of dsSets) {
                     const label = child.label.trim();
                     if (item.memberName && label !== "No datasets found") {
                         const dsn = item.dataSetName.split(".");
                         const name = label.split(".");
                         let index = 0;
                         let includes = false;
-                        for (const each of dsn) {
-                            let inc = false;
-                            inc = await this.checkFilterPattern(name[index], each);
-                            if (inc) {
-                                child.pattern = item.dataSetName;
-                                includes = true;
-                            } else {
-                                child.pattern = "";
-                                includes = false;
+                        if (!child.pattern) {
+                            for (const each of dsn) {
+                                let inc = false;
+                                inc = await this.checkFilterPattern(name[index], each);
+                                if (inc) {
+                                    child.pattern = item.dataSetName;
+                                    includes = true;
+                                } else {
+                                    child.pattern = "";
+                                    includes = false;
+                                }
+                                index++;
                             }
-                            index++;
                         }
                         if (includes && child.contextValue.includes("pds")) {
                             const options: IListOptions = {};