ATLAS-3792:- New UI: makes it mandate to apply an attribute filter when…

ATLAS-3792:- New UI: makes it mandate to apply an attribute filter when "Filters" is selected even if the user just wants to select "Show Deleted Entities"

ATLAS-3792:- New UI: makes it mandate to apply an attribute filter when…
b9f4ae79 · kevalbhatt · 62451d62 · b9f4ae79
Commit b9f4ae79 authored May 21, 2020 by kevalbhatt
Hide whitespace changes
Inline Side-by-side

Showing with 9 additions and 3 deletions

SearchDefaultLayoutView.js ...boardv3/public/js/views/search/SearchDefaultLayoutView.js +9 -3

No files found.
--- a/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchDefaultLayoutView.js
@@ -338,10 +338,16 @@ define(["require", "backbone", "utils/Globals", "hbs!tmpl/search/SearchDefaultLa
                filterPopupStatus();
                function searchAttribute() {
-                    if (queryBuilderRef.data("queryBuilder")) {
+                    var queryBuilderObj = queryBuilderRef.data("queryBuilder");
-                        var rule = queryBuilderRef.queryBuilder("getRules");
+                    if (queryBuilderObj) {
+                        var ruleWithInvalid = queryBuilderObj.getRules({ allow_invalid: true }),
+                            rule = queryBuilderObj.getRules();
+                        rule ? that.updateFilterOptions(rule, filtertype, isTag) : isFilterValidate = false;
+                        if (ruleWithInvalid && ruleWithInvalid.rules.length === 1 && ruleWithInvalid.rules[0].id === null) {
+                            isFilterValidate = true;
+                            queryBuilderObj.clearErrors();
+                        }
                    }
-                    rule ? that.updateFilterOptions(rule, filtertype, isTag) : isFilterValidate = false;
                }
                function filterPopupStatus() {