Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 15:30:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

code cleanup

Browse source
This commit is contained in:
John R. Supplee 2021-01-14 12:53:45 +02:00
parent 81d120ac50
commit c11c3f9a88
1 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
client/components/main/globalSearch.js
View file

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