From 5913a4af1ba34b910705a73ff5a39942f74f8e07 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Sun, 10 Jan 2021 21:52:25 +0200
Subject: [PATCH 01/20] Global search development

* search input
* parse query with operators
---
 client/components/main/globalSearch.jade |  37 ++++++
 client/components/main/globalSearch.js   | 148 +++++++++++++++++++++++
 client/components/main/globalSearch.styl |  69 +++++++++++
 config/router.js                         |  18 +++
 4 files changed, 272 insertions(+)
 create mode 100644 client/components/main/globalSearch.jade
 create mode 100644 client/components/main/globalSearch.js
 create mode 100644 client/components/main/globalSearch.styl

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
new file mode 100644
index 000000000..ec9eb2ff9
--- /dev/null
+++ b/client/components/main/globalSearch.jade
@@ -0,0 +1,37 @@
+template(name="globalSearchHeaderBar")
+  h1
+    i.fa.fa-search
+    | {{_ 'globalSearch-title'}}
+
+template(name="globalSearchModalTitle")
+  h2
+    i.fa.fa-keyboard-o
+    | {{_ 'globalSearch-title'}}
+
+template(name="globalSearch")
+  if isPageReady.get
+    .wrapper
+      form.js-search-query-form
+        input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
+  else
+    +spinner
+
+template(name="globalSearchViewChangePopup")
+  ul.pop-over-list
+    li
+      with "globalSearchViewChange-choice-me"
+        a.js-due-cards-view-me
+          i.fa.fa-user.colorful
+          | {{_ 'globalSearchViewChange-choice-me'}}
+          if $eq Utils.globalSearchView "me"
+            i.fa.fa-check
+    li
+      with "globalSearchViewChange-choice-all"
+        a.js-due-cards-view-all
+          i.fa.fa-users.colorful
+          | {{_ 'globalSearchViewChange-choice-all'}}
+          span.sub-name
+            +viewer
+              | {{_ 'globalSearchViewChange-choice-all-description' }}
+          if $eq Utils.globalSearchView "all"
+            i.fa.fa-check
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
new file mode 100644
index 000000000..a7d755f74
--- /dev/null
+++ b/client/components/main/globalSearch.js
@@ -0,0 +1,148 @@
+const subManager = new SubsManager();
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-change': Popup.open('globalSearchViewChange'),
+      },
+    ];
+  },
+}).register('globalSearchHeaderBar');
+
+Template.globalSearch.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [
+      {
+        'click .js-due-cards-view-me'() {
+          Utils.setDueCardsView('me');
+          Popup.close();
+        },
+
+        'click .js-due-cards-view-all'() {
+          Utils.setDueCardsView('all');
+          Popup.close();
+        },
+      },
+    ];
+  },
+}).register('globalSearchViewChangePopup');
+
+BlazeComponent.extendComponent({
+  onCreated() {
+    this.isPageReady = new ReactiveVar(true);
+    this.query = new ReactiveVar('');
+
+    // this.autorun(() => {
+    //   const handle = subManager.subscribe('globalSearch');
+    //   Tracker.nonreactive(() => {
+    //     Tracker.autorun(() => {
+    //       this.isPageReady.set(handle.ready());
+    //     });
+    //   });
+    // });
+    Meteor.subscribe('setting');
+  },
+
+  events() {
+    return [
+      {
+        'submit .js-search-query-form'(evt) {
+          evt.preventDefault();
+          this.query.set(evt.target.searchQuery.value);
+          // eslint-disable-next-line no-console
+          console.log('query:', this.query.get());
+
+          let query = this.query.get();
+          const reUser = /^@(?<user>\w+)(\s+|$)/;
+          const reLabel = /^#(?<label>\w+)(\s+|$)/;
+          const reOperator1 = /^(?<operator>\w+):(?<value>\w+)(\s+|$)/;
+          const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
+          const reText = /^(?<text>[^:@#\s]+)(\s+|$)/;
+          const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
+          const operatorMap = {
+            board: 'boards',
+            b: 'boards',
+            label: 'labels',
+            lable: 'labels',
+            user: 'users',
+            u: 'users',
+            swimlane: 'swimlanes',
+            swim: 'swimlanes',
+            s: 'swimlanes',
+            list: 'lists',
+            l: 'lists',
+          };
+          const selector = {
+            boards: [],
+            swimlanes: [],
+            lists: [],
+            users: [],
+            labels: [],
+          };
+          let text = '';
+          while (query) {
+            // eslint-disable-next-line no-console
+            console.log('query:', query);
+            let m = query.match(reUser);
+            if (m) {
+              query = query.replace(reUser, '');
+              selector.users.push(m.groups.user);
+              continue;
+            }
+
+            m = query.match(reLabel);
+            if (m) {
+              query = query.replace(reLabel, '');
+              selector.labels.push(m.groups.label);
+              continue;
+            }
+
+            m = query.match(reOperator1);
+            if (!m) {
+              m = query.match(reOperator2);
+              if (m) {
+                query = query.replace(reOperator2, '');
+              }
+            } else {
+              query = query.replace(reOperator1, '');
+            }
+            if (m) {
+              const op = m.groups.operator.toLowerCase();
+              if (op in operatorMap) {
+                selector[operatorMap[op]].push(m.groups.value);
+              }
+              continue;
+            }
+
+            m = query.match(reQuotedText);
+            if (!m) {
+              m = query.match(reText);
+              if (m) {
+                query = query.replace(reText, '');
+              }
+            } else {
+              query = query.replace(reQuotedText, '');
+            }
+            if (m) {
+              text += (text ? ' ' : '') + m.groups.text;
+            }
+          }
+
+          // eslint-disable-next-line no-console
+          console.log('selector:', selector);
+          // eslint-disable-next-line no-console
+          console.log('text:', text);
+        },
+      },
+    ];
+  },
+
+  globalSearchList() {},
+}).register('globalSearch');
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
new file mode 100644
index 000000000..f49d684be
--- /dev/null
+++ b/client/components/main/globalSearch.styl
@@ -0,0 +1,69 @@
+.due-cards-board-wrapper
+  border-radius: 8px
+  //padding: 0.5rem
+  min-width: 400px
+  border-width: 8px
+  border-color: grey
+  border-style: solid
+  margin-bottom: 2rem
+  margin-right: auto
+  margin-left: auto
+
+.due-cards-board-title
+  font-size: 1.4rem
+  font-weight: bold
+  padding: 0.5rem
+  background-color: grey
+  color: white
+
+.due-cards-swimlane-title
+  font-size: 1.1rem
+  font-weight: bold
+  padding: 0.5rem
+  padding-bottom: 0.4rem
+  margin-top: 0
+  margin-bottom: 0.5rem
+  //border-top: black 1px solid
+  //border-bottom: black 1px solid
+  text-align: center
+
+.swimlane-default-color
+  background-color: lightgrey
+
+.due-cards-list-title
+  font-weight: bold
+  font-size: 1.1rem
+  //padding-bottom: 0
+  //margin-bottom: 0
+  text-align: center
+  margin-bottom: 0.7rem
+
+.due-cards-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.due-cards-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.due-cards-dueat-list-wrapper
+  max-width: 500px
+  margin-right: auto
+  margin-left: auto
+
+.due-cards-field-name
+  font-weight: bold
+
+.due-cards-context
+  display: inline-block
+
+.due-cards-context-separator
+  font-weight: bold
+
+.due-cards-context-list
+  margin-bottom: 0.7rem
diff --git a/config/router.js b/config/router.js
index d5b2c4871..1dacfbe3c 100644
--- a/config/router.js
+++ b/config/router.js
@@ -149,6 +149,24 @@ FlowRouter.route('/due-cards', {
   },
 });
 
+FlowRouter.route('/global-search', {
+  name: 'global-search',
+  action() {
+    Filter.reset();
+    // EscapeActions.executeAll();
+    EscapeActions.executeUpTo('popup-close');
+
+    Utils.manageCustomUI();
+    Utils.manageMatomo();
+
+    BlazeLayout.render('defaultLayout', {
+      headerBar: 'globalSearchHeaderBar',
+      content: 'globalSearch',
+    });
+    // }
+  },
+});
+
 FlowRouter.route('/import/:source', {
   name: 'import',
   triggersEnter: [AccountsTemplates.ensureSignedIn],

From 01bd94d2b3f8185a5621fdad2dca5c0cc45a86de Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Sun, 10 Jan 2021 22:58:29 +0200
Subject: [PATCH 02/20] Global search limited working prototype

* added publication
* need to filter cards on client side
---
 client/components/main/globalSearch.jade |  38 +++++--
 client/components/main/globalSearch.js   |  24 ++++-
 client/components/main/globalSearch.styl |  22 ++--
 server/publications/cards.js             | 122 +++++++++++++++++++++++
 4 files changed, 186 insertions(+), 20 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index ec9eb2ff9..ba4ecc892 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -9,25 +9,49 @@ template(name="globalSearchModalTitle")
     | {{_ 'globalSearch-title'}}
 
 template(name="globalSearch")
-  if isPageReady.get
-    .wrapper
-      form.js-search-query-form
-        input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
-  else
+  .wrapper
+    form.js-search-query-form
+      input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
+  if searching.get
     +spinner
+  else if hasResults.get
+    .global-search-dueat-list-wrapper
+      h1 Results
+      each card in results
+        .global-search-card-wrapper
+          a.minicard-wrapper.card-title(href=card.absoluteUrl)
+            +minicard(card)
+          ul.global-search-context-list
+            li.global-search-context(title="{{_ 'board'}}")
+              +viewer
+                = card.getBoard.title
+            li.global-search-context.global-search-context-separator
+              = ' '
+              | {{_ 'context-separator'}}
+              = ' '
+            li.global-search-context(title="{{_ 'swimlane'}}")
+              +viewer
+                = card.getSwimlane.title
+            li.global-search-context
+              = ' '
+              | {{_ 'context-separator'}}
+              = ' '
+            li.global-search-context(title="{{_ 'list'}}")
+              +viewer
+                = card.getList.title
 
 template(name="globalSearchViewChangePopup")
   ul.pop-over-list
     li
       with "globalSearchViewChange-choice-me"
-        a.js-due-cards-view-me
+        a.js-global-search-view-me
           i.fa.fa-user.colorful
           | {{_ 'globalSearchViewChange-choice-me'}}
           if $eq Utils.globalSearchView "me"
             i.fa.fa-check
     li
       with "globalSearchViewChange-choice-all"
-        a.js-due-cards-view-all
+        a.js-global-search-view-all
           i.fa.fa-users.colorful
           | {{_ 'globalSearchViewChange-choice-all'}}
           span.sub-name
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index a7d755f74..b8ac5fdd0 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -37,6 +37,8 @@ BlazeComponent.extendComponent({
 BlazeComponent.extendComponent({
   onCreated() {
     this.isPageReady = new ReactiveVar(true);
+    this.searching = new ReactiveVar(false);
+    this.hasResults = new ReactiveVar(false);
     this.query = new ReactiveVar('');
 
     // this.autorun(() => {
@@ -50,16 +52,24 @@ BlazeComponent.extendComponent({
     Meteor.subscribe('setting');
   },
 
+  results() {
+    return Cards.find();
+  },
+
   events() {
     return [
       {
         'submit .js-search-query-form'(evt) {
           evt.preventDefault();
           this.query.set(evt.target.searchQuery.value);
-          // eslint-disable-next-line no-console
-          console.log('query:', this.query.get());
+
+          this.searching.set(true);
+          this.hasResults.set(false);
 
           let query = this.query.get();
+          // eslint-disable-next-line no-console
+          console.log('query:', query);
+
           const reUser = /^@(?<user>\w+)(\s+|$)/;
           const reLabel = /^#(?<label>\w+)(\s+|$)/;
           const reOperator1 = /^(?<operator>\w+):(?<value>\w+)(\s+|$)/;
@@ -139,6 +149,16 @@ BlazeComponent.extendComponent({
           console.log('selector:', selector);
           // eslint-disable-next-line no-console
           console.log('text:', text);
+
+          this.autorun(() => {
+            const handle = subManager.subscribe('globalSearch', selector);
+            Tracker.nonreactive(() => {
+              Tracker.autorun(() => {
+                this.searching.set(!handle.ready());
+                this.hasResults.set(handle.ready());
+              });
+            });
+          });
         },
       },
     ];
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index f49d684be..42d41e079 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -1,4 +1,4 @@
-.due-cards-board-wrapper
+.global-search-board-wrapper
   border-radius: 8px
   //padding: 0.5rem
   min-width: 400px
@@ -9,14 +9,14 @@
   margin-right: auto
   margin-left: auto
 
-.due-cards-board-title
+.global-search-board-title
   font-size: 1.4rem
   font-weight: bold
   padding: 0.5rem
   background-color: grey
   color: white
 
-.due-cards-swimlane-title
+.global-search-swimlane-title
   font-size: 1.1rem
   font-weight: bold
   padding: 0.5rem
@@ -30,7 +30,7 @@
 .swimlane-default-color
   background-color: lightgrey
 
-.due-cards-list-title
+.global-search-list-title
   font-weight: bold
   font-size: 1.1rem
   //padding-bottom: 0
@@ -38,7 +38,7 @@
   text-align: center
   margin-bottom: 0.7rem
 
-.due-cards-list-wrapper
+.global-search-list-wrapper
   margin: 1rem
   border-radius: 5px
   padding: 1.5rem
@@ -47,23 +47,23 @@
   min-width: 250px
   max-width: 350px
 
-.due-cards-card-wrapper
+.global-search-card-wrapper
   margin-top: 0
   margin-bottom: 10px
 
-.due-cards-dueat-list-wrapper
+.global-search-dueat-list-wrapper
   max-width: 500px
   margin-right: auto
   margin-left: auto
 
-.due-cards-field-name
+.global-search-field-name
   font-weight: bold
 
-.due-cards-context
+.global-search-context
   display: inline-block
 
-.due-cards-context-separator
+.global-search-context-separator
   font-weight: bold
 
-.due-cards-context-list
+.global-search-context-list
   margin-bottom: 0.7rem
diff --git a/server/publications/cards.js b/server/publications/cards.js
index ae992179d..772da9a62 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -174,3 +174,125 @@ Meteor.publish('dueCards', function(allUsers = false) {
     Users.find({ _id: { $in: users } }),
   ];
 });
+
+Meteor.publish('globalSearch', function(queryParams) {
+  check(queryParams, Object);
+
+  // eslint-disable-next-line no-console
+  console.log('selector:', queryParams);
+
+  const user = Users.findOne(this.userId);
+
+  const archivedBoards = [];
+  Boards.find({ archived: true }).forEach(board => {
+    archivedBoards.push(board._id);
+  });
+
+  const archivedSwimlanes = [];
+  Swimlanes.find({ archived: true }).forEach(swimlane => {
+    archivedSwimlanes.push(swimlane._id);
+  });
+
+  const archivedLists = [];
+  Lists.find({ archived: true }).forEach(list => {
+    archivedLists.push(list._id);
+  });
+
+  const permiitedBoards = [];
+  let selector = {
+    archived: false,
+  };
+  // if user is not an admin allow her to see cards only from boards where
+  // she is a member
+  if (!user.isAdmin) {
+    selector.$or = [
+      { permission: 'public' },
+      { members: { $elemMatch: { userId: user._id, isActive: true } } },
+    ];
+  }
+  if (queryParams.boards.length) {
+    selector.title = { $in: [] };
+    queryParams.boards.forEach(term => {
+      selector.title.$in.push(term);
+    });
+  }
+  Boards.find(selector).forEach(board => {
+    permiitedBoards.push(board._id);
+  });
+
+  const searchLists = [];
+  if (queryParams.lists.length) {
+    selector = {
+      archived: false,
+      title: { $in: [] },
+    };
+    queryParams.lists.forEach(term => {
+      selector.title.$in.push(term);
+    });
+
+    // eslint-disable-next-line no-console
+    console.log('search list selector:', selector);
+    Lists.find(selector).forEach(list => {
+      searchLists.push(list._id);
+    });
+    // eslint-disable-next-line no-console
+    console.log('search lists:', searchLists);
+  }
+
+  selector = {
+    archived: false,
+    boardId: { $nin: archivedBoards, $in: permiitedBoards },
+    swimlaneId: { $nin: archivedSwimlanes },
+    listId: { $nin: archivedLists },
+  };
+
+  if (searchLists.length) {
+    selector.listId.$in = searchLists;
+  }
+
+  const cards = Cards.find(selector, {
+    fields: {
+      _id: 1,
+      archived: 1,
+      boardId: 1,
+      swimlaneId: 1,
+      listId: 1,
+      title: 1,
+      type: 1,
+      sort: 1,
+      members: 1,
+      assignees: 1,
+      colors: 1,
+      dueAt: 1,
+    },
+  });
+
+  const boards = [];
+  const swimlanes = [];
+  const lists = [];
+  const users = [];
+
+  cards.forEach(card => {
+    if (card.boardId) boards.push(card.boardId);
+    if (card.swimlaneId) swimlanes.push(card.swimlaneId);
+    if (card.listId) lists.push(card.listId);
+    if (card.members) {
+      card.members.forEach(userId => {
+        users.push(userId);
+      });
+    }
+    if (card.assignees) {
+      card.assignees.forEach(userId => {
+        users.push(userId);
+      });
+    }
+  });
+
+  return [
+    cards,
+    Boards.find({ _id: { $in: boards } }),
+    Swimlanes.find({ _id: { $in: swimlanes } }),
+    Lists.find({ _id: { $in: lists } }),
+    Users.find({ _id: { $in: users } }),
+  ];
+});

From bbcb236a46788d37ed29ffc080b1141502ea03d8 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Mon, 11 Jan 2021 18:18:26 +0200
Subject: [PATCH 03/20] Add methods to models for archived entities

---
 client/components/main/globalSearch.js | 44 +++++++++++++++
 models/boards.js                       | 20 +++++++
 models/lists.js                        | 10 ++++
 models/swimlanes.js                    | 10 ++++
 server/publications/cards.js           | 75 +++++++++++---------------
 5 files changed, 115 insertions(+), 44 deletions(-)

diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index b8ac5fdd0..d2960afef 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -88,6 +88,7 @@ BlazeComponent.extendComponent({
             s: 'swimlanes',
             list: 'lists',
             l: 'lists',
+            is: 'is',
           };
           const selector = {
             boards: [],
@@ -95,6 +96,7 @@ BlazeComponent.extendComponent({
             lists: [],
             users: [],
             labels: [],
+            is: [],
           };
           let text = '';
           while (query) {
@@ -150,6 +152,48 @@ BlazeComponent.extendComponent({
           // eslint-disable-next-line no-console
           console.log('text:', text);
 
+          if (selector.boards.length) {
+            selector.boardsSelector = {
+              archived: false,
+              title: { $in: [] },
+            };
+            selector.boards.forEach(term => {
+              selector.boardsSelector.title.$in.push(term);
+            });
+          }
+
+          if (selector.lists.length) {
+            selector.listsSelector = {
+              archived: false,
+              title: { $in: [] },
+            };
+            selector.lists.forEach(term => {
+              selector.listsSelector.title.$in.push(term);
+            });
+          }
+
+          if (selector.swimlanes.length) {
+            selector.swimlanesSelector = {
+              archived: false,
+              title: { $in: [] },
+            };
+            selector.swimlanes.forEach(term => {
+              selector.swimlanesSelector.title.$in.push(term);
+            });
+          }
+
+          if (selector.labels.length) {
+            selector.labelsSelector = {
+              archived: false,
+              title: { $in: [] },
+            };
+            selector.labels.forEach(term => {
+              selector.labelsSelector.title.$in.push(term);
+            });
+          }
+
+          selector.text = text;
+
           this.autorun(() => {
             const handle = subManager.subscribe('globalSearch', selector);
             Tracker.nonreactive(() => {
diff --git a/models/boards.js b/models/boards.js
index a8b3967c9..8a286dc8e 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1208,6 +1208,26 @@ function boardRemover(userId, doc) {
   );
 }
 
+Boards.userBoards = (userId, includeArchived = false, selector = {}) => {
+  if (!includeArchived) {
+    selector = {
+      archived: false,
+    };
+  }
+  selector.$or = [
+    { permission: 'public' },
+    { members: { $elemMatch: { userId, isActive: true } } },
+  ];
+
+  return Boards.find(selector);
+};
+
+Boards.userBoardIds = (userId, includeArchived = false, selector = {}) => {
+  return Boards.userBoards(userId, includeArchived, selector).map(board => {
+    return board._id;
+  });
+};
+
 if (Meteor.isServer) {
   Boards.allow({
     insert: Meteor.userId,
diff --git a/models/lists.js b/models/lists.js
index 0fc2a24bc..dcfd4294e 100644
--- a/models/lists.js
+++ b/models/lists.js
@@ -328,6 +328,16 @@ Lists.mutations({
   },
 });
 
+Lists.archivedLists = () => {
+  return Lists.find({ archived: true });
+};
+
+Lists.archivedListIds = () => {
+  return Lists.archivedLists().map(list => {
+    return list._id;
+  });
+};
+
 Meteor.methods({
   applyWipLimit(listId, limit) {
     check(listId, String);
diff --git a/models/swimlanes.js b/models/swimlanes.js
index 2e200454a..0994e9044 100644
--- a/models/swimlanes.js
+++ b/models/swimlanes.js
@@ -283,6 +283,16 @@ Swimlanes.mutations({
   },
 });
 
+Swimlanes.archivedSwimlanes = () => {
+  return Swimlanes.find({ archived: true });
+};
+
+Swimlanes.archivedSwimlaneIds = () => {
+  return Swimlanes.archivedSwimlanes().map(swim => {
+    return swim._id;
+  });
+};
+
 Swimlanes.hookOptions.after.update = { fetchPrevious: false };
 
 if (Meteor.isServer) {
diff --git a/server/publications/cards.js b/server/publications/cards.js
index 772da9a62..f29369bcc 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -179,56 +179,26 @@ Meteor.publish('globalSearch', function(queryParams) {
   check(queryParams, Object);
 
   // eslint-disable-next-line no-console
-  console.log('selector:', queryParams);
+  console.log('queryParams:', queryParams);
 
   const user = Users.findOne(this.userId);
 
-  const archivedBoards = [];
-  Boards.find({ archived: true }).forEach(board => {
-    archivedBoards.push(board._id);
-  });
+  // const archivedSwimlanes = Swimlanes.archivedSwimlaneIds();
 
-  const archivedSwimlanes = [];
-  Swimlanes.find({ archived: true }).forEach(swimlane => {
-    archivedSwimlanes.push(swimlane._id);
-  });
+  // const permiitedBoards = Boards.userBoardIds(user._id);
 
-  const archivedLists = [];
-  Lists.find({ archived: true }).forEach(list => {
-    archivedLists.push(list._id);
-  });
-
-  const permiitedBoards = [];
   let selector = {
     archived: false,
   };
-  // if user is not an admin allow her to see cards only from boards where
-  // she is a member
-  if (!user.isAdmin) {
-    selector.$or = [
-      { permission: 'public' },
-      { members: { $elemMatch: { userId: user._id, isActive: true } } },
-    ];
-  }
-  if (queryParams.boards.length) {
-    selector.title = { $in: [] };
-    queryParams.boards.forEach(term => {
-      selector.title.$in.push(term);
-    });
-  }
-  Boards.find(selector).forEach(board => {
-    permiitedBoards.push(board._id);
-  });
-
   const searchLists = [];
-  if (queryParams.lists.length) {
-    selector = {
-      archived: false,
-      title: { $in: [] },
-    };
-    queryParams.lists.forEach(term => {
-      selector.title.$in.push(term);
-    });
+  // eslint-disable-next-line no-console
+  // console.log('listsSelector:', queryParams.keys());
+  if ('listsSelector' in queryParams) {
+    // eslint-disable-next-line no-console
+    // console.log('listsSelector:', queryParams.listsSelector.keys());
+    for (const key in queryParams.listsSelector) {
+      selector[key] = queryParams.listsSelector[key];
+    }
 
     // eslint-disable-next-line no-console
     console.log('search list selector:', selector);
@@ -239,17 +209,34 @@ Meteor.publish('globalSearch', function(queryParams) {
     console.log('search lists:', searchLists);
   }
 
+  const searchSwimlanes = [];
+  if ('swimlanesSelector' in queryParams) {
+    for (const key in queryParams.swimlanesSelector) {
+      selector[key] = queryParams.swimlanesSelector[key];
+    }
+
+    Lists.find(selector).forEach(swim => {
+      searchSwimlanes.push(swim._id);
+    });
+  }
+
   selector = {
     archived: false,
-    boardId: { $nin: archivedBoards, $in: permiitedBoards },
-    swimlaneId: { $nin: archivedSwimlanes },
-    listId: { $nin: archivedLists },
+    boardId: { $in: Boards.userBoardIds(user._id) },
+    swimlaneId: { $nin: Swimlanes.archivedSwimlaneIds() },
+    listId: { $nin: Lists.archivedListIds() },
   };
 
+  if (searchSwimlanes.length) {
+    selector.swimlaneId.$in = searchSwimlanes;
+  }
+
   if (searchLists.length) {
     selector.listId.$in = searchLists;
   }
 
+  // eslint-disable-next-line no-console
+  console.log('selector:', selector);
   const cards = Cards.find(selector, {
     fields: {
       _id: 1,

From 34000ad159483bae6e59a2c89618ed4e1c9cecbc Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Tue, 12 Jan 2021 00:48:43 +0200
Subject: [PATCH 04/20] Move global search to cards model

* add some explanation of the operators
---
 client/components/main/globalSearch.jade | 63 +++++++++--------
 client/components/main/globalSearch.js   | 30 ++++++--
 models/cards.js                          | 88 ++++++++++++++++++++++++
 server/publications/cards.js             | 73 +-------------------
 4 files changed, 149 insertions(+), 105 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index ba4ecc892..63bf3b170 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -12,33 +12,42 @@ template(name="globalSearch")
   .wrapper
     form.js-search-query-form
       input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
-  if searching.get
-    +spinner
-  else if hasResults.get
-    .global-search-dueat-list-wrapper
-      h1 Results
-      each card in results
-        .global-search-card-wrapper
-          a.minicard-wrapper.card-title(href=card.absoluteUrl)
-            +minicard(card)
-          ul.global-search-context-list
-            li.global-search-context(title="{{_ 'board'}}")
-              +viewer
-                = card.getBoard.title
-            li.global-search-context.global-search-context-separator
-              = ' '
-              | {{_ 'context-separator'}}
-              = ' '
-            li.global-search-context(title="{{_ 'swimlane'}}")
-              +viewer
-                = card.getSwimlane.title
-            li.global-search-context
-              = ' '
-              | {{_ 'context-separator'}}
-              = ' '
-            li.global-search-context(title="{{_ 'list'}}")
-              +viewer
-                = card.getList.title
+    if searching.get
+      +spinner
+    else if hasResults.get
+      .global-search-dueat-list-wrapper
+        h1 Results
+        each card in results
+          .global-search-card-wrapper
+            a.minicard-wrapper.card-title(href=card.absoluteUrl)
+              +minicard(card)
+              //= card.title
+            ul.global-search-context-list
+              li.global-search-context(title="{{_ 'board'}}")
+                +viewer
+                  = card.getBoard.title
+              li.global-search-context.global-search-context-separator
+                = ' '
+                | {{_ 'context-separator'}}
+                = ' '
+              li.global-search-context(title="{{_ 'swimlane'}}")
+                +viewer
+                  = card.getSwimlane.title
+              li.global-search-context
+                = ' '
+                | {{_ 'context-separator'}}
+                = ' '
+              li.global-search-context(title="{{_ 'list'}}")
+                +viewer
+                  = card.getList.title
+    else
+      h2 Search Operators
+      +viewer
+        = '*  `@`username\n'
+        = '*  `#`label\n'
+        = '*  `board:`<name> or `board:`"<name>"\n'
+        = '*  `swimlane:`<name> or `swimlane:`"<name>"\n'
+        = '*  `list:`<name> or `list:`"<name>"\n'
 
 template(name="globalSearchViewChangePopup")
   ul.pop-over-list
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index d2960afef..343e70801 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -40,6 +40,7 @@ BlazeComponent.extendComponent({
     this.searching = new ReactiveVar(false);
     this.hasResults = new ReactiveVar(false);
     this.query = new ReactiveVar('');
+    this.queryParams = null;
 
     // this.autorun(() => {
     //   const handle = subManager.subscribe('globalSearch');
@@ -53,7 +54,10 @@ BlazeComponent.extendComponent({
   },
 
   results() {
-    return Cards.find();
+    if (this.queryParams) {
+      return Cards.globalSearch(this.queryParams);
+    }
+    return [];
   },
 
   events() {
@@ -63,6 +67,12 @@ BlazeComponent.extendComponent({
           evt.preventDefault();
           this.query.set(evt.target.searchQuery.value);
 
+          if (!this.query.get()) {
+            this.searching.set(false);
+            this.hasResults.set(false);
+            return;
+          }
+
           this.searching.set(true);
           this.hasResults.set(false);
 
@@ -70,8 +80,8 @@ BlazeComponent.extendComponent({
           // eslint-disable-next-line no-console
           console.log('query:', query);
 
-          const reUser = /^@(?<user>\w+)(\s+|$)/;
-          const reLabel = /^#(?<label>\w+)(\s+|$)/;
+          const reUser = /^@(?<user>[\w.:]+)(\s+|$)/;
+          const reLabel = /^#(?<label>[\w:-]+)(\s+|$)/;
           const reOperator1 = /^(?<operator>\w+):(?<value>\w+)(\s+|$)/;
           const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
           const reText = /^(?<text>[^:@#\s]+)(\s+|$)/;
@@ -148,7 +158,7 @@ BlazeComponent.extendComponent({
           }
 
           // eslint-disable-next-line no-console
-          console.log('selector:', selector);
+          // console.log('selector:', selector);
           // eslint-disable-next-line no-console
           console.log('text:', text);
 
@@ -193,13 +203,21 @@ BlazeComponent.extendComponent({
           }
 
           selector.text = text;
+          // eslint-disable-next-line no-console
+          console.log('selector:', selector);
+
+          this.queryParams = selector;
 
           this.autorun(() => {
             const handle = subManager.subscribe('globalSearch', selector);
             Tracker.nonreactive(() => {
               Tracker.autorun(() => {
-                this.searching.set(!handle.ready());
-                this.hasResults.set(handle.ready());
+                // eslint-disable-next-line no-console
+                console.log('ready:', handle.ready());
+                if (handle.ready()) {
+                  this.searching.set(false);
+                  this.hasResults.set(true);
+                }
               });
             });
           });
diff --git a/models/cards.js b/models/cards.js
index 92e80931a..97ed17afa 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1730,6 +1730,94 @@ Cards.mutations({
   },
 });
 
+Cards.globalSearch = queryParams => {
+  const userId = Meteor.userId;
+  // eslint-disable-next-line no-console
+  console.log('userId:', this.userId);
+
+  let selector = {
+    archived: false,
+  };
+
+  const searchLists = [];
+  // eslint-disable-next-line no-console
+  // console.log('listsSelector:', queryParams.keys());
+  if ('listsSelector' in queryParams) {
+    // eslint-disable-next-line no-console
+    // console.log('listsSelector:', queryParams.listsSelector.keys());
+    for (const key in queryParams.listsSelector) {
+      selector[key] = queryParams.listsSelector[key];
+    }
+
+    // eslint-disable-next-line no-console
+    console.log('search list selector:', selector);
+    Lists.find(selector).forEach(list => {
+      searchLists.push(list._id);
+    });
+    // eslint-disable-next-line no-console
+    console.log('search lists:', searchLists);
+  }
+
+  const searchSwimlanes = [];
+  if ('swimlanesSelector' in queryParams) {
+    for (const key in queryParams.swimlanesSelector) {
+      selector[key] = queryParams.swimlanesSelector[key];
+    }
+
+    Lists.find(selector).forEach(swim => {
+      searchSwimlanes.push(swim._id);
+    });
+  }
+
+  selector = {
+    archived: false,
+    type: 'cardType-card',
+    boardId: { $in: Boards.userBoardIds(userId) },
+    swimlaneId: { $nin: Swimlanes.archivedSwimlaneIds() },
+    listId: { $nin: Lists.archivedListIds() },
+  };
+
+  if (searchSwimlanes.length) {
+    selector.swimlaneId.$in = searchSwimlanes;
+  }
+
+  if (searchLists.length) {
+    selector.listId.$in = searchLists;
+  }
+
+  if (queryParams.users.length) {
+    const users = [];
+    Users.find({ username: { $in: queryParams.users } }).forEach(user => {
+      users.push(user._id);
+    });
+    if (users.length) {
+      selector.$or = [
+        { members: { $in: users } },
+        { assignees: { $in: users } },
+      ];
+    }
+  }
+
+  // eslint-disable-next-line no-console
+  console.log('selector:', selector);
+  return Cards.find(selector, {
+    fields: {
+      _id: 1,
+      archived: 1,
+      boardId: 1,
+      swimlaneId: 1,
+      listId: 1,
+      title: 1,
+      type: 1,
+      sort: 1,
+      members: 1,
+      assignees: 1,
+      colors: 1,
+      dueAt: 1,
+    },
+  });
+};
+
 //FUNCTIONS FOR creation of Activities
 
 function updateActivities(doc, fieldNames, modifier) {
diff --git a/server/publications/cards.js b/server/publications/cards.js
index f29369bcc..6d14cf02c 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -181,78 +181,7 @@ Meteor.publish('globalSearch', function(queryParams) {
   // eslint-disable-next-line no-console
   console.log('queryParams:', queryParams);
 
-  const user = Users.findOne(this.userId);
-
-  // const archivedSwimlanes = Swimlanes.archivedSwimlaneIds();
-
-  // const permiitedBoards = Boards.userBoardIds(user._id);
-
-  let selector = {
-    archived: false,
-  };
-  const searchLists = [];
-  // eslint-disable-next-line no-console
-  // console.log('listsSelector:', queryParams.keys());
-  if ('listsSelector' in queryParams) {
-    // eslint-disable-next-line no-console
-    // console.log('listsSelector:', queryParams.listsSelector.keys());
-    for (const key in queryParams.listsSelector) {
-      selector[key] = queryParams.listsSelector[key];
-    }
-
-    // eslint-disable-next-line no-console
-    console.log('search list selector:', selector);
-    Lists.find(selector).forEach(list => {
-      searchLists.push(list._id);
-    });
-    // eslint-disable-next-line no-console
-    console.log('search lists:', searchLists);
-  }
-
-  const searchSwimlanes = [];
-  if ('swimlanesSelector' in queryParams) {
-    for (const key in queryParams.swimlanesSelector) {
-      selector[key] = queryParams.swimlanesSelector[key];
-    }
-
-    Lists.find(selector).forEach(swim => {
-      searchSwimlanes.push(swim._id);
-    });
-  }
-
-  selector = {
-    archived: false,
-    boardId: { $in: Boards.userBoardIds(user._id) },
-    swimlaneId: { $nin: Swimlanes.archivedSwimlaneIds() },
-    listId: { $nin: Lists.archivedListIds() },
-  };
-
-  if (searchSwimlanes.length) {
-    selector.swimlaneId.$in = searchSwimlanes;
-  }
-
-  if (searchLists.length) {
-    selector.listId.$in = searchLists;
-  }
-
-  // eslint-disable-next-line no-console
-  console.log('selector:', selector);
-  const cards = Cards.find(selector, {
-    fields: {
-      _id: 1,
-      archived: 1,
-      boardId: 1,
-      swimlaneId: 1,
-      listId: 1,
-      title: 1,
-      type: 1,
-      sort: 1,
-      members: 1,
-      assignees: 1,
-      colors: 1,
-      dueAt: 1,
-    },
-  });
+  const cards = Cards.globalSearch(queryParams);
 
   const boards = [];
   const swimlanes = [];

From 2e17f2b4b940cb1389897f499ab2353754ddbea7 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Tue, 12 Jan 2021 16:48:29 +0200
Subject: [PATCH 05/20] Global search development

* Add text query ability
* limit results to 50
* display results count
---
 client/components/main/globalSearch.jade |  4 +++-
 client/components/main/globalSearch.js   |  5 ++++-
 models/cards.js                          | 11 +++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 63bf3b170..1459fee7a 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -16,7 +16,9 @@ template(name="globalSearch")
       +spinner
     else if hasResults.get
       .global-search-dueat-list-wrapper
-        h1 Results
+        h1
+          = resultsCount.get
+          | Results
         each card in results
           .global-search-card-wrapper
             a.minicard-wrapper.card-title(href=card.absoluteUrl)
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index 343e70801..b5003e97a 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -41,6 +41,7 @@ BlazeComponent.extendComponent({
     this.hasResults = new ReactiveVar(false);
     this.query = new ReactiveVar('');
     this.queryParams = null;
+    this.resultsCount = new ReactiveVar(0);
 
     // this.autorun(() => {
     //   const handle = subManager.subscribe('globalSearch');
@@ -55,7 +56,9 @@ BlazeComponent.extendComponent({
 
   results() {
     if (this.queryParams) {
-      return Cards.globalSearch(this.queryParams);
+      const cards = Cards.globalSearch(this.queryParams);
+      this.resultsCount.set(cards.count());
+      return cards;
     }
     return [];
   },
diff --git a/models/cards.js b/models/cards.js
index 97ed17afa..81db53f31 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1798,6 +1798,16 @@ Cards.globalSearch = queryParams => {
     }
   }
 
+  if (queryParams.text) {
+    const regex = new RegExp(queryParams.text, 'i');
+
+    selector.$or = [
+      { title: regex },
+      { description: regex },
+      { customFields: { $elemMatch: { value: regex } } },
+    ];
+  }
+
   // eslint-disable-next-line no-console
   console.log('selector:', selector);
   return Cards.find(selector, {
@@ -1815,6 +1825,7 @@ Cards.globalSearch = queryParams => {
       colors: 1,
       dueAt: 1,
     },
+    limit: 50,
   });
 };
 

From 4ab1a04814b9b6830a2e34f11723445408794d09 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Tue, 12 Jan 2021 17:35:01 +0200
Subject: [PATCH 06/20] Global search add swimlane functionality

* streamline code
* fix bug in swimlane lookup
---
 models/cards.js | 74 +++++++++++++++++++++++--------------------------
 1 file changed, 34 insertions(+), 40 deletions(-)

diff --git a/models/cards.js b/models/cards.js
index 81db53f31..e6848c646 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1735,41 +1735,7 @@ Cards.globalSearch = queryParams => {
   // eslint-disable-next-line no-console
   console.log('userId:', this.userId);
 
-  let selector = {
-    archived: false,
-  };
-
-  const searchLists = [];
-  // eslint-disable-next-line no-console
-  // console.log('listsSelector:', queryParams.keys());
-  if ('listsSelector' in queryParams) {
-    // eslint-disable-next-line no-console
-    // console.log('listsSelector:', queryParams.listsSelector.keys());
-    for (const key in queryParams.listsSelector) {
-      selector[key] = queryParams.listsSelector[key];
-    }
-
-    // eslint-disable-next-line no-console
-    console.log('search list selector:', selector);
-    Lists.find(selector).forEach(list => {
-      searchLists.push(list._id);
-    });
-    // eslint-disable-next-line no-console
-    console.log('search lists:', searchLists);
-  }
-
-  const searchSwimlanes = [];
-  if ('swimlanesSelector' in queryParams) {
-    for (const key in queryParams.swimlanesSelector) {
-      selector[key] = queryParams.swimlanesSelector[key];
-    }
-
-    Lists.find(selector).forEach(swim => {
-      searchSwimlanes.push(swim._id);
-    });
-  }
-
-  selector = {
+  const selector = {
     archived: false,
     type: 'cardType-card',
     boardId: { $in: Boards.userBoardIds(userId) },
@@ -1777,12 +1743,36 @@ Cards.globalSearch = queryParams => {
     listId: { $nin: Lists.archivedListIds() },
   };
 
-  if (searchSwimlanes.length) {
-    selector.swimlaneId.$in = searchSwimlanes;
+  if ('swimlanesSelector' in queryParams) {
+    const swimSelector = {
+      archived: false,
+    };
+
+    for (const key in queryParams.swimlanesSelector) {
+      swimSelector[key] = queryParams.swimlanesSelector[key];
+    }
+
+    selector.swimlaneId.$in = Swimlanes.find(swimSelector).map(swim => {
+      return swim._id;
+    });
   }
 
-  if (searchLists.length) {
-    selector.listId.$in = searchLists;
+  if ('listsSelector' in queryParams) {
+    const listsSelector = {
+      archived: false,
+    };
+
+    // eslint-disable-next-line no-console
+    // console.log('listsSelector:', queryParams.listsSelector.keys());
+    for (const key in queryParams.listsSelector) {
+      listsSelector[key] = queryParams.listsSelector[key];
+    }
+
+    // eslint-disable-next-line no-console
+    console.log('search list selector:', selector);
+    selector.listId.$in = Lists.find(listsSelector).map(list => {
+      return list._id;
+    });
   }
 
   if (queryParams.users.length) {
@@ -1810,7 +1800,7 @@ Cards.globalSearch = queryParams => {
 
   // eslint-disable-next-line no-console
   console.log('selector:', selector);
-  return Cards.find(selector, {
+  const cards = Cards.find(selector, {
     fields: {
       _id: 1,
       archived: 1,
@@ -1827,6 +1817,10 @@ Cards.globalSearch = queryParams => {
     },
     limit: 50,
   });
+
+  // eslint-disable-next-line no-console
+  console.log('count:', cards.count());
+  return cards;
 };
 
 //FUNCTIONS FOR creation of Activities

From 80b23e5cc1d8dfe533e8f0058a62cb6e9810c366 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 01:14:49 +0200
Subject: [PATCH 07/20] Global search - add error messages for terms that are
 not found

---
 client/components/main/globalSearch.jade |   5 +
 client/components/main/globalSearch.js   |  41 +++++---
 client/components/main/globalSearch.styl |   3 +
 i18n/en.i18n.json                        |   6 +-
 models/boards.js                         |  14 +++
 models/cards.js                          | 115 ++++++++++++++---------
 server/publications/cards.js             |   2 +-
 7 files changed, 129 insertions(+), 57 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 1459fee7a..c288cca22 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -19,6 +19,11 @@ template(name="globalSearch")
         h1
           = resultsCount.get
           | Results
+        if queryErrors.get
+          div
+            each msg in errorMessages
+              span.global-search-error-messages
+                | {{_ msg.tag msg.value }}
         each card in results
           .global-search-card-wrapper
             a.minicard-wrapper.card-title(href=card.absoluteUrl)
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index b5003e97a..f2b775d86 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -42,33 +42,50 @@ BlazeComponent.extendComponent({
     this.query = new ReactiveVar('');
     this.queryParams = null;
     this.resultsCount = new ReactiveVar(0);
-
-    // this.autorun(() => {
-    //   const handle = subManager.subscribe('globalSearch');
-    //   Tracker.nonreactive(() => {
-    //     Tracker.autorun(() => {
-    //       this.isPageReady.set(handle.ready());
-    //     });
-    //   });
-    // });
+    this.queryErrors = new ReactiveVar(null);
     Meteor.subscribe('setting');
   },
 
   results() {
     if (this.queryParams) {
-      const cards = Cards.globalSearch(this.queryParams);
-      this.resultsCount.set(cards.count());
-      return cards;
+      const results = Cards.globalSearch(this.queryParams);
+      // eslint-disable-next-line no-console
+      console.log('errors:', results.errors);
+      this.resultsCount.set(results.cards.count());
+      this.queryErrors.set(results.errors);
+      return results.cards;
     }
+    this.resultsCount.set(0);
     return [];
   },
 
+  errorMessages() {
+    const errors = this.queryErrors.get();
+    const messages = [];
+
+    errors.notFound.boards.forEach(board => {
+      messages.push({ tag: 'board-title-not-found', value: board });
+    });
+    errors.notFound.swimlanes.forEach(swim => {
+      messages.push({ tag: 'swimlane-title-not-found', value: swim });
+    });
+    errors.notFound.lists.forEach(list => {
+      messages.push({ tag: 'list-title-not-found', value: list });
+    });
+    errors.notFound.users.forEach(user => {
+      messages.push({ tag: 'user-username-not-found', value: user });
+    });
+
+    return messages;
+  },
+
   events() {
     return [
       {
         'submit .js-search-query-form'(evt) {
           evt.preventDefault();
           this.query.set(evt.target.searchQuery.value);
+          this.queryErrors.set(null);
 
           if (!this.query.get()) {
             this.searching.set(false);
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index 42d41e079..7afcaaa04 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -67,3 +67,6 @@
 
 .global-search-context-list
   margin-bottom: 0.7rem
+
+.global-search-error-messages
+  color: darkred
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index a81a8c345..4ef083749 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -861,5 +861,9 @@
   "dueCardsViewChange-title": "Due Cards View",
   "dueCardsViewChange-choice-me": "Me",
   "dueCardsViewChange-choice-all": "All Users",
-  "dueCardsViewChange-choice-all-description": "Shows all incomplete cards with a *Due* date from boards for which the user has permission."
+  "dueCardsViewChange-choice-all-description": "Shows all incomplete cards with a *Due* date from boards for which the user has permission.",
+  "board-title-not-found": "Board '%s' not found.",
+  "swimlane-title-not-found": "Swimlane '%s' not found.",
+  "list-title-not-found": "List '%s' not found.",
+  "user-username-not-found": "Username '%s' not found."
 }
diff --git a/models/boards.js b/models/boards.js
index 8a286dc8e..b9c5460d4 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1208,6 +1208,20 @@ function boardRemover(userId, doc) {
   );
 }
 
+Boards.userSearch = (userId, includeArchived = false, selector = {}) => {
+  if (!includeArchived) {
+    selector = {
+      archived: false,
+    };
+  }
+  selector.$or = [
+    { permission: 'public' },
+    { members: { $elemMatch: { userId, isActive: true } } },
+  ];
+
+  return Boards.find(selector);
+};
+
 Boards.userBoards = (userId, includeArchived = false, selector = {}) => {
   if (!includeArchived) {
     selector = {
diff --git a/models/cards.js b/models/cards.js
index e6848c646..ec2817e37 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1735,6 +1735,15 @@ Cards.globalSearch = queryParams => {
   // eslint-disable-next-line no-console
   console.log('userId:', this.userId);
 
+  const errors = {
+    notFound: {
+      boards: [],
+      swimlanes: [],
+      lists: [],
+      users: [],
+    },
+  };
+
   const selector = {
     archived: false,
     type: 'cardType-card',
@@ -1743,58 +1752,78 @@ Cards.globalSearch = queryParams => {
     listId: { $nin: Lists.archivedListIds() },
   };
 
-  if ('swimlanesSelector' in queryParams) {
-    const swimSelector = {
-      archived: false,
-    };
-
-    for (const key in queryParams.swimlanesSelector) {
-      swimSelector[key] = queryParams.swimlanesSelector[key];
-    }
-
-    selector.swimlaneId.$in = Swimlanes.find(swimSelector).map(swim => {
-      return swim._id;
+  if (queryParams.boards.length) {
+    const queryBoards = [];
+    queryParams.boards.forEach(query => {
+      const boards = Boards.userSearch(userId, {
+        title: query,
+      });
+      if (boards.count()) {
+        boards.forEach(board => {
+          queryBoards.push(board._id);
+        });
+      } else {
+        errors.notFound.boards.push(query);
+      }
     });
+
+    selector.boardId.$in = queryBoards;
   }
 
-  if ('listsSelector' in queryParams) {
-    const listsSelector = {
-      archived: false,
-    };
-
-    // eslint-disable-next-line no-console
-    // console.log('listsSelector:', queryParams.listsSelector.keys());
-    for (const key in queryParams.listsSelector) {
-      listsSelector[key] = queryParams.listsSelector[key];
-    }
-
-    // eslint-disable-next-line no-console
-    console.log('search list selector:', selector);
-    selector.listId.$in = Lists.find(listsSelector).map(list => {
-      return list._id;
+  if (queryParams.swimlanes.length) {
+    const querySwimlanes = [];
+    queryParams.swimlanes.forEach(query => {
+      const swimlanes = Swimlanes.find({
+        title: query,
+      });
+      if (swimlanes.count()) {
+        swimlanes.forEach(swim => {
+          querySwimlanes.push(swim._id);
+        });
+      } else {
+        errors.notFound.swimlanes.push(query);
+      }
     });
+
+    selector.swimlaneId.$in = querySwimlanes;
+  }
+
+  if (queryParams.lists.length) {
+    const queryLists = [];
+    queryParams.lists.forEach(query => {
+      const lists = Lists.find({
+        title: query,
+      });
+      if (lists.count()) {
+        lists.forEach(list => {
+          queryLists.push(list._id);
+        });
+      } else {
+        errors.notFound.lists.push(query);
+      }
+    });
+
+    selector.listId.$in = queryLists;
   }
 
   if (queryParams.users.length) {
-    const users = [];
-    Users.find({ username: { $in: queryParams.users } }).forEach(user => {
-      users.push(user._id);
+    const queryUsers = [];
+    queryParams.users.forEach(query => {
+      const users = Users.find({
+        username: query,
+      });
+      if (users.count()) {
+        users.forEach(user => {
+          queryUsers.push(user._id);
+        });
+      } else {
+        errors.notFound.users.push(query);
+      }
     });
-    if (users.length) {
-      selector.$or = [
-        { members: { $in: users } },
-        { assignees: { $in: users } },
-      ];
-    }
-  }
-
-  if (queryParams.text) {
-    const regex = new RegExp(queryParams.text, 'i');
 
     selector.$or = [
-      { title: regex },
-      { description: regex },
-      { customFields: { $elemMatch: { value: regex } } },
+      { members: { $in: queryUsers } },
+      { assignees: { $in: queryUsers } },
     ];
   }
 
@@ -1820,7 +1849,7 @@ Cards.globalSearch = queryParams => {
 
   // eslint-disable-next-line no-console
   console.log('count:', cards.count());
-  return cards;
+  return { cards, errors };
 };
 
 //FUNCTIONS FOR creation of Activities
diff --git a/server/publications/cards.js b/server/publications/cards.js
index 6d14cf02c..802f47464 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -181,7 +181,7 @@ Meteor.publish('globalSearch', function(queryParams) {
   // eslint-disable-next-line no-console
   console.log('queryParams:', queryParams);
 
-  const cards = Cards.globalSearch(queryParams);
+  const cards = Cards.globalSearch(queryParams).cards;
 
   const boards = [];
   const swimlanes = [];

From 25dc779a73deae0d5ba9406371fbd4bfb7207eef Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 16:52:56 +0200
Subject: [PATCH 08/20] Global search development

* Add translation tags
* Use translation tags for showing result count
* Add logic for selecting cards by labels
* Readd code for searching card text that was mistakenly deleted
---
 client/components/main/globalSearch.jade |  8 +++-
 client/components/main/globalSearch.js   |  2 +-
 i18n/en.i18n.json                        |  5 +-
 models/boards.js                         | 13 ++++--
 models/cards.js                          | 58 ++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index c288cca22..9c1704cd8 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -17,8 +17,12 @@ template(name="globalSearch")
     else if hasResults.get
       .global-search-dueat-list-wrapper
         h1
-          = resultsCount.get
-          | Results
+          if $eq resultCount.get 0
+            | {{_ 'no-results' }}
+          else if $eq resultCount.get 1
+            | {{_ 'one-result' }}
+          else
+            | {{_ 'n-results' resultsCount.get }}
         if queryErrors.get
           div
             each msg in errorMessages
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index f2b775d86..be4156477 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -104,7 +104,7 @@ BlazeComponent.extendComponent({
           const reLabel = /^#(?<label>[\w:-]+)(\s+|$)/;
           const reOperator1 = /^(?<operator>\w+):(?<value>\w+)(\s+|$)/;
           const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
-          const reText = /^(?<text>[^:@#\s]+)(\s+|$)/;
+          const reText = /^(?<text>\S+)(\s+|$)/;
           const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
           const operatorMap = {
             board: 'boards',
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 974d5ada9..59190bb22 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -868,5 +868,8 @@
   "board-title-not-found": "Board '%s' not found.",
   "swimlane-title-not-found": "Swimlane '%s' not found.",
   "list-title-not-found": "List '%s' not found.",
-  "user-username-not-found": "Username '%s' not found."
+  "user-username-not-found": "Username '%s' not found.",
+  "globalSearch-title": "Search All Boards",
+  "one-results": "One Result",
+  "n-results": "%s Results"
 }
diff --git a/models/boards.js b/models/boards.js
index b9c5460d4..c400fcd29 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1208,18 +1208,21 @@ function boardRemover(userId, doc) {
   );
 }
 
-Boards.userSearch = (userId, includeArchived = false, selector = {}) => {
+Boards.userSearch = (
+  userId,
+  selector = {},
+  projection = {},
+  includeArchived = false,
+) => {
   if (!includeArchived) {
-    selector = {
-      archived: false,
-    };
+    selector.archived = false;
   }
   selector.$or = [
     { permission: 'public' },
     { members: { $elemMatch: { userId, isActive: true } } },
   ];
 
-  return Boards.find(selector);
+  return Boards.find(selector, projection);
 };
 
 Boards.userBoards = (userId, includeArchived = false, selector = {}) => {
diff --git a/models/cards.js b/models/cards.js
index ec2817e37..06052a535 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1827,6 +1827,63 @@ Cards.globalSearch = queryParams => {
     ];
   }
 
+  if (queryParams.labels.length) {
+    queryParams.labels.forEach(label => {
+      const queryLabels = [];
+
+      let boards = Boards.userSearch(userId, {
+        labels: { $elemMatch: { color: label.toLowerCase() } },
+      });
+
+      if (boards.count()) {
+        boards.forEach(board => {
+          // eslint-disable-next-line no-console
+          console.log('board:', board);
+          // eslint-disable-next-line no-console
+          console.log('board.labels:', board.labels);
+          board.labels
+            .filter(boardLabel => {
+              return boardLabel.color === label.toLowerCase();
+            })
+            .forEach(boardLabel => {
+              queryLabels.push(boardLabel._id);
+            });
+        });
+      } else {
+        const reLabel = new RegExp(label, 'i');
+        boards = Boards.userSearch(userId, {
+          labels: { $elemMatch: { name: reLabel } },
+        });
+
+        if (boards.count()) {
+          boards.forEach(board => {
+            board.labels
+              .filter(boardLabel => {
+                return boardLabel.name.match(reLabel);
+              })
+              .forEach(boardLabel => {
+                queryLabels.push(boardLabel._id);
+              });
+          });
+        } else {
+          errors.notFound.labels.push({ tag: 'label', value: label });
+        }
+      }
+
+      selector.labelIds = { $in: queryLabels };
+    });
+  }
+
+  if (queryParams.text) {
+    const regex = new RegExp(queryParams.text, 'i');
+
+    selector.$or = [
+      { title: regex },
+      { description: regex },
+      { customFields: { $elemMatch: { value: regex } } },
+    ];
+  }
+
   // eslint-disable-next-line no-console
   console.log('selector:', selector);
   const cards = Cards.find(selector, {
@@ -1843,6 +1900,7 @@ Cards.globalSearch = queryParams => {
       assignees: 1,
       colors: 1,
       dueAt: 1,
+      labelIds: 1,
     },
     limit: 50,
   });

From 8f21c86737b7bc343e1e0c19a9b1e13887e6257d Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 17:05:02 +0200
Subject: [PATCH 09/20] Add global search to user menu

* Add an entry to the user menu to access the global search page
* remove some useless code
---
 client/components/main/globalSearch.js  | 42 +------------------------
 client/components/users/userHeader.jade |  4 +++
 2 files changed, 5 insertions(+), 41 deletions(-)

diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index be4156477..0ead83a2b 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -181,48 +181,8 @@ BlazeComponent.extendComponent({
           // console.log('selector:', selector);
           // eslint-disable-next-line no-console
           console.log('text:', text);
-
-          if (selector.boards.length) {
-            selector.boardsSelector = {
-              archived: false,
-              title: { $in: [] },
-            };
-            selector.boards.forEach(term => {
-              selector.boardsSelector.title.$in.push(term);
-            });
-          }
-
-          if (selector.lists.length) {
-            selector.listsSelector = {
-              archived: false,
-              title: { $in: [] },
-            };
-            selector.lists.forEach(term => {
-              selector.listsSelector.title.$in.push(term);
-            });
-          }
-
-          if (selector.swimlanes.length) {
-            selector.swimlanesSelector = {
-              archived: false,
-              title: { $in: [] },
-            };
-            selector.swimlanes.forEach(term => {
-              selector.swimlanesSelector.title.$in.push(term);
-            });
-          }
-
-          if (selector.labels.length) {
-            selector.labelsSelector = {
-              archived: false,
-              title: { $in: [] },
-            };
-            selector.labels.forEach(term => {
-              selector.labelsSelector.title.$in.push(term);
-            });
-          }
-
           selector.text = text;
+
           // eslint-disable-next-line no-console
           console.log('selector:', selector);
 
diff --git a/client/components/users/userHeader.jade b/client/components/users/userHeader.jade
index 24d486eb4..d3ef6e3ff 100644
--- a/client/components/users/userHeader.jade
+++ b/client/components/users/userHeader.jade
@@ -21,6 +21,10 @@ template(name="memberMenuPopup")
         a.js-due-cards(href="{{pathFor 'due-cards'}}")
           i.fa.fa-calendar
           | {{_ 'dueCards-title'}}
+      li
+        a.js-global-search(href="{{pathFor 'global-search'}}")
+          i.fa.fa-search
+          | {{_ 'globalSearch-title'}}
       li
         a.js-broken-cards(href="{{pathFor 'broken-cards'}}")
           i.fa.fa-chain-broken

From 03e5d84e0e58286be991f7ab5df8101e3fc8b587 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 18:12:21 +0200
Subject: [PATCH 10/20] Edit search operator help text

---
 client/components/main/globalSearch.jade | 19 +++++++++++++------
 client/components/main/globalSearch.styl |  7 +++++++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 9c1704cd8..93784ace1 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -53,12 +53,19 @@ template(name="globalSearch")
                   = card.getList.title
     else
       h2 Search Operators
-      +viewer
-        = '*  `@`username\n'
-        = '*  `#`label\n'
-        = '*  `board:`<name> or `board:`"<name>"\n'
-        = '*  `swimlane:`<name> or `swimlane:`"<name>"\n'
-        = '*  `list:`<name> or `list:`"<name>"\n'
+        .global-search-instructions
+          +viewer
+            = 'Searches can include the operators to refine the search.  Operators are specified by writing the operator'
+            = 'name and value separated by a colon.  An operator specification of `list:Blocked` would limit the search'
+            = 'to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters'
+            = 'it most be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
+            = 'Available operators are:\n'
+            = '* `board` - searches for cards in boards with the specified title\n'
+            = '* `list` - searches for cards in lists with the specified title\n'
+            = '* `swimlane` - searches for cards in swimlanes with the specified title\n'
+            = '* `label` - searches for cards that have a label with the given color or name\n'
+            = '* `user` - cards where the given username is a member or assignee\n'
+
 
 template(name="globalSearchViewChangePopup")
   ul.pop-over-list
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index 7afcaaa04..6fca2b34e 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -70,3 +70,10 @@
 
 .global-search-error-messages
   color: darkred
+
+.global-search-operator
+  font-family: Courier
+
+.global-search-value
+  font-family: Courier
+  font-style: italic

From a27aaca918ed1b0f823ec1f89b32ffaa7efb3604 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 20:31:41 +0200
Subject: [PATCH 11/20] Global search instructions edits

---
 client/components/main/globalSearch.jade | 41 +++++++++++++++---------
 client/components/main/globalSearch.styl | 17 ++++++++++
 2 files changed, 42 insertions(+), 16 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 93784ace1..325ff80b7 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -10,8 +10,8 @@ template(name="globalSearchModalTitle")
 
 template(name="globalSearch")
   .wrapper
-    form.js-search-query-form
-      input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
+    form.global-search-instructions.js-search-query-form
+      input.global-search-query-input(type="text" name="searchQuery" placeholder="{{_ 'search-example'}}" autofocus dir="auto")
     if searching.get
       +spinner
     else if hasResults.get
@@ -52,20 +52,29 @@ template(name="globalSearch")
                 +viewer
                   = card.getList.title
     else
-      h2 Search Operators
-        .global-search-instructions
-          +viewer
-            = 'Searches can include the operators to refine the search.  Operators are specified by writing the operator'
-            = 'name and value separated by a colon.  An operator specification of `list:Blocked` would limit the search'
-            = 'to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters'
-            = 'it most be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
-            = 'Available operators are:\n'
-            = '* `board` - searches for cards in boards with the specified title\n'
-            = '* `list` - searches for cards in lists with the specified title\n'
-            = '* `swimlane` - searches for cards in swimlanes with the specified title\n'
-            = '* `label` - searches for cards that have a label with the given color or name\n'
-            = '* `user` - cards where the given username is a member or assignee\n'
-
+      .global-search-instructions
+        h1 Search Operators
+        +viewer
+          = 'Searches can include the operators to refine the search.  Operators are specified by writing the operator'
+          = 'name and value separated by a colon.  An operator specification of `list:Blocked` would limit the search'
+          = 'to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters'
+          = 'it most be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
+          = 'Available operators are:\n'
+          = '* `board:title` - cards in boards with the specified title\n'
+          = '* `list:title` - cards in lists with the specified title\n'
+          = '* `swimlane:title` - cards in swimlanes with the specified title\n'
+          = '* `label:color` - cards that have a label with the given color\n'
+          = '* `label:name` - cards that have a label with the given name\n'
+          = '* `user:username` - cards where the specified user is a member or assignee\n'
+          = '* `@username` - shorthand for `user:username`\n'
+          = '* `#label` - shorthand for `label:color-or-name`\n'
+          = '## Notes\n'
+          = '*  Multiple operators may be specified.\n'
+          = '*  Similar operators are ORed together.  Cards that match any of the conditions will be returned.\n'
+          = '    `list:Available list:Blocked` would return cards contained in any list named *Blocked* or *Available*.\n'
+          = '*  Differing operators are ANDed together.  Only cards that match each of the differing operators are returned.'
+          = '`list:Available label:red` returns only cards in the list *Available* with a *red* label.\n'
+          = '* Text searches are case insensitive.\n'
 
 template(name="globalSearchViewChangePopup")
   ul.pop-over-list
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index 6fca2b34e..a7aab5d51 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -71,9 +71,26 @@
 .global-search-error-messages
   color: darkred
 
+.global-search-instructions
+  width: 40%
+  min-width: 400px
+  margin-right: auto
+  margin-left: auto
+
+.global-search-query-input
+  width: 90% !important
+  margin-right: auto
+  margin-left: auto
+
 .global-search-operator
   font-family: Courier
 
 .global-search-value
   font-family: Courier
   font-style: italic
+
+code
+  color: white
+  background-color: grey
+  padding: 0.1rem
+  font-size: 0.7rem !important

From 391c0606d116fb9954f72674c22180adcd3e1aa4 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 20:34:20 +0200
Subject: [PATCH 12/20] Comment out debug statements

---
 client/components/main/globalSearch.js | 12 +++++-------
 models/cards.js                        |  6 +++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index 0ead83a2b..adb8495f2 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -50,7 +50,7 @@ BlazeComponent.extendComponent({
     if (this.queryParams) {
       const results = Cards.globalSearch(this.queryParams);
       // eslint-disable-next-line no-console
-      console.log('errors:', results.errors);
+      // console.log('errors:', results.errors);
       this.resultsCount.set(results.cards.count());
       this.queryErrors.set(results.errors);
       return results.cards;
@@ -98,7 +98,7 @@ BlazeComponent.extendComponent({
 
           let query = this.query.get();
           // eslint-disable-next-line no-console
-          console.log('query:', query);
+          // console.log('query:', query);
 
           const reUser = /^@(?<user>[\w.:]+)(\s+|$)/;
           const reLabel = /^#(?<label>[\w:-]+)(\s+|$)/;
@@ -180,11 +180,11 @@ BlazeComponent.extendComponent({
           // eslint-disable-next-line no-console
           // console.log('selector:', selector);
           // eslint-disable-next-line no-console
-          console.log('text:', text);
+          // console.log('text:', text);
           selector.text = text;
 
           // eslint-disable-next-line no-console
-          console.log('selector:', selector);
+          // console.log('selector:', selector);
 
           this.queryParams = selector;
 
@@ -193,7 +193,7 @@ BlazeComponent.extendComponent({
             Tracker.nonreactive(() => {
               Tracker.autorun(() => {
                 // eslint-disable-next-line no-console
-                console.log('ready:', handle.ready());
+                // console.log('ready:', handle.ready());
                 if (handle.ready()) {
                   this.searching.set(false);
                   this.hasResults.set(true);
@@ -205,6 +205,4 @@ BlazeComponent.extendComponent({
       },
     ];
   },
-
-  globalSearchList() {},
 }).register('globalSearch');
diff --git a/models/cards.js b/models/cards.js
index 06052a535..7b0f7350f 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1733,7 +1733,7 @@ Cards.mutations({
 Cards.globalSearch = queryParams => {
   const userId = Meteor.userId;
   // eslint-disable-next-line no-console
-  console.log('userId:', this.userId);
+  // console.log('userId:', this.userId);
 
   const errors = {
     notFound: {
@@ -1885,7 +1885,7 @@ Cards.globalSearch = queryParams => {
   }
 
   // eslint-disable-next-line no-console
-  console.log('selector:', selector);
+  // console.log('selector:', selector);
   const cards = Cards.find(selector, {
     fields: {
       _id: 1,
@@ -1906,7 +1906,7 @@ Cards.globalSearch = queryParams => {
   });
 
   // eslint-disable-next-line no-console
-  console.log('count:', cards.count());
+  // console.log('count:', cards.count());
   return { cards, errors };
 };
 

From f00395a6b6669e96116fa9475598abc904e17024 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 21:46:18 +0200
Subject: [PATCH 13/20] Add resultCard component for standard display of a card
 search result

---
 client/components/cards/resultCard.jade  | 23 +++++++++++++++++++++++
 client/components/cards/resultCard.js    | 11 +++++++++++
 client/components/cards/resultCard.styl  | 21 +++++++++++++++++++++
 client/components/main/globalSearch.jade | 23 +----------------------
 4 files changed, 56 insertions(+), 22 deletions(-)
 create mode 100644 client/components/cards/resultCard.jade
 create mode 100644 client/components/cards/resultCard.js
 create mode 100644 client/components/cards/resultCard.styl

diff --git a/client/components/cards/resultCard.jade b/client/components/cards/resultCard.jade
new file mode 100644
index 000000000..b1fabd9b6
--- /dev/null
+++ b/client/components/cards/resultCard.jade
@@ -0,0 +1,23 @@
+template(name="resultCard")
+  .result-card-wrapper
+    a.minicard-wrapper.card-title(href=card.absoluteUrl)
+      +minicard(this)
+      //= card.title
+    ul.result-card-context-list
+      li.result-card-context(title="{{_ 'board'}}")
+        +viewer
+          = getBoard.title
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'swimlane'}}")
+        +viewer
+          = getSwimlane.title
+      li.result-card-context.result-card-context-separator
+        = ' '
+        | {{_ 'context-separator'}}
+        = ' '
+      li.result-card-context(title="{{_ 'list'}}")
+        +viewer
+          = getList.title
diff --git a/client/components/cards/resultCard.js b/client/components/cards/resultCard.js
new file mode 100644
index 000000000..3b5da12cf
--- /dev/null
+++ b/client/components/cards/resultCard.js
@@ -0,0 +1,11 @@
+Template.resultCard.helpers({
+  userId() {
+    return Meteor.userId();
+  },
+});
+
+BlazeComponent.extendComponent({
+  events() {
+    return [{}];
+  },
+}).register('resultCard');
diff --git a/client/components/cards/resultCard.styl b/client/components/cards/resultCard.styl
new file mode 100644
index 000000000..def39a4d3
--- /dev/null
+++ b/client/components/cards/resultCard.styl
@@ -0,0 +1,21 @@
+.result-card-list-wrapper
+  margin: 1rem
+  border-radius: 5px
+  padding: 1.5rem
+  padding-top: 0.75rem
+  display: inline-block
+  min-width: 250px
+  max-width: 350px
+
+.result-card-wrapper
+  margin-top: 0
+  margin-bottom: 10px
+
+.result-card-context
+  display: inline-block
+
+.result-card-context-separator
+  font-weight: bold
+
+.result-card-context-list
+  margin-bottom: 0.7rem
diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 325ff80b7..a09c7fde8 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -29,28 +29,7 @@ template(name="globalSearch")
               span.global-search-error-messages
                 | {{_ msg.tag msg.value }}
         each card in results
-          .global-search-card-wrapper
-            a.minicard-wrapper.card-title(href=card.absoluteUrl)
-              +minicard(card)
-              //= card.title
-            ul.global-search-context-list
-              li.global-search-context(title="{{_ 'board'}}")
-                +viewer
-                  = card.getBoard.title
-              li.global-search-context.global-search-context-separator
-                = ' '
-                | {{_ 'context-separator'}}
-                = ' '
-              li.global-search-context(title="{{_ 'swimlane'}}")
-                +viewer
-                  = card.getSwimlane.title
-              li.global-search-context
-                = ' '
-                | {{_ 'context-separator'}}
-                = ' '
-              li.global-search-context(title="{{_ 'list'}}")
-                +viewer
-                  = card.getList.title
+          +resultCard(card)
     else
       .global-search-instructions
         h1 Search Operators

From 423480903f021fcfb79bbf015a5fc0e3a014e866 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Wed, 13 Jan 2021 21:54:15 +0200
Subject: [PATCH 14/20] Fix bug in displaying results count

---
 client/components/main/globalSearch.jade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index a09c7fde8..73e1028f6 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -17,9 +17,9 @@ template(name="globalSearch")
     else if hasResults.get
       .global-search-dueat-list-wrapper
         h1
-          if $eq resultCount.get 0
+          if $eq resultsCount.get 0
             | {{_ 'no-results' }}
-          else if $eq resultCount.get 1
+          else if $eq resultsCount.get 1
             | {{_ 'one-result' }}
           else
             | {{_ 'n-results' resultsCount.get }}

From 39ac19db20cd250c74b86bd09932dc98553d7649 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Thu, 14 Jan 2021 00:42:10 +0200
Subject: [PATCH 15/20] Fix search returning data for all users

---
 models/boards.js |  2 ++
 models/cards.js  | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/models/boards.js b/models/boards.js
index c400fcd29..cfeda7309 100644
--- a/models/boards.js
+++ b/models/boards.js
@@ -1226,6 +1226,8 @@ Boards.userSearch = (
 };
 
 Boards.userBoards = (userId, includeArchived = false, selector = {}) => {
+  check(userId, String);
+
   if (!includeArchived) {
     selector = {
       archived: false,
diff --git a/models/cards.js b/models/cards.js
index 7b0f7350f..e0b18b70b 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1731,9 +1731,9 @@ Cards.mutations({
 });
 
 Cards.globalSearch = queryParams => {
-  const userId = Meteor.userId;
+  const userId = Meteor.userId();
   // eslint-disable-next-line no-console
-  // console.log('userId:', this.userId);
+  console.log('userId:', userId);
 
   const errors = {
     notFound: {
@@ -1838,9 +1838,9 @@ Cards.globalSearch = queryParams => {
       if (boards.count()) {
         boards.forEach(board => {
           // eslint-disable-next-line no-console
-          console.log('board:', board);
+          // console.log('board:', board);
           // eslint-disable-next-line no-console
-          console.log('board.labels:', board.labels);
+          // console.log('board.labels:', board.labels);
           board.labels
             .filter(boardLabel => {
               return boardLabel.color === label.toLowerCase();
@@ -1885,7 +1885,7 @@ Cards.globalSearch = queryParams => {
   }
 
   // eslint-disable-next-line no-console
-  // console.log('selector:', selector);
+  console.log('selector:', selector);
   const cards = Cards.find(selector, {
     fields: {
       _id: 1,
@@ -1906,7 +1906,7 @@ Cards.globalSearch = queryParams => {
   });
 
   // eslint-disable-next-line no-console
-  // console.log('count:', cards.count());
+  console.log('count:', cards.count());
   return { cards, errors };
 };
 

From 50b25572f1f14ee0db85639da4b4a5496bf2c9a8 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Thu, 14 Jan 2021 12:46:52 +0200
Subject: [PATCH 16/20] Make search operators translatable

---
 client/components/main/globalSearch.js | 26 ++++++++++++--------------
 i18n/en.i18n.json                      | 13 ++++++++++++-
 2 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index adb8495f2..8b47bd975 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -106,20 +106,18 @@ BlazeComponent.extendComponent({
           const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
           const reText = /^(?<text>\S+)(\s+|$)/;
           const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
-          const operatorMap = {
-            board: 'boards',
-            b: 'boards',
-            label: 'labels',
-            lable: 'labels',
-            user: 'users',
-            u: 'users',
-            swimlane: 'swimlanes',
-            swim: 'swimlanes',
-            s: 'swimlanes',
-            list: 'lists',
-            l: 'lists',
-            is: 'is',
-          };
+          const operatorMap = {};
+          operatorMap[TAPi18n.__('operator-board')] = 'boards';
+          operatorMap[TAPi18n.__('operator-board-abbrev')] = 'boards';
+          operatorMap[TAPi18n.__('operator-swimlane')] = 'swimlanes';
+          operatorMap[TAPi18n.__('operator-swimlane-abbrev')] = 'swimlanes';
+          operatorMap[TAPi18n.__('operator-list')] = 'lists';
+          operatorMap[TAPi18n.__('operator-list-abbrev')] = 'lists';
+          operatorMap[TAPi18n.__('operator-label')] = 'labels';
+          operatorMap[TAPi18n.__('operator-label-abbrev')] = 'labels';
+          operatorMap[TAPi18n.__('operator-user')] = 'users';
+          operatorMap[TAPi18n.__('operator-user-abbrev')] = 'users';
+          operatorMap[TAPi18n.__('operator-is')] = 'is';
           const selector = {
             boards: [],
             swimlanes: [],
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 59190bb22..e3832d712 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -871,5 +871,16 @@
   "user-username-not-found": "Username '%s' not found.",
   "globalSearch-title": "Search All Boards",
   "one-results": "One Result",
-  "n-results": "%s Results"
+  "n-results": "%s Results",
+  "operator-board": "board",
+  "operator-board-abbrev": "b",
+  "operator-swimlane": "swimlane",
+  "operator-swimlane-abbrev": "s",
+  "operator-list": "list",
+  "operator-list-abbrev": "l",
+  "operator-label": "label",
+  "operator-label-abbrev": "lbl",
+  "operator-user": "user",
+  "operator-user-abbrev": "u",
+  "operator-is": "is"
 }

From 81d120ac506594a0eee6268704c71de22c5286cb Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Thu, 14 Jan 2021 12:47:23 +0200
Subject: [PATCH 17/20] Update search instructions

---
 client/components/main/globalSearch.jade | 20 ++++++++++----------
 client/components/main/globalSearch.styl |  3 ++-
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 73e1028f6..16e88befc 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -34,24 +34,24 @@ template(name="globalSearch")
       .global-search-instructions
         h1 Search Operators
         +viewer
-          = 'Searches can include the operators to refine the search.  Operators are specified by writing the operator'
-          = 'name and value separated by a colon.  An operator specification of `list:Blocked` would limit the search'
+          = 'Searches can include operators to refine the search.  Operators are specified by writing the operator'
+          = 'name and value separated by a colon.  For example, an operator specification of `list:Blocked` would limit the search'
           = 'to cards that are contained in a list named *Blocked*.  If the value contains spaces or special characters'
-          = 'it most be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
+          = 'it must be enclosed in quotation marks (e.g. `list:"To Review"`).\n'
           = 'Available operators are:\n'
-          = '* `board:title` - cards in boards with the specified title\n'
-          = '* `list:title` - cards in lists with the specified title\n'
-          = '* `swimlane:title` - cards in swimlanes with the specified title\n'
-          = '* `label:color` - cards that have a label with the given color\n'
-          = '* `label:name` - cards that have a label with the given name\n'
+          = '* `board:title` - cards in boards matching the specified title\n'
+          = '* `list:title` - cards in lists matching the specified title\n'
+          = '* `swimlane:title` - cards in swimlanes matching the specified title\n'
+          = '* `label:color` - cards that have a label matching the given color\n'
+          = '* `label:name` - cards that have a label matching the given name\n'
           = '* `user:username` - cards where the specified user is a member or assignee\n'
           = '* `@username` - shorthand for `user:username`\n'
           = '* `#label` - shorthand for `label:color-or-name`\n'
           = '## Notes\n'
           = '*  Multiple operators may be specified.\n'
-          = '*  Similar operators are ORed together.  Cards that match any of the conditions will be returned.\n'
+          = '*  Similar operators are *OR*ed together.  Cards that match any of the conditions will be returned.\n'
           = '    `list:Available list:Blocked` would return cards contained in any list named *Blocked* or *Available*.\n'
-          = '*  Differing operators are ANDed together.  Only cards that match each of the differing operators are returned.'
+          = '*  Differing operators are *AND*ed together.  Only cards that match all of the differing operators are returned.\n'
           = '`list:Available label:red` returns only cards in the list *Available* with a *red* label.\n'
           = '* Text searches are case insensitive.\n'
 
diff --git a/client/components/main/globalSearch.styl b/client/components/main/globalSearch.styl
index a7aab5d51..20bb45138 100644
--- a/client/components/main/globalSearch.styl
+++ b/client/components/main/globalSearch.styl
@@ -76,6 +76,7 @@
   min-width: 400px
   margin-right: auto
   margin-left: auto
+  line-height: 150%
 
 .global-search-query-input
   width: 90% !important
@@ -92,5 +93,5 @@
 code
   color: white
   background-color: grey
-  padding: 0.1rem
+  padding: 0.1rem !important
   font-size: 0.7rem !important

From c11c3f9a885b354c7c7a86a3b6cf829fbd5b6c5b Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Thu, 14 Jan 2021 12:53:45 +0200
Subject: [PATCH 18/20] code cleanup

---
 client/components/main/globalSearch.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index 8b47bd975..bfd087b74 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -106,6 +106,7 @@ BlazeComponent.extendComponent({
           const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
           const reText = /^(?<text>\S+)(\s+|$)/;
           const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
+
           const operatorMap = {};
           operatorMap[TAPi18n.__('operator-board')] = 'boards';
           operatorMap[TAPi18n.__('operator-board-abbrev')] = 'boards';
@@ -118,7 +119,8 @@ BlazeComponent.extendComponent({
           operatorMap[TAPi18n.__('operator-user')] = 'users';
           operatorMap[TAPi18n.__('operator-user-abbrev')] = 'users';
           operatorMap[TAPi18n.__('operator-is')] = 'is';
-          const selector = {
+
+          const params = {
             boards: [],
             swimlanes: [],
             lists: [],
@@ -126,21 +128,22 @@ BlazeComponent.extendComponent({
             labels: [],
             is: [],
           };
+
           let text = '';
           while (query) {
             // eslint-disable-next-line no-console
-            console.log('query:', query);
+            // console.log('query:', query);
             let m = query.match(reUser);
             if (m) {
               query = query.replace(reUser, '');
-              selector.users.push(m.groups.user);
+              params.users.push(m.groups.user);
               continue;
             }
 
             m = query.match(reLabel);
             if (m) {
               query = query.replace(reLabel, '');
-              selector.labels.push(m.groups.label);
+              params.labels.push(m.groups.label);
               continue;
             }
 
@@ -156,7 +159,7 @@ BlazeComponent.extendComponent({
             if (m) {
               const op = m.groups.operator.toLowerCase();
               if (op in operatorMap) {
-                selector[operatorMap[op]].push(m.groups.value);
+                params[operatorMap[op]].push(m.groups.value);
               }
               continue;
             }
@@ -179,15 +182,15 @@ BlazeComponent.extendComponent({
           // console.log('selector:', selector);
           // eslint-disable-next-line no-console
           // console.log('text:', text);
-          selector.text = text;
+          params.text = text;
 
           // eslint-disable-next-line no-console
           // console.log('selector:', selector);
 
-          this.queryParams = selector;
+          this.queryParams = params;
 
           this.autorun(() => {
-            const handle = subManager.subscribe('globalSearch', selector);
+            const handle = subManager.subscribe('globalSearch', params);
             Tracker.nonreactive(() => {
               Tracker.autorun(() => {
                 // eslint-disable-next-line no-console

From 32148007418d5efc3c5d983be2a8f0cb87ff3465 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Thu, 14 Jan 2021 16:54:44 +0200
Subject: [PATCH 19/20] Global search display total hits

* modify User model to store some session data for searches
* Display total hits in search results
---
 client/components/main/globalSearch.jade |  4 +++-
 client/components/main/globalSearch.js   |  3 +++
 i18n/en.i18n.json                        |  1 +
 models/cards.js                          | 21 ++++++++++++------
 models/users.js                          | 27 ++++++++++++++++++++++++
 5 files changed, 49 insertions(+), 7 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index 16e88befc..e666482cf 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -21,8 +21,10 @@ template(name="globalSearch")
             | {{_ 'no-results' }}
           else if $eq resultsCount.get 1
             | {{_ 'one-result' }}
-          else
+          else if $eq resultsCount.get totalHits.get
             | {{_ 'n-results' resultsCount.get }}
+          else
+            | {{_ 'n-of-n-results' resultsCount.get totalHits.get }}
         if queryErrors.get
           div
             each msg in errorMessages
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index bfd087b74..982c8e89a 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -42,6 +42,7 @@ BlazeComponent.extendComponent({
     this.query = new ReactiveVar('');
     this.queryParams = null;
     this.resultsCount = new ReactiveVar(0);
+    this.totalHits = new ReactiveVar(0);
     this.queryErrors = new ReactiveVar(null);
     Meteor.subscribe('setting');
   },
@@ -50,7 +51,9 @@ BlazeComponent.extendComponent({
     if (this.queryParams) {
       const results = Cards.globalSearch(this.queryParams);
       // eslint-disable-next-line no-console
+      console.log('count:', results.count);
       // console.log('errors:', results.errors);
+      this.totalHits.set(Meteor.user().sessionData.totalHits);
       this.resultsCount.set(results.cards.count());
       this.queryErrors.set(results.errors);
       return results.cards;
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index e3832d712..2f74dbb79 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -872,6 +872,7 @@
   "globalSearch-title": "Search All Boards",
   "one-results": "One Result",
   "n-results": "%s Results",
+  "n-of-n-results": "%s of %s Results",
   "operator-board": "board",
   "operator-board-abbrev": "b",
   "operator-swimlane": "swimlane",
diff --git a/models/cards.js b/models/cards.js
index e0b18b70b..b488dd55d 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1733,7 +1733,7 @@ Cards.mutations({
 Cards.globalSearch = queryParams => {
   const userId = Meteor.userId();
   // eslint-disable-next-line no-console
-  console.log('userId:', userId);
+  // console.log('userId:', userId);
 
   const errors = {
     notFound: {
@@ -1756,7 +1756,7 @@ Cards.globalSearch = queryParams => {
     const queryBoards = [];
     queryParams.boards.forEach(query => {
       const boards = Boards.userSearch(userId, {
-        title: query,
+        title: new RegExp(query, 'i'),
       });
       if (boards.count()) {
         boards.forEach(board => {
@@ -1774,7 +1774,7 @@ Cards.globalSearch = queryParams => {
     const querySwimlanes = [];
     queryParams.swimlanes.forEach(query => {
       const swimlanes = Swimlanes.find({
-        title: query,
+        title: new RegExp(query, 'i'),
       });
       if (swimlanes.count()) {
         swimlanes.forEach(swim => {
@@ -1792,7 +1792,7 @@ Cards.globalSearch = queryParams => {
     const queryLists = [];
     queryParams.lists.forEach(query => {
       const lists = Lists.find({
-        title: query,
+        title: new RegExp(query, 'i'),
       });
       if (lists.count()) {
         lists.forEach(list => {
@@ -1885,7 +1885,7 @@ Cards.globalSearch = queryParams => {
   }
 
   // eslint-disable-next-line no-console
-  console.log('selector:', selector);
+  // console.log('selector:', selector);
   const cards = Cards.find(selector, {
     fields: {
       _id: 1,
@@ -1906,7 +1906,16 @@ Cards.globalSearch = queryParams => {
   });
 
   // eslint-disable-next-line no-console
-  console.log('count:', cards.count());
+  // console.log('count:', cards.count());
+
+  if (Meteor.isServer) {
+    Users.update(userId, {
+      $set: {
+        'sessionData.totalHits': cards.count(),
+        'sessionData.lastHit': cards.count() > 50 ? 50 : cards.count(),
+      },
+    });
+  }
   return { cards, errors };
 };
 
diff --git a/models/users.js b/models/users.js
index 7dd011e04..8b0c13230 100644
--- a/models/users.js
+++ b/models/users.js
@@ -311,6 +311,33 @@ Users.attachSchema(
       optional: false,
       defaultValue: 'password',
     },
+    sessionData: {
+      /**
+       * profile settings
+       */
+      type: Object,
+      optional: true,
+      // eslint-disable-next-line consistent-return
+      autoValue() {
+        if (this.isInsert && !this.isSet) {
+          return {};
+        }
+      },
+    },
+    'sessionData.totalHits': {
+      /**
+       * Total hits from last search
+       */
+      type: Number,
+      optional: true,
+    },
+    'sessionData.lastHit': {
+      /**
+       * last hit that was returned
+       */
+      type: Number,
+      optional: true,
+    },
   }),
 );
 

From a56d47c768063b156d719b86bad4b275a7d8c986 Mon Sep 17 00:00:00 2001
From: "John R. Supplee" <john@supplee.com>
Date: Fri, 15 Jan 2021 00:33:24 +0200
Subject: [PATCH 20/20] Global search fixes

* use @ and # as the abbrevs for the user and list operators
* comment out debug code
* Modify display of card result counts
* Fix bug with publication not returning current user document
---
 client/components/main/globalSearch.jade |  8 ++---
 client/components/main/globalSearch.js   | 39 +++++++++---------------
 i18n/en.i18n.json                        | 11 ++++---
 models/cards.js                          |  6 ++++
 server/publications/cards.js             |  6 ++--
 5 files changed, 34 insertions(+), 36 deletions(-)

diff --git a/client/components/main/globalSearch.jade b/client/components/main/globalSearch.jade
index e666482cf..f2d2a2c7c 100644
--- a/client/components/main/globalSearch.jade
+++ b/client/components/main/globalSearch.jade
@@ -18,13 +18,13 @@ template(name="globalSearch")
       .global-search-dueat-list-wrapper
         h1
           if $eq resultsCount.get 0
-            | {{_ 'no-results' }}
+            | {{_ 'no-cards-found' }}
           else if $eq resultsCount.get 1
-            | {{_ 'one-result' }}
+            | {{_ 'one-card-found' }}
           else if $eq resultsCount.get totalHits.get
-            | {{_ 'n-results' resultsCount.get }}
+            | {{_ 'n-cards-found' resultsCount.get }}
           else
-            | {{_ 'n-of-n-results' resultsCount.get totalHits.get }}
+            | {{_ 'n-n-of-n-cards-found' 1 resultsCount.get totalHits.get }}
         if queryErrors.get
           div
             each msg in errorMessages
diff --git a/client/components/main/globalSearch.js b/client/components/main/globalSearch.js
index 982c8e89a..560cf9dda 100644
--- a/client/components/main/globalSearch.js
+++ b/client/components/main/globalSearch.js
@@ -51,7 +51,9 @@ BlazeComponent.extendComponent({
     if (this.queryParams) {
       const results = Cards.globalSearch(this.queryParams);
       // eslint-disable-next-line no-console
-      console.log('count:', results.count);
+      // console.log('user:', Meteor.user());
+      // eslint-disable-next-line no-console
+      // console.log('user:', Meteor.user().sessionData);
       // console.log('errors:', results.errors);
       this.totalHits.set(Meteor.user().sessionData.totalHits);
       this.resultsCount.set(results.cards.count());
@@ -103,10 +105,8 @@ BlazeComponent.extendComponent({
           // eslint-disable-next-line no-console
           // console.log('query:', query);
 
-          const reUser = /^@(?<user>[\w.:]+)(\s+|$)/;
-          const reLabel = /^#(?<label>[\w:-]+)(\s+|$)/;
-          const reOperator1 = /^(?<operator>\w+):(?<value>\w+)(\s+|$)/;
-          const reOperator2 = /^(?<operator>\w+):(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
+          const reOperator1 = /^((?<operator>\w+):|(?<abbrev>[#@]))(?<value>\w+)(\s+|$)/;
+          const reOperator2 = /^((?<operator>\w+):|(?<abbrev>[#@]))(?<quote>["']*)(?<value>.*?)\k<quote>(\s+|$)/;
           const reText = /^(?<text>\S+)(\s+|$)/;
           const reQuotedText = /^(?<quote>["'])(?<text>\w+)\k<quote>(\s+|$)/;
 
@@ -123,6 +123,8 @@ BlazeComponent.extendComponent({
           operatorMap[TAPi18n.__('operator-user-abbrev')] = 'users';
           operatorMap[TAPi18n.__('operator-is')] = 'is';
 
+          // eslint-disable-next-line no-console
+          // console.log('operatorMap:', operatorMap);
           const params = {
             boards: [],
             swimlanes: [],
@@ -134,22 +136,6 @@ BlazeComponent.extendComponent({
 
           let text = '';
           while (query) {
-            // eslint-disable-next-line no-console
-            // console.log('query:', query);
-            let m = query.match(reUser);
-            if (m) {
-              query = query.replace(reUser, '');
-              params.users.push(m.groups.user);
-              continue;
-            }
-
-            m = query.match(reLabel);
-            if (m) {
-              query = query.replace(reLabel, '');
-              params.labels.push(m.groups.label);
-              continue;
-            }
-
             m = query.match(reOperator1);
             if (!m) {
               m = query.match(reOperator2);
@@ -160,7 +146,12 @@ BlazeComponent.extendComponent({
               query = query.replace(reOperator1, '');
             }
             if (m) {
-              const op = m.groups.operator.toLowerCase();
+              let op;
+              if (m.groups.operator) {
+                op = m.groups.operator.toLowerCase();
+              } else {
+                op = m.groups.abbrev;
+              }
               if (op in operatorMap) {
                 params[operatorMap[op]].push(m.groups.value);
               }
@@ -181,14 +172,12 @@ BlazeComponent.extendComponent({
             }
           }
 
-          // eslint-disable-next-line no-console
-          // console.log('selector:', selector);
           // eslint-disable-next-line no-console
           // console.log('text:', text);
           params.text = text;
 
           // eslint-disable-next-line no-console
-          // console.log('selector:', selector);
+          // console.log('params:', params);
 
           this.queryParams = params;
 
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index 2f74dbb79..c4a22427e 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -870,9 +870,10 @@
   "list-title-not-found": "List '%s' not found.",
   "user-username-not-found": "Username '%s' not found.",
   "globalSearch-title": "Search All Boards",
-  "one-results": "One Result",
-  "n-results": "%s Results",
-  "n-of-n-results": "%s of %s Results",
+  "no-cards-found": "No Cards Found",
+  "one-card-found": "One Card Found",
+  "n-cards-found": "%s Cards Found",
+  "n-n-of-n-cards-found": "%s-%s of %s Cards Found",
   "operator-board": "board",
   "operator-board-abbrev": "b",
   "operator-swimlane": "swimlane",
@@ -880,8 +881,8 @@
   "operator-list": "list",
   "operator-list-abbrev": "l",
   "operator-label": "label",
-  "operator-label-abbrev": "lbl",
+  "operator-label-abbrev": "#",
   "operator-user": "user",
-  "operator-user-abbrev": "u",
+  "operator-user-abbrev": "@",
   "operator-is": "is"
 }
diff --git a/models/cards.js b/models/cards.js
index b488dd55d..04852cb9a 100644
--- a/models/cards.js
+++ b/models/cards.js
@@ -1740,7 +1740,9 @@ Cards.globalSearch = queryParams => {
       boards: [],
       swimlanes: [],
       lists: [],
+      labels: [],
       users: [],
+      is: [],
     },
   };
 
@@ -1850,7 +1852,11 @@ Cards.globalSearch = queryParams => {
             });
         });
       } else {
+        // eslint-disable-next-line no-console
+        // console.log('label:', label);
         const reLabel = new RegExp(label, 'i');
+        // eslint-disable-next-line no-console
+        // console.log('reLabel:', reLabel);
         boards = Boards.userSearch(userId, {
           labels: { $elemMatch: { name: reLabel } },
         });
diff --git a/server/publications/cards.js b/server/publications/cards.js
index f69e6994c..a1fef2696 100644
--- a/server/publications/cards.js
+++ b/server/publications/cards.js
@@ -179,14 +179,14 @@ Meteor.publish('globalSearch', function(queryParams) {
   check(queryParams, Object);
 
   // eslint-disable-next-line no-console
-  console.log('queryParams:', queryParams);
+  // console.log('queryParams:', queryParams);
 
   const cards = Cards.globalSearch(queryParams).cards;
 
   const boards = [];
   const swimlanes = [];
   const lists = [];
-  const users = [];
+  const users = [this.userId];
 
   cards.forEach(card => {
     if (card.boardId) boards.push(card.boardId);
@@ -204,6 +204,8 @@ Meteor.publish('globalSearch', function(queryParams) {
     }
   });
 
+  // eslint-disable-next-line no-console
+  // console.log('users:', users);
   return [
     cards,
     Boards.find({ _id: { $in: boards } }),