Skip to content

A
atlas
Commit b9779eca by kevalbhatt
Options

ATLAS-1608 :Search UI improvement

parent 670a4c00
Showing with 265 additions and 170 deletions
dashboardv2/public/css/scss/override.scss
...@@ -255,3 +255,8 @@ ...@@ -255,3 +255,8 @@
.ui-pnotify-text { .ui-pnotify-text {
word-break: break-all; word-break: break-all;
} }
.advancedInfo{
margin-left: 5px;
cursor: pointer;
}
\ No newline at end of file
dashboardv2/public/css/scss/search.scss
...@@ -19,7 +19,6 @@ ...@@ -19,7 +19,6 @@
//colors //colors
$color_celeste_approx: #1D1F2B; $color_celeste_approx: #1D1F2B;
$switchTransition: .4s ease-out; $switchTransition: .4s ease-out;
@mixin transition($transition...) { @mixin transition($transition...) {
-webkit-transition: $transition; -webkit-transition: $transition;
-moz-transition: $transition; -moz-transition: $transition;
...@@ -62,7 +61,6 @@ $switchTransition: .4s ease-out; ...@@ -62,7 +61,6 @@ $switchTransition: .4s ease-out;
border-radius: 10px; border-radius: 10px;
box-shadow: 1px 1px 5px rgba(black, .2); box-shadow: 1px 1px 5px rgba(black, .2);
@include transition(left #{$switchTransition}); @include transition(left #{$switchTransition});
&:before { &:before {
content: ''; content: '';
position: absolute; position: absolute;
...@@ -76,7 +74,6 @@ $switchTransition: .4s ease-out; ...@@ -76,7 +74,6 @@ $switchTransition: .4s ease-out;
box-shadow: inset 0 1px rgba(black, .02); box-shadow: inset 0 1px rgba(black, .02);
@include transition(inherit) @include transition(inherit)
} }
.switch-input:checked ~ & { .switch-input:checked ~ & {
left: 30px; left: 30px;
box-shadow: -1px 1px 5px rgba(black, .2); box-shadow: -1px 1px 5px rgba(black, .2);
...@@ -109,3 +106,11 @@ $switchTransition: .4s ease-out; ...@@ -109,3 +106,11 @@ $switchTransition: .4s ease-out;
.btnAssign { .btnAssign {
margin-bottom: 15px; margin-bottom: 15px;
} }
.srchType {
margin: 5px 0px;
.srchTitle {
font-size: 14px;
color: $gray
}
}
dashboardv2/public/js/collection/VSearchList.js
...@@ -37,11 +37,7 @@ define(['require', ...@@ -37,11 +37,7 @@ define(['require',
parseRecords: function(resp, options) { parseRecords: function(resp, options) {
this.queryType = resp.queryType; this.queryType = resp.queryType;
this.queryText = resp.queryText; this.queryText = resp.queryText;
if (resp.queryType && resp.queryType == "DSL") {
return resp.entities ? resp.entities : []; return resp.entities ? resp.entities : [];
} else {
return resp.fullTextResult ? resp.fullTextResult : [];
}
}, },
}, },
//Static Class Members //Static Class Members
......
dashboardv2/public/js/router/Router.js
...@@ -29,7 +29,7 @@ define([ ...@@ -29,7 +29,7 @@ define([
var AppRouter = Backbone.Router.extend({ var AppRouter = Backbone.Router.extend({
routes: { routes: {
// Define some URL routes // Define some URL routes
'': 'commonAction', '': 'defaultAction',
'!/': 'tagAttributePageLoad', '!/': 'tagAttributePageLoad',
'!/tag/tagAttribute/(*name)': 'tagAttributePageLoad', '!/tag/tagAttribute/(*name)': 'tagAttributePageLoad',
'!/taxonomy/detailCatalog/(*url)': 'detailCatalog', '!/taxonomy/detailCatalog/(*url)': 'detailCatalog',
...@@ -243,31 +243,20 @@ define([ ...@@ -243,31 +243,20 @@ define([
'value': paramObj, 'value': paramObj,
'entityDefCollection': that.entityDefCollection, 'entityDefCollection': that.entityDefCollection,
'typeHeaders': that.typeHeaders, 'typeHeaders': that.typeHeaders,
'initialView': paramObj.query.trim().length === 0 'initialView': (paramObj.query.trim() || paramObj.type || (paramObj.dslChecked == "true" ? "" : paramObj.tag)).length === 0
})); }));
}); });
}, },
defaultAction: function(actions) { defaultAction: function(actions) {
// We have no matching route, lets just log what the URL was // We have no matching route, lets just log what the URL was
if (Globals.taxonomy) {
Utils.setUrl({ Utils.setUrl({
url: '#!/taxonomy', url: '#!/search',
mergeBrowserUrl: false, mergeBrowserUrl: false,
updateTabState: function() { updateTabState: function() {
return { taxonomyUrl: this.url, stateChanged: false }; return { searchUrl: this.url, stateChanged: false };
}, },
trigger: true trigger: true
}); });
} else {
Utils.setUrl({
url: '#!/tag',
mergeBrowserUrl: false,
updateTabState: function() {
return { tagUrl: this.url, stateChanged: false };
},
trigger: true
});
}
console.log('No route:', actions); console.log('No route:', actions);
} }
......
dashboardv2/public/js/templates/business_catalog/SideNavLayoutView_tmpl.html
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
<a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a> <a href="index.html"><i class="fa fa-globe"></i> Apache Atlas</a>
</li> </li>
<ul class="tabs" style="width: 100%;" role="tablist"> <ul class="tabs" style="width: 100%;" role="tablist">
<li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab">Tags</a></li> <li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
<li role="presentation" class="{{tabClass}}"><a href="#tab-tag" aria-controls="tab-tag" data-name="tab-tag" role="tab" data-toggle="tab"><i class="fa fa-tags"></i> Tags</a></li>
{{#if taxonomy}} {{#if taxonomy}}
<li role="presentation" class="tab col-sm-4"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class="">Taxonomy</a></li> <li role="presentation" class="tab col-sm-4"><a href="#tab-taxonomy" aria-controls="tab-taxonomy" data-name="tab-taxonomy" role="tab" data-toggle="tab" class=""><i class="fa fa-sitemap"></i> Taxonomy</a></li>
{{/if}} {{/if}}
<li role="presentation" class="{{tabClass}}"><a href="#tab-search" aria-controls="tab-search" data-name="tab-search" role="tab" data-toggle="tab" class=""><i class="fa fa-search"></i> Search</a></li>
</ul> </ul>
</ul> </ul>
<div class="tab-content"> <div class="tab-content">
......
dashboardv2/public/js/templates/search/AdvancedSearchInfo_tmpl.html 0 → 100644
<!--
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
-->
<div class="">
<h4>Use DSL (Doamin Specific Language) to build queries</h4>
<ul>
<li><b>Entity Name</b></li>
<li>name="string"</li>
</ul>
<ul>
<li><b>Joining queries</b></li>
<li>name="sales_fact",columns as column select column.name</li>
</ul>
<ul>
<li><b>Query Name</b></li>
<li>Query Example</li>
</ul>
<ul>
<li><b>Query Name</b></li>
<li>Query Example</li>
</ul>
<ul>
<a href="http://atlas.incubator.apache.org/Search.html" target="_blank">More sample queries and use-cases >></a>
</ul>
</div>
dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html
...@@ -17,29 +17,41 @@ ...@@ -17,29 +17,41 @@
<div class="row row-margin-bottom"> <div class="row row-margin-bottom">
<div class="col-sm-12" style="margin:15px 0px;"> <div class="col-sm-12" style="margin:15px 0px;">
<div class="row"> <div class="row">
<div class="col-md-6"> <div class="col-md-9" style="margin-top: 5px;">
<span class="pull-left">Text</span> <span class="pull-left">Basic</span>
<label class="switch pull-left"> <label class="switch pull-left">
<input type="checkbox" class="switch-input" name="queryType" value="text" /> <input type="checkbox" class="switch-input" name="queryType" value="text" />
<span class="switch-slider"></span> <span class="switch-slider"></span>
</label> </label>
<span class="pull-left">DSL</span> <span class="pull-left">Advanced</span>
<span class="advancedInfo" data-id="advancedInfo"><i class="fa fa-question-circle-o"></i></span>
</div> </div>
<div class="col-md-6"> <div class="col-md-3">
<button type="button" class="btn btn-atlasAction btn-atlas pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button> <button type="button" class="btn btn-atlasAction btn-atlas pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button>
</div> </div>
</div> </div>
</div> </div>
<div class="col-sm-12"> <div class="col-sm-12">
<div class="form-group"> <div class="form-group">
<div class="srchType">
<span class="srchTitle">Search By Type</span>
<div class="typeLOV"> <div class="typeLOV">
<select data-id="typeLOV"></select> <select data-id="typeLOV"></select>
</div> </div>
<div class="searchInputClick"> </div>
<input type="text" class="form-control" data-id="searchInput" placeholder="Search using a query string: e.g. sales_fact" style="margin-top: 5px;"> <div class="srchType tagBox">
<span class="srchTitle">Search By Tag</span>
<div class="typeLOV">
<select data-id="tagLOV"></select>
</div>
</div>
<div class="srchType">
<span class="srchTitle">Search By Query</span>
<input type="text" class="form-control" data-id="searchInput" placeholder="Search using a query string: e.g. sales_fact" style="margin: 5px 0px;">
</div> </div>
</div> </div>
<div class="clearAdvanceSearch" data-id="clearSearch">Clear</div> <div class="clearAdvanceSearch" data-id="clearSearch">Clear</div>
<button type="button" class="btn btn-atlas advanceSearchBtn" data-id="searchBtn" disabled="disabled">Search</button> <button type="button" class="btn btn-atlas advanceSearchBtn" data-id="searchBtn" disabled="disabled">Search</button>
</div> </div>
<div id="searchResult"></div> <div id="searchResult"></div>
</div>
dashboardv2/public/js/templates/search/SearchResultLayoutView_tmpl.html
...@@ -34,9 +34,9 @@ ...@@ -34,9 +34,9 @@
<div id="r_searchResultTableLayoutView"> <div id="r_searchResultTableLayoutView">
{{#if entityCreate}} {{#if entityCreate}}
<div class="entityLink" style="display:none"> <div class="entityLink" style="display:none">
<h1><b>Atlas Search</b></h1> <h1><b>{{searchType}}</b></h1>
<p class="entityLink">Search Atlas for existing entities or <p class="entityLink">Search Atlas for existing entities or
<a href="javascript:void(0)" data-id='createEntity'> create new entity </a><i class="fa fa-question-circle" aria-hidden="true"></i> <a href="javascript:void(0)" data-id='createEntity'> create new entity </a>
</p> </p>
</div> </div>
{{/if}} {{/if}}
......
dashboardv2/public/js/utils/Enums.js
...@@ -44,7 +44,7 @@ define(['require'], function(require) { ...@@ -44,7 +44,7 @@ define(['require'], function(require) {
Enums.searchUrlType = { Enums.searchUrlType = {
DSL: 'dsl', DSL: 'dsl',
FULLTEXT: 'fulltext' FULLTEXT: 'basic'
} }
return Enums; return Enums;
......
dashboardv2/public/js/views/business_catalog/SideNavLayoutView.js
...@@ -111,13 +111,13 @@ define(['require', ...@@ -111,13 +111,13 @@ define(['require',
}); });
}, },
selectTab: function() { selectTab: function() {
if (Utils.getUrlState.isTagTab() || (Utils.getUrlState.isInitial() && !Globals.taxonomy)) { if (Utils.getUrlState.isTagTab()) {
this.$('.tabs').find('li a[aria-controls="tab-tag"]').parents('li').addClass('active').siblings().removeClass('active'); this.$('.tabs').find('li a[aria-controls="tab-tag"]').parents('li').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('div#tab-tag').addClass('active').siblings().removeClass('active'); this.$('.tab-content').find('div#tab-tag').addClass('active').siblings().removeClass('active');
} else if (Utils.getUrlState.isTaxonomyTab() || (Utils.getUrlState.isInitial() && Globals.taxonomy)) { } else if (Utils.getUrlState.isTaxonomyTab()) {
this.$('.tabs').find('li a[aria-controls="tab-taxonomy"]').parents('li').addClass('active').siblings().removeClass('active'); this.$('.tabs').find('li a[aria-controls="tab-taxonomy"]').parents('li').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('div#tab-taxonomy').addClass('active').siblings().removeClass('active'); this.$('.tab-content').find('div#tab-taxonomy').addClass('active').siblings().removeClass('active');
} else if (Utils.getUrlState.isSearchTab() || (Utils.getUrlState.isDetailPage())) { } else if (Utils.getUrlState.isSearchTab() || (Utils.getUrlState.isDetailPage()) || Utils.getUrlState.isInitial()) {
this.$('.tabs').find('li a[aria-controls="tab-search"]').parents('li').addClass('active').siblings().removeClass('active'); this.$('.tabs').find('li a[aria-controls="tab-search"]').parents('li').addClass('active').siblings().removeClass('active');
this.$('.tab-content').find('div#tab-search').addClass('active').siblings().removeClass('active'); this.$('.tab-content').find('div#tab-search').addClass('active').siblings().removeClass('active');
} }
......
dashboardv2/public/js/views/business_catalog/TreeLayoutView.js
...@@ -338,7 +338,7 @@ define(['require', ...@@ -338,7 +338,7 @@ define(['require',
var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href'); var dataURL = this.$('.taxonomyTree').find('li[data-id="Parent"]').find("a").data('href');
if (dataURL) { if (dataURL) {
this.url = dataURL; this.url = dataURL;
if (this.viewBased) { if (this.viewBased && Utils.getUrlState.isTaxonomyTab()) {
Utils.setUrl({ Utils.setUrl({
url: "#!/taxonomy/detailCatalog" + dataURL, url: "#!/taxonomy/detailCatalog" + dataURL,
mergeBrowserUrl: false, mergeBrowserUrl: false,
......
dashboardv2/public/js/views/search/AdvancedSearchInfoView.js 0 → 100644
/**
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
define(['require',
'backbone',
'hbs!tmpl/search/AdvancedSearchInfo_tmpl',
], function(require, Backbone, AdvancedSearchInfoTmpl) {
var AdvancedSearchInfoView = Backbone.Marionette.LayoutView.extend(
/** @lends AdvancedSearchInfoView */
{
_viewName: 'AdvancedSearchInfoView',
template: AdvancedSearchInfoTmpl,
/** Layout sub regions */
regions: {},
/** ui selector cache */
ui: {
},
/** ui events hash */
events: function() {
var events = {};
return events;
},
/**
* intialize a new AdvancedSearchInfoView Layout
* @constructs
*/
initialize: function(options) {
},
bindEvents: function() {},
onRender: function() {
},
});
return AdvancedSearchInfoView;
});
dashboardv2/public/js/views/search/SearchDetailLayoutView.js
...@@ -53,16 +53,10 @@ define(['require', ...@@ -53,16 +53,10 @@ define(['require',
var that = this; var that = this;
require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) { require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) {
var value = {};
if (that.value) {
value = {
'query': that.value.query,
'searchType': that.value.searchType
};
}
if (that.RSearchResultLayoutView) { if (that.RSearchResultLayoutView) {
that.RSearchResultLayoutView.show(new SearchResultLayoutView({ that.RSearchResultLayoutView.show(new SearchResultLayoutView({
value: value, value: that.value,
tag: that.tag, tag: that.tag,
initialView: that.initialView, initialView: that.initialView,
entityDefCollection: that.entityDefCollection, entityDefCollection: that.entityDefCollection,
......
dashboardv2/public/js/views/search/SearchLayoutView.js
...@@ -42,7 +42,9 @@ define(['require', ...@@ -42,7 +42,9 @@ define(['require',
searchBtn: '[data-id="searchBtn"]', searchBtn: '[data-id="searchBtn"]',
clearSearch: '[data-id="clearSearch"]', clearSearch: '[data-id="clearSearch"]',
typeLov: '[data-id="typeLOV"]', typeLov: '[data-id="typeLOV"]',
refreshBtn: '[data-id="refreshBtn"]' tagLov: '[data-id="tagLOV"]',
refreshBtn: '[data-id="refreshBtn"]',
advancedInfoBtn: '[data-id="advancedInfo"]'
}, },
/** ui events hash */ /** ui events hash */
...@@ -51,19 +53,18 @@ define(['require', ...@@ -51,19 +53,18 @@ define(['require',
that = this; that = this;
events["keyup " + this.ui.searchInput] = function(e) { events["keyup " + this.ui.searchInput] = function(e) {
var code = e.which; var code = e.which;
this.ui.searchBtn.removeAttr("disabled");
if (code == 13) { if (code == 13) {
that.findSearchResult(); that.findSearchResult();
} }
if (code == 8 && this.ui.searchInput.val() == "" && this.ui.typeLov.val() == "") { this.checkForButtonVisiblity();
this.ui.searchBtn.attr("disabled", "true");
}
}; };
events["change " + this.ui.searchType] = 'dslFulltextToggle'; events["change " + this.ui.searchType] = 'dslFulltextToggle';
events["click " + this.ui.searchBtn] = 'findSearchResult'; events["click " + this.ui.searchBtn] = 'findSearchResult';
events["click " + this.ui.clearSearch] = 'clearSearchData'; events["click " + this.ui.clearSearch] = 'clearSearchData';
events["change " + this.ui.typeLov] = 'onChangeTypeList'; events["change " + this.ui.typeLov] = 'checkForButtonVisiblity';
events["change " + this.ui.tagLov] = 'checkForButtonVisiblity';
events["click " + this.ui.refreshBtn] = 'onRefreshButton'; events["click " + this.ui.refreshBtn] = 'onRefreshButton';
events["click " + this.ui.advancedInfoBtn] = 'advancedInfo';
return events; return events;
}, },
/** /**
...@@ -72,42 +73,68 @@ define(['require', ...@@ -72,42 +73,68 @@ define(['require',
*/ */
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'value', 'typeHeaders')); _.extend(this, _.pick(options, 'value', 'typeHeaders'));
this.type = "fulltext"; this.type = "basic";
var param = Utils.getUrlState.getQueryParams(); var param = Utils.getUrlState.getQueryParams();
this.query = { this.query = {
dsl: { dsl: {
query: "" query: "",
type: ""
}, },
fulltext: { basic: {
query: "" query: "",
type: "",
tag: ""
} }
}; };
this.dsl = false; this.dsl = false;
if (param && param.query && param.searchType) { if (param && param.searchType) {
this.query[param.searchType].query = param.query; _.extend(this.query[param.searchType], _.pick(param, 'query', 'type', 'tag'));
} }
}, },
bindEvents: function(param) { bindEvents: function(param) {
this.listenTo(this.typeHeaders, "reset", function(value) { this.listenTo(this.typeHeaders, "reset", function(value) {
this.renderTypeList(); this.renderTypeTagList();
this.setValues(); this.setValues();
this.ui.typeLov.select2({ this.ui.typeLov.select2({
placeholder: "Search For", placeholder: "Select",
allowClear: true allowClear: true
}); });
this.ui.tagLov.select2({
placeholder: "Select",
allowClear: true
});
this.checkForButtonVisiblity();
}, this); }, this);
}, },
checkForButtonVisiblity: function() {
var that = this,
value = this.ui.searchInput.val() || this.ui.typeLov.val();
if (!this.dsl && !value.length) {
value = this.ui.tagLov.val();
}
if (value && value.length) {
this.ui.searchBtn.removeAttr("disabled");
setTimeout(function() {
that.ui.searchInput.focus();
}, 0);
} else {
this.ui.searchBtn.attr("disabled", "true");
}
},
onRender: function() { onRender: function() {
// array of tags which is coming from url // array of tags which is coming from url
this.$('.typeLOV').hide(); this.renderTypeTagList();
this.renderTypeList();
this.setValues(); this.setValues();
this.ui.typeLov.select2({ this.ui.typeLov.select2({
placeholder: "Search For", placeholder: "Select",
allowClear: true
});
this.ui.tagLov.select2({
placeholder: "Select",
allowClear: true allowClear: true
}); });
this.ui.searchBtn.attr("disabled", "true");
this.bindEvents(); this.bindEvents();
this.checkForButtonVisiblity();
}, },
fetchCollection: function(value) { fetchCollection: function(value) {
this.typeHeaders.fetch({ reset: true }); this.typeHeaders.fetch({ reset: true });
...@@ -115,33 +142,45 @@ define(['require', ...@@ -115,33 +142,45 @@ define(['require',
onRefreshButton: function() { onRefreshButton: function() {
this.fetchCollection(); this.fetchCollection();
}, },
advancedInfo: function(e) {
require([
'views/search/AdvancedSearchInfoView',
'modules/Modal'
], function(AdvancedSearchInfoView, Modal) {
var view = new AdvancedSearchInfoView();
var modal = new Modal({
title: 'Advanced Search Queries',
content: view,
okCloses: true,
showFooter: true,
allowCancel: false
}).open();
view.on('closeModal', function() {
modal.trigger('cancel');
});
});
},
manualRender: function(paramObj) { manualRender: function(paramObj) {
this.setValues(paramObj); this.setValues(paramObj);
}, },
renderTypeList: function() { renderTypeTagList: function() {
var that = this; var that = this;
this.ui.typeLov.empty(); this.ui.typeLov.empty();
var str = '<option></option>'; var typeStr = '<option></option>',
tagStr = typeStr;
this.typeHeaders.fullCollection.comparator = function(model) { this.typeHeaders.fullCollection.comparator = function(model) {
return Utils.getName(model.toJSON(), 'name').toLowerCase(); return Utils.getName(model.toJSON(), 'name').toLowerCase();
} }
this.typeHeaders.fullCollection.sort().each(function(model) { this.typeHeaders.fullCollection.sort().each(function(model) {
if (model.get('category') == 'ENTITY') { if (model.get('category') == 'ENTITY') {
str += '<option>' + (Utils.getName(model.toJSON(), 'name')) + '</option>'; typeStr += '<option>' + (Utils.getName(model.toJSON(), 'name')) + '</option>';
} }
}); if (model.get('category') == 'CLASSIFICATION') {
that.ui.typeLov.html(str); tagStr += '<option>' + (Utils.getName(model.toJSON(), 'name')) + '</option>';
},
onChangeTypeList: function(e) {
var that = this;
if (this.ui.typeLov.select2('val') !== "") {
this.ui.searchBtn.removeAttr("disabled");
} else if (this.ui.searchInput.val() === "") {
this.ui.searchBtn.attr("disabled", "true");
} }
setTimeout(function() { });
that.ui.searchInput.focus(); that.ui.typeLov.html(typeStr);
}, 0); that.ui.tagLov.html(tagStr);
}, },
setValues: function(paramObj) { setValues: function(paramObj) {
var arr = [], var arr = [],
...@@ -157,56 +196,42 @@ define(['require', ...@@ -157,56 +196,42 @@ define(['require',
} }
if (this.value.query !== undefined) { if (this.value.query !== undefined) {
// get only search value and append it to input box // get only search value and append it to input box
if (this.dsl) {
var query = this.value.query.split(" ");
if (query.length > 1) {
var typeList = query.shift();
} else {
var typeList = "";
}
if (this.ui.typeLov.data('select2')) { if (this.ui.typeLov.data('select2')) {
this.ui.typeLov.val(typeList).trigger('change'); this.ui.typeLov.val(this.value.type).trigger('change');
} else { } else {
this.ui.typeLov.val(typeList); this.ui.typeLov.val(this.value.type);
setTimeout(function() {
that.ui.searchInput.focus();
}, 0);
} }
this.ui.searchInput.val(query.join(" ")); if (!this.dsl) {
if (this.ui.tagLov.data('select2')) {
this.ui.tagLov.val(this.value.tag).trigger('change');
} else { } else {
this.ui.tagLov.val(this.value.tag);
}
}
this.ui.searchInput.val(this.value.query); this.ui.searchInput.val(this.value.query);
setTimeout(function() { setTimeout(function() {
that.ui.searchInput.focus(); that.ui.searchInput.focus();
}, 0); }, 0);
} }
if (this.ui.searchBtn.val() !== "" || this.ui.typeLov.val() !== "") {
this.ui.searchBtn.removeAttr("disabled");
}
} }
}
this.bindEvents(arr);
}, },
findSearchResult: function() { findSearchResult: function() {
this.triggerSearch(this.ui.searchInput.val()); this.triggerSearch(this.ui.searchInput.val());
}, },
triggerSearch: function(value) { triggerSearch: function(value) {
if (this.ui.searchType.is(':checked')) { this.query[this.type].query = value;
this.type = "dsl"; this.query[this.type].type = this.ui.typeLov.select2('val');
} else if (!this.ui.searchType.is(':checked')) { if (!this.dsl) {
this.type = "fulltext"; this.query[this.type].tag = this.ui.tagLov.select2('val');
}
if (this.ui.typeLov.select2('val') !== null && this.dsl === true) {
this.query[this.type].query = this.ui.typeLov.select2('val') + ' ' + value;
} else {
this.query[this.type].query = value
} }
Utils.setUrl({ Utils.setUrl({
url: '#!/search/searchResult', url: '#!/search/searchResult',
urlParams: { urlParams: _.extend(this.query[this.type], {
query: this.query[this.type].query,
searchType: this.type, searchType: this.type,
dslChecked: this.ui.searchType.is(':checked') dslChecked: this.ui.searchType.is(':checked')
}, }),
updateTabState: function() { updateTabState: function() {
return { searchUrl: this.url, stateChanged: true }; return { searchUrl: this.url, stateChanged: true };
}, },
...@@ -219,35 +244,34 @@ define(['require', ...@@ -219,35 +244,34 @@ define(['require',
if (e.currentTarget.checked) { if (e.currentTarget.checked) {
this.type = "dsl"; this.type = "dsl";
this.dsl = true; this.dsl = true;
this.$('.typeLOV').show(); this.$('.tagBox').hide();
} else { } else {
this.$('.tagBox').show();
this.dsl = false; this.dsl = false;
this.$('.typeLOV').hide(); this.type = "basic";
this.type = "fulltext";
} }
if (Utils.getUrlState.getQueryParams() && this.query[this.type].query !== Utils.getUrlState.getQueryParams().query && this.type == Utils.getUrlState.getQueryParams().searchType) { if (Utils.getUrlState.getQueryParams() && this.query[this.type].query !== Utils.getUrlState.getQueryParams().query && this.type == Utils.getUrlState.getQueryParams().searchType) {
this.query[this.type].query = Utils.getUrlState.getQueryParams().query; this.query[this.type].query = Utils.getUrlState.getQueryParams().query;
} }
Utils.setUrl({ Utils.setUrl({
url: '#!/search/searchResult', url: '#!/search/searchResult',
urlParams: { urlParams: _.extend(this.query[this.type], {
query: this.query[this.type].query,
searchType: this.type, searchType: this.type,
dslChecked: this.ui.searchType.is(':checked') dslChecked: this.ui.searchType.is(':checked')
}, }),
updateTabState: function() { updateTabState: function() {
return { searchUrl: this.url, stateChanged: true }; return { searchUrl: this.url, stateChanged: true };
}, },
mergeBrowserUrl: false, mergeBrowserUrl: false,
trigger: true trigger: true
}); });
this.ui.searchInput.attr("placeholder", this.type == "dsl" ? 'Optional conditions' : 'Search using a query string: e.g. sales_fact');
}, },
clearSearchData: function() { clearSearchData: function() {
this.query[this.type].query = ""; this.query[this.type].query = "";
this.ui.typeLov.val("").trigger("change"); this.ui.typeLov.val("").trigger("change");
this.ui.tagLov.val("").trigger("change");
this.ui.searchInput.val(""); this.ui.searchInput.val("");
this.ui.searchBtn.attr("disabled", "true"); this.checkForButtonVisiblity()
Utils.setUrl({ Utils.setUrl({
url: '#!/search', url: '#!/search',
mergeBrowserUrl: false, mergeBrowserUrl: false,
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -63,7 +63,8 @@ define(['require', ...@@ -63,7 +63,8 @@ define(['require',
}, },
templateHelpers: function() { templateHelpers: function() {
return { return {
entityCreate: Globals.entityCreate entityCreate: Globals.entityCreate,
searchType: this.searchType
}; };
}, },
/** ui events hash */ /** ui events hash */
...@@ -147,6 +148,10 @@ define(['require', ...@@ -147,6 +148,10 @@ define(['require',
this.bindEvents(); this.bindEvents();
this.bradCrumbList = []; this.bradCrumbList = [];
this.arr = []; this.arr = [];
this.searchType = 'Basic Search';
if (this.value && this.value.searchType && this.value.searchType == 'dsl') {
this.searchType = 'Advanced Search';
}
}, },
bindEvents: function() { bindEvents: function() {
var that = this; var that = this;
...@@ -160,11 +165,7 @@ define(['require', ...@@ -160,11 +165,7 @@ define(['require',
this.searchCollection.find(function(item) { this.searchCollection.find(function(item) {
if (item.get('isEnable')) { if (item.get('isEnable')) {
var term = []; var term = [];
if (that.searchCollection.queryType == "DSL") { var obj = model.toJSON();
var obj = item.toJSON();
} else {
var obj = item.get('entity');
}
that.arr.push({ that.arr.push({
id: obj.guid, id: obj.guid,
model: obj model: obj
...@@ -202,7 +203,7 @@ define(['require', ...@@ -202,7 +203,7 @@ define(['require',
} else { } else {
value = { value = {
'query': '', 'query': '',
'searchType': 'fulltext' 'searchType': 'basic'
}; };
} }
this.fetchCollection(value); this.fetchCollection(value);
...@@ -223,9 +224,6 @@ define(['require', ...@@ -223,9 +224,6 @@ define(['require',
}, },
fetchCollection: function(value) { fetchCollection: function(value) {
var that = this; var that = this;
if (value && (value.query === undefined || value.query.trim() === "")) {
return;
}
this.showLoader(); this.showLoader();
if (Globals.searchApiCallRef && Globals.searchApiCallRef.readyState === 1) { if (Globals.searchApiCallRef && Globals.searchApiCallRef.readyState === 1) {
Globals.searchApiCallRef.abort(); Globals.searchApiCallRef.abort();
...@@ -240,7 +238,7 @@ define(['require', ...@@ -240,7 +238,7 @@ define(['require',
if (Utils.getUrlState.isTagTab()) { if (Utils.getUrlState.isTagTab()) {
this.searchCollection.url = UrlLinks.searchApiUrl(Enums.searchUrlType.DSL); this.searchCollection.url = UrlLinks.searchApiUrl(Enums.searchUrlType.DSL);
} }
_.extend(this.searchCollection.queryParams, { 'query': value.query.trim() }); _.extend(this.searchCollection.queryParams, { 'query': value.query.trim() || null, 'type': value.type || null, 'classification': value.tag || null });
} }
Globals.searchApiCallRef = this.searchCollection.fetch({ Globals.searchApiCallRef = this.searchCollection.fetch({
skipDefaultError: true, skipDefaultError: true,
...@@ -293,7 +291,7 @@ define(['require', ...@@ -293,7 +291,7 @@ define(['require',
if (Globals.taxonomy) { if (Globals.taxonomy) {
multiAssignDataTerm = '<a href="javascript:void(0)" class="inputAssignTag multiSelect" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a>'; multiAssignDataTerm = '<a href="javascript:void(0)" class="inputAssignTag multiSelect" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a>';
} }
if (Globals.entityCreate && (resultText.indexOf("\`") != 0) && Globals.entityTypeConfList) { if (Globals.entityCreate && Globals.entityTypeConfList) {
createEntityTag = "<p>If you do not find the entity in search result below then you can" + '<a href="javascript:void(0)" data-id="createEntity"> create new entity</a></p>'; createEntityTag = "<p>If you do not find the entity in search result below then you can" + '<a href="javascript:void(0)" data-id="createEntity"> create new entity</a></p>';
} }
that.$('.searchResult').html(resultData + multiAssignDataTag + multiAssignDataTerm + createEntityTag); that.$('.searchResult').html(resultData + multiAssignDataTag + multiAssignDataTerm + createEntityTag);
...@@ -349,14 +347,9 @@ define(['require', ...@@ -349,14 +347,9 @@ define(['require',
className: "searchTableName", className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") { var obj = model.toJSON(),
var obj = model.toJSON(); nameHtml = "",
} else { name = Utils.getName(obj);
var obj = model.get('entity');
}
var nameHtml = "";
var name = Utils.getName(obj);
if (obj.guid) { if (obj.guid) {
nameHtml = '<a title="' + name + '" href="#!/detailPage/' + obj.guid + '">' + name + '</a>'; nameHtml = '<a title="' + name + '" href="#!/detailPage/' + obj.guid + '">' + name + '</a>';
} else { } else {
...@@ -388,11 +381,7 @@ define(['require', ...@@ -388,11 +381,7 @@ define(['require',
sortable: false, sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON(); var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj && obj.attributes && obj.attributes.description) { if (obj && obj.attributes && obj.attributes.description) {
return obj.attributes.description; return obj.attributes.description;
} }
...@@ -406,11 +395,7 @@ define(['require', ...@@ -406,11 +395,7 @@ define(['require',
sortable: false, sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON(); var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj && obj.typeName) { if (obj && obj.typeName) {
return '<a title="Search ' + obj.typeName + '" href="#!/search/searchResult?query=' + obj.typeName + ' &searchType=dsl&dslChecked=true">' + obj.typeName + '</a>'; return '<a title="Search ' + obj.typeName + '" href="#!/search/searchResult?query=' + obj.typeName + ' &searchType=dsl&dslChecked=true">' + obj.typeName + '</a>';
} }
...@@ -424,11 +409,7 @@ define(['require', ...@@ -424,11 +409,7 @@ define(['require',
sortable: false, sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON(); var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj && obj.attributes && obj.attributes.owner) { if (obj && obj.attributes && obj.attributes.owner) {
return obj.attributes.owner; return obj.attributes.owner;
} }
...@@ -444,11 +425,7 @@ define(['require', ...@@ -444,11 +425,7 @@ define(['require',
className: 'searchTag', className: 'searchTag',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON(); var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
if (obj.status && Enums.entityStateReadOnly[obj.status]) { if (obj.status && Enums.entityStateReadOnly[obj.status]) {
return '<div class="readOnly">' + CommonViewFunction.tagForTable(obj); + '</div>'; return '<div class="readOnly">' + CommonViewFunction.tagForTable(obj); + '</div>';
} else { } else {
...@@ -468,11 +445,7 @@ define(['require', ...@@ -468,11 +445,7 @@ define(['require',
className: 'searchTerm', className: 'searchTerm',
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (that.searchCollection.queryType == "DSL") {
var obj = model.toJSON(); var obj = model.toJSON();
} else {
var obj = model.get('entity');
}
var returnObject = CommonViewFunction.termTableBreadcrumbMaker(obj); var returnObject = CommonViewFunction.termTableBreadcrumbMaker(obj);
if (returnObject.object) { if (returnObject.object) {
that.bradCrumbList.push(returnObject.object); that.bradCrumbList.push(returnObject.object);
...@@ -509,21 +482,13 @@ define(['require', ...@@ -509,21 +482,13 @@ define(['require',
var that = this; var that = this;
if (!multiple || multiple.length === 0) { if (!multiple || multiple.length === 0) {
var modal = this.searchCollection.find(function(item) { var modal = this.searchCollection.find(function(item) {
if (that.searchCollection.queryType == "DSL") { var obj = model.toJSON();
var obj = item.toJSON();
} else {
var obj = item.get('entity');
}
if (obj.guid === guid) { if (obj.guid === guid) {
return true; return true;
} }
}); });
if (modal) { if (modal) {
if (that.searchCollection.queryType == "DSL") { var obj = model.toJSON();
var obj = modal.toJSON();
} else {
var obj = modal.get('entity');
}
} else { } else {
return []; return [];
} }
......
dashboardv2/public/js/views/tag/TagDetailLayoutView.js
...@@ -55,8 +55,7 @@ define(['require', ...@@ -55,8 +55,7 @@ define(['require',
var that = this; var that = this;
require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) { require(['views/search/SearchResultLayoutView'], function(SearchResultLayoutView) {
var value = { var value = {
'query': "`" + that.tag + "`", 'query': "`" + that.tag + "`"
'type': 'dsl'
}; };
that.RSearchResultLayoutView.show(new SearchResultLayoutView({ that.RSearchResultLayoutView.show(new SearchResultLayoutView({
value: value, value: value,
......
dashboardv2/public/js/views/tag/TagLayoutView.js
...@@ -96,7 +96,7 @@ define(['require', ...@@ -96,7 +96,7 @@ define(['require',
} }
}, },
setValues: function(manual) { setValues: function(manual) {
if (Utils.getUrlState.isTagTab() || (Utils.getUrlState.isInitial() && !Globals.taxonomy)) { if (Utils.getUrlState.isTagTab()) {
if (!this.tag) { if (!this.tag) {
this.selectFirst = false; this.selectFirst = false;
this.ui.tagsParent.find('li').first().addClass('active'); this.ui.tagsParent.find('li').first().addClass('active');
......
release-log.txt
...@@ -9,6 +9,12 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al ...@@ -9,6 +9,12 @@ ATLAS-1060 Add composite indexes for exact match performance improvements for al
ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai) ATLAS-1127 Modify creation and modification timestamps to Date instead of Long(sumasai)
ALL CHANGES: ALL CHANGES:
ATLAS-1608 :Search UI improvement (kevalbhatt)
ATLAS-1630: basic search implementation (#2)
ATLAS-1630: basic search implementation using fulltext with support for filter by type & classification
ATLAS-1629: updated copyright date in NOTICE file
ATLAS-1627: fix for missed update to full-text index attribute on entity-update
ATLAS-1626: updated Atlas type-load to be resilient to incorrect constraints in the store (from earlier version env)
ATLAS-1628 Restrict user from entering text in datepicker input (kevalbhatt) ATLAS-1628 Restrict user from entering text in datepicker input (kevalbhatt)
ATLAS-1538 Make AtlasLdapAuthenticationProvider like Ranger for OpenLdap type (nixonrodrigues via kevalbhatt) ATLAS-1538 Make AtlasLdapAuthenticationProvider like Ranger for OpenLdap type (nixonrodrigues via kevalbhatt)
ATLAS-1605 Edit Entity in UI : Update button is not enabled when updating attribute of type date (Kalyanikashikar via kevalbhatt) ATLAS-1605 Edit Entity in UI : Update button is not enabled when updating attribute of type date (Kalyanikashikar via kevalbhatt)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment