Skip to content

A
atlas
Commit e590092c by kevalbhatt
Options

ATLAS-3830:- UI: Business Metadata tab misalignment issue

(cherry picked from commit ae92ed49de0fd2b8beff71d901a13e68443965c6)
parent 8092d6b5
Showing with 27 additions and 10 deletions
dashboardv2/public/js/utils/CommonViewFunction.js
......@@ -945,9 +945,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
classes = 'form-control errorClass';
validation = false;
pEl.innerText = 'Required!';
} else if (val.includes(':')) {
validation = false;
var errorText = $(".errorMsg[data-id='charSupportMsg']").text();
if (errorText && errorText.length === 0) {
pEl.innerText = "These special character '(:)' are not supported.";
}
} else {
if (input.tagName === 'INPUT') {
var duplicates = datalist.filter(function(c) {
......@@ -962,6 +967,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
}
if (validation === false) {
classes = 'form-control errorClass';
}
input.setAttribute('class', classes);
}
return {
......
dashboardv2/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
......@@ -65,7 +65,7 @@ define(['require',
var obj = { options: this.model.get('options') || {} };
delete obj.enumValues;
delete obj.options.maxStrLength;
if (e.target.value.trim() === 'enumeration' || e.target.value.trim() === 'Enumeration') {
if (e.target.value.trim().toLowerCase() === 'enumeration') {
this.ui.enumTypeSelectorContainer.show();
this.ui.enumTypeSelector.show();
this.emumTypeSelectDisplay();
......@@ -73,13 +73,13 @@ define(['require',
this.ui.stringLengthValue.hide();
} else {
obj.typeName = e.target.value.trim();
if (e.target.value.trim() === 'string' || e.target.value.trim() === 'String') {
if (e.target.value.trim().toLowerCase() === 'string') {
this.ui.stringLengthContainer.show();
this.ui.stringLengthValue.show();
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
this.ui.enumValueSelectorContainer.hide();
obj.options["maxStrLength"] = e.target.value.trim();
obj.options["maxStrLength"] = this.ui.stringLengthValue.val()
} else {
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
......
dashboardv3/public/js/utils/CommonViewFunction.js
......@@ -965,9 +965,14 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
pEl.innerText = "";
if (val === '') {
classes = 'form-control errorClass';
validation = false;
pEl.innerText = 'Required!';
} else if (val.includes(':')) {
validation = false;
var errorText = $(".errorMsg[data-id='charSupportMsg']").text();
if (errorText && errorText.length === 0) {
pEl.innerText = "These special character '(:)' are not supported.";
}
} else {
if (input.tagName === 'INPUT') {
var duplicates = datalist.filter(function(c) {
......@@ -982,6 +987,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
}
}
}
if (validation === false) {
classes = 'form-control errorClass';
}
input.setAttribute('class', classes);
}
return {
......
dashboardv3/public/js/views/business_metadata/BusinessMetadataAttributeItemView.js
......@@ -65,7 +65,7 @@ define(['require',
var obj = { options: this.model.get('options') || {} };
delete obj.enumValues;
delete obj.options.maxStrLength;
if (e.target.value.trim() === 'enumeration' || e.target.value.trim() === 'Enumeration') {
if (e.target.value.trim().toLowerCase() === 'enumeration') {
this.ui.enumTypeSelectorContainer.show();
this.ui.enumTypeSelector.show();
this.emumTypeSelectDisplay();
......@@ -73,13 +73,13 @@ define(['require',
this.ui.stringLengthValue.hide();
} else {
obj.typeName = e.target.value.trim();
if (e.target.value.trim() === 'string' || e.target.value.trim() === 'String') {
if (e.target.value.trim().toLowerCase() === 'string') {
this.ui.stringLengthContainer.show();
this.ui.stringLengthValue.show();
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
this.ui.enumValueSelectorContainer.hide();
obj.options["maxStrLength"] = e.target.value.trim();
obj.options["maxStrLength"] = this.ui.stringLengthValue.val()
} else {
this.ui.enumTypeSelectorContainer.hide();
this.ui.enumTypeSelector.hide();
......
dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js
......@@ -77,7 +77,6 @@ define([
// this.RClassificationTreeRender.currentView.onSearchClassificationNode(showEmpty);
// this.REntityTreeRender.currentView.onSearchEntityNode(showEmpty);
}
this.$(".panel-collapse.collapse").addClass("in");
this.entitySearchTree = this.$('[data-id="entitySearchTree"]');
this.classificationSearchTree = this.$('[data-id="classificationSearchTree"]');
this.termSearchTree = this.$('[data-id="termSearchTree"]');
......@@ -93,6 +92,8 @@ define([
this.customFilterSearchTree.jstree("search", searchString);
this.businessMetadataSearchTree.jstree(true).show_all();
this.businessMetadataSearchTree.jstree("search", searchString);
this.$(".panel-heading.dash-button-icon").removeClass("collapsed").attr("aria-expanded", true);
this.$(".panel-collapse.collapse").addClass("in").attr("aria-expanded", true).css({ height: "auto" });
};
......@@ -201,7 +202,7 @@ define([
if (options) {
_.extend(this.options, options);
this.showHideGlobalFilter();
if(!this.options.value){
if (!this.options.value) {
this.ui.searchNode.val('').trigger('keyup');
}
if (this.RBusinessMetadataTreeRender.currentView) {
......
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