SearchKit - Fix removing all related fields from SELECT when removing a JOIN

diff --git a/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js b/ext/search/ang/crmSearchAdmin/crmSearchAdmin.component.js
index a74fdf9acaaad17252a1f467fdb5e48f7538d934..6a48f8167cdafddebdfedb111e44003289814d53 100644 (file)
--- 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);