fix search broken bug with incomplete filter (#3935)

microsoft · Jul 15, 2021 · a7278d2 · a7278d2
1 parent 5eb43ea
commit a7278d2
Showing 1 changed file with 71 additions and 57 deletions.
diff --git a/ts/webui/src/components/trial-detail/search/Search.tsx b/ts/webui/src/components/trial-detail/search/Search.tsx
@@ -154,75 +154,89 @@ function Search(props): any {
         }
 
         allFilterConditions.forEach(eachFilterConditionStr => {
-            let eachFilterConditionArr: string[] = [];
-
-            // EXPERIMENT.searchSpace[parameter]._type === 'choice'
-            if (eachFilterConditionStr.includes('>' || '<')) {
-                const operator = eachFilterConditionStr.includes('>') === true ? '>' : '<';
-                eachFilterConditionArr = eachFilterConditionStr.trim().split(operator);
-                newSearchFilter.push({
-                    name: eachFilterConditionArr[0],
-                    operator: operator,
-                    value1: eachFilterConditionArr[1],
-                    value2: '',
-                    choice: [],
-                    isChoice: false
-                });
-            } else if (eachFilterConditionStr.includes('≠')) {
-                // drop_rate≠6; status≠[x,xx,xxx]; conv_size≠[3,7]
-                eachFilterConditionArr = eachFilterConditionStr.trim().split('≠');
-                const filterName = eachFilterConditionArr[0] === 'Status' ? 'StatusNNI' : eachFilterConditionArr[0];
-                const isChoicesType = isChoiceType(filterName);
-                newSearchFilter.push({
-                    name: filterName,
-                    operator: '≠',
-                    value1: isChoicesType ? '' : JSON.parse(eachFilterConditionArr[1]),
-                    value2: '',
-                    choice: isChoicesType ? convertStringArrToList(eachFilterConditionArr[1]) : [],
-                    isChoice: isChoicesType ? true : false
-                });
+            // input content looks like that: `Trial id:`
+            if (
+                eachFilterConditionStr.endsWith(':') ||
+                eachFilterConditionStr.endsWith('<') ||
+                eachFilterConditionStr.endsWith('>') ||
+                eachFilterConditionStr.endsWith('≠')
+            ) {
+                return;
             } else {
-                // = : conv_size:[1,2,3,4]; Trial id:3; hidden_size:[1,2], status:[val1,val2,val3]
-                eachFilterConditionArr = eachFilterConditionStr.trim().split(':');
-                const filterName = eachFilterConditionArr[0] === 'Status' ? 'StatusNNI' : eachFilterConditionArr[0];
-                const isChoicesType = isChoiceType(filterName);
-                const isArray =
-                    eachFilterConditionArr.length > 1 && eachFilterConditionArr[1].includes('[' || ']') ? true : false;
-                if (isArray === true) {
-                    if (isChoicesType === true) {
-                        // status:[SUCCEEDED]
-                        newSearchFilter.push({
-                            name: filterName,
-                            operator: '=',
-                            value1: '',
-                            value2: '',
-                            choice: convertStringArrToList(eachFilterConditionArr[1]),
-                            isChoice: true
-                        });
+                let eachFilterConditionArr: string[] = [];
+
+                // EXPERIMENT.searchSpace[parameter]._type === 'choice'
+                if (eachFilterConditionStr.includes('>' || '<')) {
+                    const operator = eachFilterConditionStr.includes('>') === true ? '>' : '<';
+                    eachFilterConditionArr = eachFilterConditionStr.trim().split(operator);
+                    newSearchFilter.push({
+                        name: eachFilterConditionArr[0],
+                        operator: operator,
+                        value1: eachFilterConditionArr[1],
+                        value2: '',
+                        choice: [],
+                        isChoice: false
+                    });
+                } else if (eachFilterConditionStr.includes('≠')) {
+                    // drop_rate≠6; status≠[x,xx,xxx]; conv_size≠[3,7]
+                    eachFilterConditionArr = eachFilterConditionStr.trim().split('≠');
+                    const filterName = eachFilterConditionArr[0] === 'Status' ? 'StatusNNI' : eachFilterConditionArr[0];
+                    const isChoicesType = isChoiceType(filterName);
+                    newSearchFilter.push({
+                        name: filterName,
+                        operator: '≠',
+                        value1: isChoicesType ? '' : JSON.parse(eachFilterConditionArr[1]),
+                        value2: '',
+                        choice: isChoicesType ? convertStringArrToList(eachFilterConditionArr[1]) : [],
+                        isChoice: isChoicesType ? true : false
+                    });
+                } else if (eachFilterConditionStr.includes(':')) {
+                    // = : conv_size:[1,2,3,4]; Trial id:3; hidden_size:[1,2], status:[val1,val2,val3]
+                    eachFilterConditionArr = eachFilterConditionStr.trim().split(':');
+                    const filterName = eachFilterConditionArr[0] === 'Status' ? 'StatusNNI' : eachFilterConditionArr[0];
+                    const isChoicesType = isChoiceType(filterName);
+                    const isArray =
+                        eachFilterConditionArr.length > 1 && eachFilterConditionArr[1].includes('[' || ']')
+                            ? true
+                            : false;
+                    if (isArray === true) {
+                        if (isChoicesType === true) {
+                            // status:[SUCCEEDED]
+                            newSearchFilter.push({
+                                name: filterName,
+                                operator: '=',
+                                value1: '',
+                                value2: '',
+                                choice: convertStringArrToList(eachFilterConditionArr[1]),
+                                isChoice: true
+                            });
+                        } else {
+                            // drop_rate:[1,10]
+                            newSearchFilter.push({
+                                name: eachFilterConditionArr[0],
+                                operator: 'between',
+                                value1: JSON.parse(eachFilterConditionArr[1])[0],
+                                value2: JSON.parse(eachFilterConditionArr[1])[1],
+                                choice: [],
+                                isChoice: false
+                            });
+                        }
                     } else {
-                        // drop_rate:[1,10]
                         newSearchFilter.push({
                             name: eachFilterConditionArr[0],
-                            operator: 'between',
-                            value1: JSON.parse(eachFilterConditionArr[1])[0],
-                            value2: JSON.parse(eachFilterConditionArr[1])[1],
+                            operator: '=',
+                            value1: eachFilterConditionArr[1],
+                            value2: '',
                             choice: [],
                             isChoice: false
                         });
                     }
                 } else {
-                    newSearchFilter.push({
-                        name: eachFilterConditionArr[0],
-                        operator: '=',
-                        value1: eachFilterConditionArr[1],
-                        value2: '',
-                        choice: [],
-                        isChoice: false
-                    });
+                    // user input: Trial id
+                    return;
                 }
             }
         });
-
         changeTableListPage(newSearchFilter);
     }