This is an automated email from the ASF dual-hosted git repository.
ppawar pushed a commit to branch branch-2.0
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/branch-2.0 by this push:
new 62d89cbbd ATLAS-4810: Atlas UI Basic Searching result sorting option
not available on all Columns
62d89cbbd is described below
commit 62d89cbbd80faa527529939e75c5170ef2a9adc8
Author: Prasad Pawar <[email protected]>
AuthorDate: Mon Nov 20 19:19:15 2023 +0530
ATLAS-4810: Atlas UI Basic Searching result sorting option not available on
all Columns
Signed-off-by: Prasad Pawar <[email protected]>
---
.../public/js/views/search/RelationSearchResultLayoutView.js | 11 +++++++++--
dashboardv2/public/js/views/search/SearchResultLayoutView.js | 10 ++++++++--
.../public/js/views/search/RelationSearchResultLayoutView.js | 11 +++++++++--
dashboardv3/public/js/views/search/SearchResultLayoutView.js | 10 ++++++++--
4 files changed, 34 insertions(+), 8 deletions(-)
diff --git
a/dashboardv2/public/js/views/search/RelationSearchResultLayoutView.js
b/dashboardv2/public/js/views/search/RelationSearchResultLayoutView.js
index a917dd469..61176b4f6 100644
--- a/dashboardv2/public/js/views/search/RelationSearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/RelationSearchResultLayoutView.js
@@ -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,
diff --git a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
index 9dde943fa..c9e57ad73 100644
--- a/dashboardv2/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchResultLayoutView.js
@@ -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,
diff --git
a/dashboardv3/public/js/views/search/RelationSearchResultLayoutView.js
b/dashboardv3/public/js/views/search/RelationSearchResultLayoutView.js
index a8a64ab79..f277c4e5f 100644
--- a/dashboardv3/public/js/views/search/RelationSearchResultLayoutView.js
+++ b/dashboardv3/public/js/views/search/RelationSearchResultLayoutView.js
@@ -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,
diff --git a/dashboardv3/public/js/views/search/SearchResultLayoutView.js
b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
index 07bb87818..16db56623 100644
--- a/dashboardv3/public/js/views/search/SearchResultLayoutView.js
+++ b/dashboardv3/public/js/views/search/SearchResultLayoutView.js
@@ -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,
