Skip to content

A
atlas
Commit 1b1f9d2a by Shwetha GS
Options

ATLAS-971 UI not displaying results for this query - Eg: "hive_table as t where…

ATLAS-971 UI not displaying results for this query - Eg: "hive_table as t where qualifiedName = 'default.input@cl1' select t" (kevalbhatt18 via shwethags)
parent b28ab21e
Showing with 215 additions and 100 deletions
dashboardv2/public/css/scss/main.scss
...@@ -276,16 +276,24 @@ ul { ...@@ -276,16 +276,24 @@ ul {
} }
span { span {
&.inputTag[data-id="tagClick"] { &.inputTag[data-id="tagClick"] {
span {
display: block;
padding: 3px 5px 3px 5px;
}
i.fa-close[data-id="deleteTag"] { i.fa-close[data-id="deleteTag"] {
display: none; display: none;
} }
} }
} }
a { a {
&.inputTag[data-id="addTag"] { &.inputTagAdd[data-id="addTag"] {
display: none; display: none;
} }
&.inputTag[data-id="tagClick"] { &.inputTag[data-id="tagClick"] {
span {
display: block;
padding: 3px 5px 3px 5px;
}
i.fa-times[data-id="delete"] { i.fa-times[data-id="delete"] {
display: none; display: none;
} }
......
dashboardv2/public/css/scss/tag.scss
...@@ -173,10 +173,16 @@ ...@@ -173,10 +173,16 @@
border: 1px $color_jungle_green_approx solid; border: 1px $color_jungle_green_approx solid;
background-color: $white; background-color: $white;
color: $color_jungle_green_approx; color: $color_jungle_green_approx;
padding-left: 5px;
&:hover { &:hover {
color: $white; color: $white;
background-color: $color_jungle_green_approx; background-color: $color_jungle_green_approx;
} }
i.fa {
&:hover {
background-color: $color_jungle_green_approx;
}
}
} }
.addTagBase { .addTagBase {
......
dashboardv2/public/js/utils/CommonViewFunction.js
...@@ -79,11 +79,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -79,11 +79,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} }
}); });
}; };
CommonViewFunction.propertyTable = function(valueObject, scope) { CommonViewFunction.propertyTable = function(valueObject, scope, searchTable) {
var table = "", var table = "",
fetchInputOutputValue = function(id) { fetchInputOutputValue = function(id) {
var that = this; var that = this;
scope.model.getEntity(id, { if (searchTable) {
++scope.fetchList
}
scope.entityModel.getEntity(id, {
success: function(data) { success: function(data) {
var value = "", var value = "",
deleteButton = ""; deleteButton = "";
...@@ -116,7 +119,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -116,7 +119,12 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} }
}, },
error: function(error, data, status) {}, error: function(error, data, status) {},
complete: function() {} complete: function() {
if (searchTable) {
--scope.fetchList;
scope.checkTableFetch();
}
}
}); });
} }
_.keys(valueObject).map(function(key) { _.keys(valueObject).map(function(key) {
...@@ -129,6 +137,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -129,6 +137,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
id = undefined, id = undefined,
tempLink = "", tempLink = "",
readOnly = false; readOnly = false;
if (inputOutputField['$id$']) {
inputOutputField.id = inputOutputField['$id$'];
}
if (inputOutputField) { if (inputOutputField) {
if (_.isObject(inputOutputField.id)) { if (_.isObject(inputOutputField.id)) {
id = inputOutputField.id.id; id = inputOutputField.id.id;
...@@ -138,14 +149,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -138,14 +149,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} else if (inputOutputField.id) { } else if (inputOutputField.id) {
id = inputOutputField.id; id = inputOutputField.id;
} else if (_.isString(inputOutputField) || _.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) { } else if (_.isString(inputOutputField) || _.isBoolean(inputOutputField) || _.isNumber(inputOutputField)) {
if (inputOutputField.indexOf("$") == -1) {
valueOfArray.push('<span>' + inputOutputField + '</span>'); valueOfArray.push('<span>' + inputOutputField + '</span>');
}
} else if (_.isObject(inputOutputField)) { } else if (_.isObject(inputOutputField)) {
_.each(inputOutputField, function(objValue, objKey) { _.each(inputOutputField, function(objValue, objKey) {
var value = objValue; var value = objValue;
if (objKey.indexOf("$") == -1) {
if (_.isObject(value)) { if (_.isObject(value)) {
value = JSON.stringify(value); value = JSON.stringify(value);
} }
valueOfArray.push('<span>' + objKey + ':' + value + '</span>'); valueOfArray.push('<span>' + objKey + ':' + value + '</span>');
}
}); });
} }
} }
...@@ -161,15 +176,26 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -161,15 +176,26 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} else { } else {
tempLink += '<a href="#!/detailPage/' + id + '">' + id + '</a>' tempLink += '<a href="#!/detailPage/' + id + '">' + id + '</a>'
} }
} else if (inputOutputField.name) {
tempLink += '<a href="#!/detailPage/' + id + '">' + inputOutputField.name + '</a>';
} else if (inputOutputField.qualifiedName) {
tempLink += '<a href="#!/detailPage/' + id + '">' + inputOutputField.qualifiedName + '</a>'
} else { } else {
var fetch = true;
fetchInputOutputValue(id); fetchInputOutputValue(id);
tempLink += '<div data-id="' + id + '"></div>'; tempLink += '<div data-id="' + id + '"></div>';
} }
} }
if (readOnly) { if (readOnly) {
if (!fetch) {
tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
subLink += '<div class="block readOnlyLink">' + tempLink + '</div>'; subLink += '<div class="block readOnlyLink">' + tempLink + '</div>';
} else { } else {
fetch = false;
subLink += tempLink;
}
} else {
if (tempLink.search('href') != -1) { if (tempLink.search('href') != -1) {
subLink += '<div>' + tempLink + '</div>' subLink += '<div>' + tempLink + '</div>'
} else if (tempLink.length) { } else if (tempLink.length) {
...@@ -180,11 +206,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -180,11 +206,18 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
if (valueOfArray.length) { if (valueOfArray.length) {
subLink = valueOfArray.join(', '); subLink = valueOfArray.join(', ');
} }
if (searchTable) {
table = subLink;
} else {
table += '<tr><td>' + key + '</td><td>' + subLink + '</td></tr>'; table += '<tr><td>' + key + '</td><td>' + subLink + '</td></tr>';
}
} else if (_.isObject(keyValue)) { } else if (_.isObject(keyValue)) {
var id = undefined, var id = undefined,
tempLink = "", tempLink = "",
readOnly = false; readOnly = false;
if (keyValue['$id$']) {
keyValue.id = keyValue['$id$'];
}
if (_.isObject(keyValue.id)) { if (_.isObject(keyValue.id)) {
id = keyValue.id.id; id = keyValue.id.id;
if (Globals.entityStateReadOnly[keyValue.id.state]) { if (Globals.entityStateReadOnly[keyValue.id.state]) {
...@@ -204,16 +237,40 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -204,16 +237,40 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} else { } else {
tempLink += '<a href="#!/detailPage/' + id + '">' + id + '</a>'; tempLink += '<a href="#!/detailPage/' + id + '">' + id + '</a>';
} }
} else if (keyValue.name) {
tempLink += '<a href="#!/detailPage/' + id + '">' + keyValue.name + '</a>';
} else if (keyValue.qualifiedName) {
tempLink += '<a href="#!/detailPage/' + id + '">' + keyValue.qualifiedName + '</a>'
} else { } else {
var fetch = true;
fetchInputOutputValue(id); fetchInputOutputValue(id);
tempLink += '<div data-id="' + id + '"></div>'; tempLink += '<div data-id="' + id + '"></div>';
} }
if (readOnly) { if (readOnly) {
if (!fetch) {
tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
}
if (searchTable) {
if (!fetch) {
table = '<div class="block readOnlyLink">' + tempLink + '</div>';
} else {
table = tempLink;
}
} else {
if (!fetch) {
table += '<tr><td>' + key + '</td><td><div class="block readOnlyLink">' + tempLink + '</div></td></tr>'; table += '<tr><td>' + key + '</td><td><div class="block readOnlyLink">' + tempLink + '</div></td></tr>';
} else { } else {
table += '<tr><td>' + key + '</td><td>' + tempLink + '</td></tr>'; table += '<tr><td>' + key + '</td><td>' + tempLink + '</td></tr>';
} }
}
} else {
if (searchTable) {
table = tempLink;
} else {
table += '<tr><td>' + key + '</td><td>' + tempLink + '</td></tr>';
}
}
} else { } else {
var stringArr = []; var stringArr = [];
_.each(keyValue, function(val, key) { _.each(keyValue, function(val, key) {
...@@ -232,18 +289,38 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -232,18 +289,38 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
} }
if (readOnly) { if (readOnly) {
tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; tempLink += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
if (searchTable) {
table = '<div class="block readOnlyLink">' + tempLink + '</div>';
} else {
table += '<tr><td>' + key + '</td><td><div class="block readOnlyLink">' + tempLink + '</div></td></tr>'; table += '<tr><td>' + key + '</td><td><div class="block readOnlyLink">' + tempLink + '</div></td></tr>';
}
} else {
if (searchTable) {
table = tempLink;
} else { } else {
table += '<tr><td>' + key + '</td><td>' + tempLink + '</td></tr>'; table += '<tr><td>' + key + '</td><td>' + tempLink + '</td></tr>';
} }
} }
}
} else {
if (key.indexOf("Time") !== -1 || key == "retention") {
if (searchTable) {
table = new Date(valueObject[key]);
} else { } else {
if (key == "createTime" || key == "lastAccessTime" || key == "retention") {
table += '<tr><td>' + key + '</td><td>' + new Date(valueObject[key]) + '</td></tr>'; table += '<tr><td>' + key + '</td><td>' + new Date(valueObject[key]) + '</td></tr>';
}
} else {
if (searchTable) {
if (_.isBoolean(valueObject[key])) {
table = valueObject[key].toString();
} else {
table = valueObject[key];
}
} else { } else {
table += '<tr><td>' + key + '</td><td>' + valueObject[key] + '</td></tr>'; table += '<tr><td>' + key + '</td><td>' + valueObject[key] + '</td></tr>';
} }
}
} }
}); });
return table; return table;
...@@ -328,11 +405,15 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -328,11 +405,15 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
id = model.get('$id$').id, id = model.get('$id$').id,
terms = []; terms = [];
_.keys(traits).map(function(key) { _.keys(traits).map(function(key) {
if (traits[key].$typeName$) {
var tagName = Utils.checkTagOrTerm(traits[key].$typeName$); var tagName = Utils.checkTagOrTerm(traits[key].$typeName$);
} else {
var tagName = Utils.checkTagOrTerm(traits[key].typeName);
}
if (tagName.term) { if (tagName.term) {
terms.push({ terms.push({
deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-assetname="' + model.get("name") + '" data-name="' + traits[key].$typeName$ + '" data-guid="' + model.get('$id$').id + '" ></i></a>', deleteHtml: '<a class="pull-left" title="Remove Term"><i class="fa fa-trash" data-id="tagClick" data-assetname="' + model.get("name") + '" data-name="' + tagName.fullName+ '" data-guid="' + model.get('$id$').id + '" ></i></a>',
url: traits[key].$typeName$.split(".").join("/"), url: tagName.fullName.split(".").join("/"),
name: tagName.fullName name: tagName.fullName
}); });
} }
...@@ -366,13 +447,17 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob ...@@ -366,13 +447,17 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Glob
popTag = "", popTag = "",
count = 0; count = 0;
_.keys(model.get('$traits$')).map(function(key) { _.keys(model.get('$traits$')).map(function(key) {
var tagName = Utils.checkTagOrTerm(traits[key].$typeName$), if (traits[key].$typeName$) {
className = "inputTag"; var tagName = Utils.checkTagOrTerm(traits[key].$typeName$);
} else {
var tagName = Utils.checkTagOrTerm(traits[key].typeName);
}
var className = "inputTag";
if (!tagName.term) { if (!tagName.term) {
if (count >= 1) { if (count >= 1) {
popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + traits[key].$typeName$ + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '"data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>'; popTag += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.name + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '"data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>';
} else { } else {
atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + traits[key].$typeName$ + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '" data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>'; atags += '<a class="' + className + '" data-id="tagClick"><span class="inputValue">' + tagName.name + '</span><i class="fa fa-times" data-id="delete" data-assetname="' + model.get("name") + '" data-name="' + tagName.name + '" data-guid="' + model.get('$id$').id + '" ></i></a>';
} }
++count; ++count;
} }
......
dashboardv2/public/js/utils/Utils.js
...@@ -234,6 +234,7 @@ define(['require', 'utils/Globals'], function(require, Globals) { ...@@ -234,6 +234,7 @@ define(['require', 'utils/Globals'], function(require, Globals) {
} }
} }
Utils.checkTagOrTerm = function(value) { Utils.checkTagOrTerm = function(value) {
if (value && _.isString(value)) {
var name = value.split('.'); var name = value.split('.');
if (name.length > 1) { if (name.length > 1) {
return { return {
...@@ -249,5 +250,6 @@ define(['require', 'utils/Globals'], function(require, Globals) { ...@@ -249,5 +250,6 @@ define(['require', 'utils/Globals'], function(require, Globals) {
} }
} }
} }
}
return Utils; return Utils;
}); });
dashboardv2/public/js/views/entity/EntityDetailTableLayoutView.js
...@@ -49,7 +49,7 @@ define(['require', ...@@ -49,7 +49,7 @@ define(['require',
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'globalVent', 'collection')); _.extend(this, _.pick(options, 'globalVent', 'collection'));
this.collectionObject = this.collection.toJSON(); this.collectionObject = this.collection.toJSON();
this.model = new this.collection.model(); this.entityModel = new this.collection.model();
}, },
bindEvents: function() {}, bindEvents: function() {},
onRender: function() { onRender: function() {
......
dashboardv2/public/js/views/search/SearchResultLayoutView.js
...@@ -24,9 +24,10 @@ define(['require', ...@@ -24,9 +24,10 @@ define(['require',
'utils/Utils', 'utils/Utils',
'utils/Globals', 'utils/Globals',
'collection/VSearchList', 'collection/VSearchList',
'models/VCommon',
'utils/CommonViewFunction', 'utils/CommonViewFunction',
'utils/Messages' 'utils/Messages'
], function(require, Backbone, SearchResultLayoutViewTmpl, Modal, VEntity, Utils, Globals, VSearchList, CommonViewFunction, Messages) { ], function(require, Backbone, SearchResultLayoutViewTmpl, Modal, VEntity, Utils, Globals, VSearchList, VCommon, CommonViewFunction, Messages) {
'use strict'; 'use strict';
var SearchResultLayoutView = Backbone.Marionette.LayoutView.extend( var SearchResultLayoutView = Backbone.Marionette.LayoutView.extend(
...@@ -75,7 +76,6 @@ define(['require', ...@@ -75,7 +76,6 @@ define(['require',
trigger: true trigger: true
}); });
} }
} }
}; };
events["click " + this.ui.addTag] = 'addTagModalView'; events["click " + this.ui.addTag] = 'addTagModalView';
...@@ -207,7 +207,7 @@ define(['require', ...@@ -207,7 +207,7 @@ define(['require',
} }
that.renderTableLayoutView(); that.renderTableLayoutView();
var resultData = that.searchCollection.fullCollection.length + ' results for <b>' + that.searchCollection.queryParams.query + '</b>' var resultData = that.searchCollection.fullCollection.length + ' results for <b>' + that.searchCollection.queryParams.query + '</b>'
var multiAssignData = '<a href="javascript:void(0)" class="inputAssignTag multiSelect" style="display:none" data-id="addTerm"><i class="fa fa-folder-o">' + " " + 'Assign Term</i></a>' var multiAssignData = '<a href="javascript:void(0)" class="inputAssignTag multiSelect" style="display:none" data-id="addTerm"><i class="fa fa-folder-o"></i>' + " " + 'Assign Term</a>'
that.$('.searchResult').html(resultData + multiAssignData); that.$('.searchResult').html(resultData + multiAssignData);
}, },
silent: true silent: true
...@@ -273,61 +273,114 @@ define(['require', ...@@ -273,61 +273,114 @@ define(['require',
if (this.searchCollection.responseData) { if (this.searchCollection.responseData) {
if (responseData.dataType) { if (responseData.dataType) {
if (responseData.dataType.attributeDefinitions.length == 2 && responseData.dataType.attributeDefinitions[1].name == "instanceInfo") { if (responseData.dataType.attributeDefinitions.length == 2 && responseData.dataType.attributeDefinitions[1].name == "instanceInfo") {
return this.getFixedColumn(); return this.getFixedFullTextColumn();
} else { } else {
if (Globals.taxonomy) { if (responseData.dataType.typeName.indexOf('_temp') == -1) {
col['Check'] = { return this.getFixedDslColumn();
name: "selected", } else {
label: "", var idFound = false;
cell: "select-row", _.each(this.searchCollection.models, function(model) {
headerCell: "select-all", var modelJSON = model.toJSON();
position: 1 var guid = "";
}; _.each(modelJSON, function(val, key) {
if (_.isObject(val) && val.id) {
model.set('id', val.id);
guid = val.id;
} else if (key === "id") {
model.set('id', val);
guid = val;
}
});
if (guid.length) {
idFound = true;
model.getEntity(guid, {
async: false,
success: function(data) {
if (data.definition) {
if (data.definition.id && data.definition.values) {
that.searchCollection.get(data.definition.id).set(data.definition.values);
that.searchCollection.get(data.definition.id).set('$id$', data.definition.id);
that.searchCollection.get(data.definition.id).set('$traits$', data.definition.traits);
} }
var modelJSON = this.searchCollection.toJSON()[0];
_.keys(modelJSON).map(function(key) {
if (key.indexOf("$") == -1 && typeof modelJSON[key] != "object") {
if (typeof modelJSON[key] == "string" || typeof modelJSON[key] == "number") {
if (typeof modelJSON[key] == "number" && key != "createTime") {
return;
} }
if (key == "name" || key == "owner" || key == "description") { },
error: function(error, data, status) {},
complete: function() {}
});
}
});
if (idFound) {
return this.getFixedDslColumn();
} else {
return this.getDaynamicColumn();
}
}
}
} else {
return this.getFixedFullTextColumn();
}
}
},
getDaynamicColumn: function() {
var that = this,
modelJSON = "",
col = {};
modelJSON = this.searchCollection.toJSON()[0];
_.keys(modelJSON).map(function(key) {
if (key.indexOf("$") == -1) {
col[key] = { col[key] = {
cell: (key == "name") ? ("Html") : ("String"), cell: 'Html',
editable: false, editable: false,
sortable: false, sortable: false,
orderable: true, orderable: true,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, { formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) { fromRaw: function(rawValue, model) {
if (rawValue == null) { return CommonViewFunction.propertyTable({ 'notUsedKey': rawValue }, that, true);
return null;
} }
if (model.get('createTime') == rawValue) { })
return new Date(rawValue); };
} }
if (model.get('name') == rawValue) { });
that.checkTableFetch();
return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
},
getFixedDslColumn: function() {
var that = this,
col = {};
col['name'] = {
label: "Name",
cell: "html",
editable: false,
sortable: false,
formatter: _.extend({}, Backgrid.CellFormatter.prototype, {
fromRaw: function(rawValue, model) {
var nameHtml = ""; var nameHtml = "";
if (model.get('$id$')) { if (model.get('$id$')) {
nameHtml = '<a href="#!/detailPage/' + model.get('$id$').id + '">' + rawValue + '</a>'; nameHtml = '<a href="#!/detailPage/' + model.get('$id$').id + '">' + rawValue + '</a>';
} else { } else {
nameHtml = '<a>' + rawValue + '</a>'; nameHtml = '<a>' + rawValue + '</a>';
} }
if (Globals.entityStateReadOnly[model.get('$id$').state]) { if (model.get('$id$') && model.get('$id$').state && Globals.entityStateReadOnly[model.get('$id$').state]) {
nameHtml += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>'; nameHtml += '<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>';
return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>'; return '<div class="readOnly readOnlyLink">' + nameHtml + '</div>';
} else { } else {
return nameHtml; return nameHtml;
} }
} else {
return rawValue;
}
} }
}) })
};
} }
col['description'] = {
label: "Description",
cell: "String",
editable: false,
sortable: false
} }
col['owner'] = {
label: "Owner",
cell: "String",
editable: false,
sortable: false
} }
});
col['tag'] = { col['tag'] = {
label: "Tags", label: "Tags",
cell: "Html", cell: "Html",
...@@ -337,7 +390,7 @@ define(['require', ...@@ -337,7 +390,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 (Globals.entityStateReadOnly[model.get('$id$').state]) { if (model.get('$id$') && model.get('$id$').state && Globals.entityStateReadOnly[model.get('$id$').state]) {
return '<div class="readOnly">' + CommonViewFunction.tagForTable(model); + '</div>'; return '<div class="readOnly">' + CommonViewFunction.tagForTable(model); + '</div>';
} else { } else {
return CommonViewFunction.tagForTable(model); return CommonViewFunction.tagForTable(model);
...@@ -347,6 +400,13 @@ define(['require', ...@@ -347,6 +400,13 @@ define(['require',
}) })
}; };
if (Globals.taxonomy) { if (Globals.taxonomy) {
col['Check'] = {
name: "selected",
label: "",
cell: "select-row",
headerCell: "select-all",
position: 1
};
col['terms'] = { col['terms'] = {
label: "Terms", label: "Terms",
cell: "Html", cell: "Html",
...@@ -360,7 +420,7 @@ define(['require', ...@@ -360,7 +420,7 @@ define(['require',
if (returnObject.object) { if (returnObject.object) {
that.bradCrumbList.push(returnObject.object); that.bradCrumbList.push(returnObject.object);
} }
if (Globals.entityStateReadOnly[model.get('$id$').state]) { if (model.get('$id$') && model.get('$id$').state && Globals.entityStateReadOnly[model.get('$id$').state]) {
return '<div class="readOnly">' + returnObject.html + '</div>'; return '<div class="readOnly">' + returnObject.html + '</div>';
} else { } else {
return returnObject.html; return returnObject.html;
...@@ -371,13 +431,8 @@ define(['require', ...@@ -371,13 +431,8 @@ define(['require',
} }
that.checkTableFetch(); that.checkTableFetch();
return this.searchCollection.constructor.getTableCols(col, this.searchCollection); return this.searchCollection.constructor.getTableCols(col, this.searchCollection);
}
} else {
return this.getFixedColumn();
}
}
}, },
getFixedColumn: function() { getFixedFullTextColumn: function() {
var that = this; var that = this;
return this.searchCollection.constructor.getTableCols({ return this.searchCollection.constructor.getTableCols({
instanceInfo: { instanceInfo: {
...@@ -406,56 +461,14 @@ define(['require', ...@@ -406,56 +461,14 @@ define(['require',
var modelObject = model.toJSON(); var modelObject = model.toJSON();
if (modelObject.$typeName$ && modelObject.instanceInfo) { if (modelObject.$typeName$ && modelObject.instanceInfo) {
var guid = model.toJSON().instanceInfo.guid; var guid = model.toJSON().instanceInfo.guid;
++that.fetchList; var json = model.toJSON();
model.getEntity(guid, { json['id'] = guid;
success: function(data) { return CommonViewFunction.propertyTable({ 'notUsedKey': json }, that, true);
if (data.definition) {
if (data.definition.id && data.definition.id.state) {
if (Globals.entityStateReadOnly[data.definition.id.state]) {
that.$('td a[data-id="' + guid + '"]').parent().addClass('readOnly readOnlyLink');
that.$('td a[data-id="' + guid + '"]').parent().append('<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>');
}
}
if (data.definition.values && data.definition.values.name) {
return that.$('td a[data-id="' + guid + '"]').html(data.definition.values.name);
} else {
return that.$('td a[data-id="' + guid + '"]').html(data.definition.id.id);
}
}
},
error: function(error, data, status) {},
complete: function() {
--that.fetchList;
that.checkTableFetch();
}
});
return '<div><a href="#!/detailPage/' + guid + '" data-id="' + guid + '"></a></div>';
} else if (!modelObject.$typeName$) { } else if (!modelObject.$typeName$) {
var guid = model.toJSON().guid; var guid = model.toJSON().guid;
++that.fetchList; var json = model.toJSON();
model.getEntity(guid, { json['id'] = guid;
success: function(data) { return CommonViewFunction.propertyTable({ 'notUsedKey': json }, that, true);
if (data.definition) {
if (data.definition.id && data.definition.id.state) {
if (Globals.entityStateReadOnly[data.definition.id.state]) {
that.$('td a[data-id="' + guid + '"]').parent().addClass('readOnly readOnlyLink');
that.$('td a[data-id="' + guid + '"]').parent().append('<button title="Deleted" class="btn btn-atlasAction btn-atlas deleteBtn"><i class="fa fa-trash"></i></button>');
}
}
if (data.definition.values && data.definition.values.name) {
return that.$('td a[data-id="' + guid + '"]').html(data.definition.values.name);
} else {
return that.$('td a[data-id="' + guid + '"]').html(data.definition.id.id);
}
}
},
error: function(error, data, status) {},
complete: function() {
--that.fetchList;
that.checkTableFetch();
}
});
return '<div><a href="#!/detailPage/' + guid + '" data-id="' + guid + '"></a></div>';
} }
} }
}) })
......
release-log.txt
...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ...@@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES:
ALL CHANGES: ALL CHANGES:
ATLAS-971 UI not displaying results for this query - Eg: "hive_table as t where qualifiedName = 'default.input@cl1' select t" (kevalbhatt18 via shwethags)
ATLAS-1010 Atlas allows recreation of tags with same name (shwethags) ATLAS-1010 Atlas allows recreation of tags with same name (shwethags)
ATLAS-990 Hive Import metadata script fails with auth exception (nixonrodrigues via shwethags) ATLAS-990 Hive Import metadata script fails with auth exception (nixonrodrigues via shwethags)
ATLAS-998 determine HA mode from property atlas.server.ids, instead of atlas.server.ha.enabled (madhan.neethiraj via shwethags) ATLAS-998 determine HA mode from property atlas.server.ids, instead of atlas.server.ha.enabled (madhan.neethiraj via shwethags)
......
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