tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-4810: Atlas UI Basic Searching result sorting option not available on all Columns 

Signed-off-by: Prasad Pawar <prasad.pawar@cloudera.com>
This commit is contained in:
Prasad Pawar 2023-11-20 19:19:15 +05:30
parent 882954e296
commit cef5914339
4 changed files with 34 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
dashboardv2/public/js/views/search/RelationSearchResultLayoutView.js
View File

@ -507,6 +507,7 @@ define(['require',
resizeable: true,
orderable: false,
renderable: true,
sortable: false,
className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -540,6 +541,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'typeName') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -556,6 +558,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: false,
renderable: (columnToShow ? _.contains(columnToShow, 'end1') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -577,6 +580,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: false,
renderable: (columnToShow ? _.contains(columnToShow, 'end2') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -598,6 +602,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'end2') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -616,11 +621,13 @@ define(['require',
_.each(attrObj, function(obj, key) {
var key = obj.name,
isRenderable = _.contains(columnToShow, key),
isSortable = obj.typeName.search(/(array|map)/i) == -1;
// isSortable = obj.typeName.search(/(array|map)/i) == -1;
isSortable = obj.typeName.search(/(string|date|boolean|int|number|byte|float|long|double|short)/i) == 0; // commented : as sorting is required for all the columns except non-primitive types
col[obj.name] = {
label: obj.name.capitalize(),
cell: "Html",
headerCell: Backgrid.HeaderHTMLDecodeCell,
// headerCell: Backgrid.HeaderHTMLDecodeCell,
editable: false,
resizeable: true,
orderable: true,

10
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View File

@ -779,6 +779,7 @@ define(['require',
resizeable: true,
orderable: false,
renderable: true,
sortable: true,
className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -851,6 +852,7 @@ define(['require',
resizeable: true,
orderable: true,
renderable: true,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -865,6 +867,7 @@ define(['require',
label: "Date Created",
cell: "Html",
editable: false,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -885,6 +888,7 @@ define(['require',
resizeable: true,
orderable: true,
renderable: true,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -902,6 +906,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'typeName') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -964,7 +969,8 @@ define(['require',
_.each(attrObj, function(obj, key) {
var key = obj.name,
isRenderable = _.contains(columnToShow, key),
isSortable = obj.typeName.search(/(array|map)/i) == -1,
// isSortable = obj.typeName.search(/(array|map)/i) == -1, // commented : as sorting is required for all the columns except classifications and terms
isSortable = obj.typeName.search(/(string|date|boolean|int|number|byte|float|long|double|short)/i) == 0, // commented : as sorting is required for all the columns except non-primitive types
columnLabel;
if (key == "name" || key == "description" || key == "owner") {
if (columnToShow) {
@ -980,7 +986,7 @@ define(['require',
col[obj.name] = {
label: columnLabel,
cell: "Html",
headerCell: Backgrid.HeaderHTMLDecodeCell,
// headerCell: Backgrid.HeaderHTMLDecodeCell,
editable: false,
resizeable: true,
orderable: true,

11
dashboardv3/public/js/views/search/RelationSearchResultLayoutView.js
View File

@ -520,6 +520,7 @@ define(['require',
resizeable: true,
orderable: false,
renderable: true,
sortable: false,
className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -553,6 +554,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'typeName') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -569,6 +571,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: false,
renderable: (columnToShow ? _.contains(columnToShow, 'end1') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -590,6 +593,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: false,
renderable: (columnToShow ? _.contains(columnToShow, 'end2') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -611,6 +615,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'label') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -629,11 +634,13 @@ define(['require',
_.each(attrObj, function(obj, key) {
var key = obj.name,
isRenderable = _.contains(columnToShow, key),
isSortable = obj.typeName.search(/(array|map)/i) == -1;
// isSortable = obj.typeName.search(/(array|map)/i) == -1;
isSortable = obj.typeName.search(/(string|date|boolean|int|number|byte|float|long|double|short)/i) == 0; // commented : as sorting is required for all the columns except non-primitive types
col[obj.name] = {
label: obj.name.capitalize(),
cell: "Html",
headerCell: Backgrid.HeaderHTMLDecodeCell,
// headerCell: Backgrid.HeaderHTMLDecodeCell,
editable: false,
resizeable: true,
orderable: true,

10
dashboardv3/public/js/views/search/SearchResultLayoutView.js
View File

@ -792,6 +792,7 @@ define(['require',
resizeable: true,
orderable: false,
renderable: true,
sortable: true,
className: "searchTableName",
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -864,6 +865,7 @@ define(['require',
resizeable: true,
orderable: true,
renderable: true,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -878,6 +880,7 @@ define(['require',
label: "Date Created",
cell: "Html",
editable: false,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -898,6 +901,7 @@ define(['require',
resizeable: true,
orderable: true,
renderable: true,
sortable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var obj = model.toJSON();
@ -913,6 +917,7 @@ define(['require',
editable: false,
resizeable: true,
orderable: true,
sortable: true,
renderable: (columnToShow ? _.contains(columnToShow, 'typeName') : true),
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
@ -975,7 +980,8 @@ define(['require',
_.each(attrObj, function(obj, key) {
var key = obj.name,
isRenderable = _.contains(columnToShow, key),
isSortable = obj.typeName.search(/(array|map)/i) == -1,
// isSortable = obj.typeName.search(/(array|map)/i) == -1, // commented : as sorting is required for all the columns except classifications and terms
isSortable = obj.typeName.search(/(string|date|boolean|int|number|byte|float|long|double|short)/i) == 0, // commented : as sorting is required for all the columns except non-primitive types
columnLabel;
if (key == "name" || key == "description" || key == "owner") {
if (columnToShow) {
@ -991,7 +997,7 @@ define(['require',
col[obj.name] = {
label: columnLabel,
cell: "Html",
headerCell: Backgrid.HeaderHTMLDecodeCell,
// headerCell: Backgrid.HeaderHTMLDecodeCell,
editable: false,
resizeable: true,
orderable: true,