This is an automated email from the ASF dual-hosted git repository.
ppawar pushed a commit to branch ATLAS-5226
in repository https://gitbox.apache.org/repos/asf/atlas.git
The following commit(s) were added to refs/heads/ATLAS-5226 by this push:
new 0401a4fc1 ATLAS-5226: ATLAS UI: Update dependencies to latest
compatible versions across dashboard, dashboardv2, and docs
0401a4fc1 is described below
commit 0401a4fc1b4356a5f4b40a93bd303a563ece65e8
Author: Prasad Pawar <[email protected]>
AuthorDate: Wed Mar 4 15:48:36 2026 +0530
ATLAS-5226: ATLAS UI: Update dependencies to latest compatible versions
across dashboard, dashboardv2, and docs
---
.../src/views/SideBar/SideBarTree/SideBarTree.tsx | 3 +++
dashboardv2/gruntfile.js | 18 ++++++++++++++++--
dashboardv2/public/js/views/search/SearchLayoutView.js | 7 +++++--
3 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/dashboard/src/views/SideBar/SideBarTree/SideBarTree.tsx
b/dashboard/src/views/SideBar/SideBarTree/SideBarTree.tsx
index 585079636..02f5e27b6 100644
--- a/dashboard/src/views/SideBar/SideBarTree/SideBarTree.tsx
+++ b/dashboard/src/views/SideBar/SideBarTree/SideBarTree.tsx
@@ -798,6 +798,9 @@ const BarTreeView: FC<{
} else if (key === "classification") {
// Map classification to tag parameter for URL (matching classic UI)
searchParams.set("tag", value);
+ } else if (key === "termName") {
+ // Map termName (API format) to term parameter for URL (matching classic
UI)
+ searchParams.set("term", value);
} else if (value !== null && value !== undefined && value !== "") {
// Only set parameter if value is not null, undefined, or empty string
searchParams.set(key, value);
diff --git a/dashboardv2/gruntfile.js b/dashboardv2/gruntfile.js
index 22795b9c6..ddf1cf719 100644
--- a/dashboardv2/gruntfile.js
+++ b/dashboardv2/gruntfile.js
@@ -87,7 +87,6 @@ module.exports = function(grunt) {
'require.js': { 'requirejs': 'requirejs' },
'text.js': { 'requirejs-text': 'requirejs-text' },
'underscore-min.js': { 'underscore': 'underscore' },
- 'bootstrap.min.js': { 'bootstrap/dist/js': 'bootstrap/js'
},
'backbone-min.js': { 'backbone': 'backbone' },
'backbone.babysitter.min.js': { 'backbone.babysitter/lib':
'backbone-babysitter' },
'backbone.marionette.min.js': { 'backbone.marionette/lib':
'backbone-marionette' },
@@ -125,7 +124,6 @@ module.exports = function(grunt) {
srcPrefix: nodeModulePath
},
files: {
- 'bootstrap.min.css': { 'bootstrap/dist/css':
'bootstrap/css' },
'glyphicons-halflings-regular.woff2': { 'bootstrap/fonts':
'bootstrap/fonts' },
'backgrid.css': { 'backgrid/lib': 'backgrid/css' },
'backgrid-filter.min.css': { 'backgrid-filter':
'backgrid-filter/css' },
@@ -222,6 +220,18 @@ module.exports = function(grunt) {
cwd: modulesPath,
src: ['**', '!**/scss/**', "!**/atlas-lineage/**",
"**/atlas-lineage/dist/**", "!index.html.tpl"],
dest: distPath
+ },
+ bootstrap: {
+ files: [
+ {
+ src: nodeModulePath +
'bootstrap/dist/js/bootstrap-patched.min.js',
+ dest: libPath + 'bootstrap/js/bootstrap.min.js'
+ },
+ {
+ src: nodeModulePath +
'bootstrap/dist/css/bootstrap-patched.min.css',
+ dest: libPath + 'bootstrap/css/bootstrap.min.css'
+ }
+ ]
}
},
clean: {
@@ -351,6 +361,7 @@ module.exports = function(grunt) {
grunt.registerTask('dev', [
'clean',
'copy:libs',
+ 'copy:bootstrap',
'copy:build',
'rename',
'sass:build',
@@ -363,6 +374,7 @@ module.exports = function(grunt) {
grunt.registerTask('build', [
'clean',
'copy:libs',
+ 'copy:bootstrap',
'copy:build',
'rename',
'sass:build',
@@ -372,6 +384,7 @@ module.exports = function(grunt) {
grunt.registerTask('dev-minify', [
'clean',
'copy:libs',
+ 'copy:bootstrap',
'copy:build',
'rename',
'sass:build',
@@ -386,6 +399,7 @@ module.exports = function(grunt) {
grunt.registerTask('build-minify', [
'clean',
'copy:libs',
+ 'copy:bootstrap',
'copy:build',
'rename',
'sass:build',
diff --git a/dashboardv2/public/js/views/search/SearchLayoutView.js
b/dashboardv2/public/js/views/search/SearchLayoutView.js
index f0bffac6a..b1909136a 100644
--- a/dashboardv2/public/js/views/search/SearchLayoutView.js
+++ b/dashboardv2/public/js/views/search/SearchLayoutView.js
@@ -767,7 +767,10 @@ define(['require',
}
if (this.value.term) {
- this.ui.termLov.append('<option value="' +
_.escape(this.value.term) + '" selected="selected">' +
_.escape(this.value.term) + '</option>');
+ if (this.ui.termLov.find('option[value="' +
_.escape(this.value.term) + '"]').length === 0) {
+ this.ui.termLov.append('<option value="' +
_.escape(this.value.term) + '" selected="selected">' +
_.escape(this.value.term) + '</option>');
+ }
+ this.ui.termLov.val(this.value.term);
}
if (this.ui.termLov.data('select2')) {
if (this.ui.termLov.val() !== this.value.term) {
@@ -791,7 +794,7 @@ define(['require',
getSearchedTermGuid: function() {
var searchedTerm = this.ui.termLov.select2('val'),
searchedTermGuid = null;
- if (searchedTerm) {
+ if (searchedTerm && this.glossaryTermArray &&
_.isArray(this.glossaryTermArray)) {
this.glossaryTermArray.find(function(obj) {
if (searchedTerm === obj.id)
searchedTermGuid = obj.guid;
