DDF-2644 Update to hide hidden attributes more consistently, expand scope

 - Previously hidden attribute configuration was only applied to the summary and details view.  Now it's applied everywhere (filters, sorts, etc.).

Author: andrewkfiedler

catalog/ui/catalog-ui-search/src/main/webapp/component/filter/filter.view.js

@@ -25,10 +25,11 @@ define([
     'component/property/property',
     'component/dropdown/dropdown',
     'component/dropdown/dropdown.view',
-    'js/CQLUtils'
+    'js/CQLUtils',
+    'properties'
 ], function (Marionette, _, $, template, CustomElements, FilterComparatorDropdownView,
              MultivalueView, metacardDefinitions, PropertyModel, DropdownModel, DropdownView,
-            CQLUtils) {
+            CQLUtils, properties) {
 
     var comparatorToCQL = {
         BEFORE: 'BEFORE',
@@ -65,7 +66,11 @@ define([
         onBeforeShow: function(){
             this._filterDropdownModel = new DropdownModel({value: 'CONTAINS'});
             this.filterAttribute.show(DropdownView.createSimpleDropdown({
-                list: metacardDefinitions.sortedMetacardTypes.map(function(metacardType){
+                list: metacardDefinitions.sortedMetacardTypes.filter(function(metacardType){
+                    return !properties.isHidden(metacardType.id);
+                }).filter(function(metacardType){
+                    return !metacardDefinitions.isHiddenType(metacardType.id);
+                }).map(function(metacardType){
                     return {
                         label: metacardType.alias || metacardType.id,
                         value: metacardType.id

catalog/ui/catalog-ui-search/src/main/webapp/component/property/property.collection.view.js

@@ -209,6 +209,7 @@ define([
             propertyIntersection = _.intersection.apply(_, propertyIntersection);
             propertyIntersection = propertyIntersection.filter(function(property) {
                 return (!properties.isHidden(property)
+                && !metacardDefinitions.isHiddenType(property)
                 && self.blacklist.indexOf(property) === -1
                 && self.hiddenTypes.indexOf(types[0][property].format) === -1
                 && self.bulkHiddenTypes.indexOf(types[0][property].format) === -1);

catalog/ui/catalog-ui-search/src/main/webapp/component/singletons/metacard-definitions.js

@@ -24,6 +24,11 @@ define([
             this.getMetacardTypes();
             this.getDatatypeEnum();
         },
+        isHiddenType: function(id){
+            return this.metacardTypes[id].type === 'XML' ||
+            this.metacardTypes[id].type === 'BINARY' ||
+            this.metacardTypes[id].type === 'OBJECT';
+        },
         getDatatypeEnum: function(){
             $.get( '/search/catalog/internal/enumerations/attribute/datatype').then(function(response){
                 _.extend(this.enums, response);

catalog/ui/catalog-ui-search/src/main/webapp/component/sort-item/sort-item.view.js

@@ -21,7 +21,8 @@ define([
     'js/CustomElements',
     'component/singletons/metacard-definitions',
     'component/dropdown/dropdown.view',
-], function(Marionette, _, $, template, CustomElements, metacardDefinitions, DropdownView) {
+    'properties'
+], function(Marionette, _, $, template, CustomElements, metacardDefinitions, DropdownView, properties) {
 
     var blacklist = ['anyText', 'anyGeo'];
 
@@ -40,7 +41,11 @@ define([
             this.model.destroy();
         },
         onBeforeShow: function() {
-            var sortAttributes = metacardDefinitions.sortedMetacardTypes.filter(function(type) {
+            var sortAttributes = metacardDefinitions.sortedMetacardTypes.filter(function(type){
+                return !properties.isHidden(type.id);
+            }).filter(function(type){
+                return !metacardDefinitions.isHiddenType(type.id);
+            }).filter(function(type) {
                 return blacklist.indexOf(type.id) === -1;
             }).map(function(metacardType) {
                 return {

catalog/ui/catalog-ui-search/src/main/webapp/component/visualization/histogram/histogram.view.js

@@ -24,8 +24,9 @@ define([
     'component/property/property',
     'component/property/property.view',
     'component/singletons/metacard-definitions',
-    'js/Common'
-], function (wreqr, $, _, Marionette, CustomElements, template, Plotly, Property, PropertyView, metacardDefinitions, Common) {
+    'js/Common',
+    'properties'
+], function (wreqr, $, _, Marionette, CustomElements, template, Plotly, Property, PropertyView, metacardDefinitions, Common, properties) {
 
     function calculateAvailableAttributes(results){
         var availableAttributes = [];
@@ -34,6 +35,10 @@ define([
         });
         return availableAttributes.filter(function(attribute){
             return metacardDefinitions.metacardTypes[attribute] !== undefined;
+        }).filter(function(attribute){
+            return !metacardDefinitions.isHiddenType(attribute);
+        }).filter(function(attribute){
+            return !properties.isHidden(attribute);
         }).map(function(attribute){
             return {
                 label: metacardDefinitions.metacardTypes[attribute].alias || attribute,

catalog/ui/catalog-ui-search/src/main/webapp/component/visualization/table/row.view.js

@@ -92,7 +92,7 @@ module.exports = Marionette.ItemView.extend({
                     value: value,
                     html: html,
                     class: className,
-                    hidden: hiddenColumns.indexOf(property) >= 0 || properties.isHidden(property)
+                    hidden: hiddenColumns.indexOf(property) >= 0 || properties.isHidden(property) || metacardDefinitions.isHiddenType(property)
                 };
             })
         };

catalog/ui/catalog-ui-search/src/main/webapp/component/visualization/table/table-rearrange.view.js

@@ -22,6 +22,7 @@ var Common = require('js/Common');
 var user = require('component/singletons/user-instance');
 var properties = require('properties');
 var Sortable = require('sortablejs');
+var metacardDefinitions = require('component/singletons/metacard-definitions');
 
 module.exports = Marionette.ItemView.extend({
     template: template,
@@ -48,7 +49,7 @@ module.exports = Marionette.ItemView.extend({
                 label: properties.attributeAliases[property],
                 id: property,
                 hidden: hiddenColumns.indexOf(property) >= 0,
-                notCurrentlyAvailable: (availableAttributes.indexOf(property) === -1) || (properties.isHidden(property))
+                notCurrentlyAvailable: (availableAttributes.indexOf(property) === -1) || (properties.isHidden(property)) || metacardDefinitions.isHiddenType(property)
             };
         });
     },

catalog/ui/catalog-ui-search/src/main/webapp/component/visualization/table/table-visibility.view.js

@@ -22,6 +22,7 @@ var CustomElements = require('js/CustomElements');
 var Common = require('js/Common');
 var user = require('component/singletons/user-instance');
 var properties = require('properties');
+var metacardDefinitions = require('component/singletons/metacard-definitions');
 
 module.exports = Marionette.ItemView.extend({
     template: template,
@@ -49,7 +50,7 @@ module.exports = Marionette.ItemView.extend({
                 label: properties.attributeAliases[property],
                 id: property,
                 hidden: hiddenColumns.indexOf(property) >= 0,
-                notCurrentlyAvailable: (availableAttributes.indexOf(property) === -1) || (properties.isHidden(property))
+                notCurrentlyAvailable: (availableAttributes.indexOf(property) === -1) || (properties.isHidden(property)) || metacardDefinitions.isHiddenType(property)
             };
         });
     },

catalog/ui/catalog-ui-search/src/main/webapp/component/visualization/table/thead.view.js

@@ -99,7 +99,7 @@ module.exports = Marionette.ItemView.extend({
             return {
                 label: properties.attributeAliases[property],
                 id: property,
-                hidden: hiddenColumns.indexOf(property) >= 0 || properties.isHidden(property),
+                hidden: hiddenColumns.indexOf(property) >= 0 || properties.isHidden(property) || metacardDefinitions.isHiddenType(property),
                 sortable: sortAttributes.indexOf(property) >= 0
             };
         });