ATLAS-1099 : UI : multiple tag assign button hides wrongly

dashboardv2/public/css/scss/form.scss

@@ -31,9 +31,12 @@
     }
 }
 
-.sidebar-wrapper .form-control {
+.sidebar-wrapper {
+    z-index: 9 !important;
+    .form-control {
         background-color: $white;
         border: 1px $white solid;
+    }
 }
 
 .well {

dashboardv2/public/css/scss/override.scss

@@ -222,6 +222,10 @@
     cursor: pointer;
 }
 
+.popover {
+    z-index: 99;
+}
+
 .popover-content {
     ul {
         color: $dark_gray;

dashboardv2/public/css/scss/search.scss

@@ -96,3 +96,7 @@ input {
 .labelShowRecord {
     line-height: 40px;
 }
+
+.btnAssign {
+    margin-bottom: 15px;
+}

dashboardv2/public/js/templates/schema/SchemaTableLayoutView_tmpl.html

@@ -14,6 +14,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-<a href="javascript:void(0)" class="inputAssignTag multiSelectTerm" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i> Assign Term</a>
-<a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
+<div class="clearfix">
+    <a href="javascript:void(0)" class="inputAssignTag multiSelectTerm btnAssign" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i> Assign Term</a>
+    <a href="javascript:void(0)" class="inputAssignTag multiSelectTag assignTag btnAssign" style="display:none" data-id="addAssignTag"><i class="fa fa-plus"></i> Assign Tag</a>
+</div>
 <div id="r_tagLayoutView"></div>

dashboardv2/public/js/utils/TableLayout.js

@@ -310,7 +310,7 @@ define(['require',
                 var totalRecords = collState.totalRecords || 0;
                 var pageStartIndex = totalRecords ? (collState.currentPage * collState.pageSize) : 0;
                 var pageEndIndex = pageStartIndex + this.collection.length;
-                this.$('[data-id="r_footerRecords"]').html('<h5>Showing ' + (totalRecords ? pageStartIndex + 1 : 1) + ' - ' + pageEndIndex + '</h5>');
+                this.$('[data-id="r_footerRecords"]').html('<h5>Showing ' + (totalRecords ? pageStartIndex + 1 : (this.collection.length === 0) ? 0 : 1) + ' - ' + pageEndIndex + '</h5>');
                 return this;
             },
             /**

dashboardv2/public/js/views/audit/AuditTableLayoutView.js

@@ -223,10 +223,10 @@ define(['require',
                     'modules/Modal',
                     'views/audit/CreateAuditTableLayoutView',
                 ], function(Modal, CreateAuditTableLayoutView) {
+                    that.action = $(e.target).data("action");
                     var eventModel = that.entityCollection.findWhere({ 'eventKey': $(e.currentTarget).data('modalid') }).toJSON(),
                         collectionModel = new that.entityCollection.model(eventModel),
                         view = new CreateAuditTableLayoutView({ guid: that.guid, entityModel: collectionModel, action: that.action });
-                    that.action = $(e.target).data("action");
                     var modal = new Modal({
                         title: that.action,
                         content: view,

dashboardv2/public/js/views/schema/SchemaLayoutView.js

@@ -112,14 +112,8 @@ define(['require',
                 this.listenTo(this.schemaCollection, 'backgrid:selected', function(model, checked) {
                     if (checked === true) {
                         model.set("isEnable", true);
-                        if (Globals.taxonomy) {
-                            this.$('.multiSelectTerm').show();
-                        }
-                        this.$('.multiSelectTag').show();
                     } else {
                         model.set("isEnable", false);
-                        this.$('.multiSelectTerm').hide();
-                        this.$('.multiSelectTag').hide();
                     }
                     this.arr = [];
                     var that = this;
@@ -132,6 +126,17 @@ define(['require',
                             });
                         }
                     });
+                    if (this.arr.length > 0) {
+                        if (Globals.taxonomy) {
+                            this.$('.multiSelectTerm').show();
+                        }
+                        this.$('.multiSelectTag').show();
+                    } else {
+                        if (Globals.taxonomy) {
+                            this.$('.multiSelectTerm').hide();
+                        }
+                        this.$('.multiSelectTag').hide();
+                    }
                 });
                 this.listenTo(this.schemaCollection, "error", function(value) {
                     $('.schemaTable').hide();

dashboardv2/public/js/views/search/SearchLayoutView.js

@@ -202,6 +202,9 @@ define(['require',
                     this.$('.typeLOV').hide();
                     this.type = "fulltext";
                 }
+                if (this.query[this.type].query !== Utils.getUrlState.getQueryParams().query && this.type == Utils.getUrlState.getQueryParams().searchType) {
+                    this.query[this.type].query = Utils.getUrlState.getQueryParams().query;
+                }
                 Utils.setUrl({
                     url: '#!/search/searchResult',
                     urlParams: {

dashboardv2/public/js/views/search/SearchResultLayoutView.js

@@ -141,16 +141,12 @@ define(['require',
             bindEvents: function() {
                 var that = this;
                 this.listenTo(this.searchCollection, 'backgrid:selected', function(model, checked) {
+                    this.arr = [];
                     if (checked === true) {
                         model.set("isEnable", true);
-                        this.$('.searchResult').find(".inputAssignTag.multiSelect").show();
-                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").show();
                     } else {
                         model.set("isEnable", false);
-                        this.$('.searchResult').find(".inputAssignTag.multiSelect").hide();
-                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").hide();
                     }
-                    this.arr = [];
                     this.searchCollection.find(function(item) {
                         if (item.get('isEnable')) {
                             var term = [];
@@ -160,6 +156,13 @@ define(['require',
                             });
                         }
                     });
+                    if (this.arr.length > 0) {
+                        this.$('.searchResult').find(".inputAssignTag.multiSelect").show();
+                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").show();
+                    } else {
+                        this.$('.searchResult').find(".inputAssignTag.multiSelect").hide();
+                        this.$('.searchResult').find(".inputAssignTag.multiSelectTag").hide();
+                    }
                 });
                 this.listenTo(this.searchCollection, "error", function(value, responseData) {
                     this.$('.fontLoader').hide();

release-log.txt

@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
 ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags)
 
 ALL CHANGES:
+ATLAS-1099 UI : multiple tag assign button hides wrongly (Kalyanikashikar via sumasai)
 ATLAS-1087 Provide an option to turn off persisting entity definition in audits (sumasai, shwethags)
 ATLAS-1097 Fix a potential NPE issue flagged by Coverity scan (mneethiraj via shwethags)
 ATLAS-1090 UI: Multi-Select Tagging. (Kalyanikashikar via kevalbhatt)