Merge pull request #19747 from colemanw/searchKitRemoveSelectWhenRemo…

…vingJoin SearchKit - Fix removing all related fields from SELECT when removing a JOIN
civicrm · Mar 7, 2021 · a87f4bb · a87f4bb
2 parents c16fd30 + 133f6a1
commit a87f4bb
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
@@ -264,7 +264,8 @@
         var alias = searchMeta.getJoin(ctrl.savedSearch.api_params.join[index][0]).alias;
         ctrl.clearParam('join', index);
         _.remove(ctrl.savedSearch.api_params.select, function(item) {
-          return item.indexOf(alias + '.') === 0;
+          var pattern = new RegExp('\\b' + alias + '\\.');
+          return pattern.test(item.split(' AS ')[0]);
         });
         _.remove(ctrl.savedSearch.api_params.where, function(clause) {
           return clauseUsesJoin(clause, alias);