You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by pp...@apache.org on 2025/07/25 07:44:35 UTC
(atlas) branch ATLAS-5072 created (now c4c180c03)
This is an automated email from the ASF dual-hosted git repository.
ppawar pushed a change to branch ATLAS-5072
in repository https://gitbox.apache.org/repos/asf/atlas.git
at c4c180c03 ATLAS-5072: Make default landing UI as React UI
This branch includes the following new commits:
new c4c180c03 ATLAS-5072: Make default landing UI as React UI
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(atlas) 01/01: ATLAS-5072: Make default landing UI as React UI
Posted by pp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ppawar pushed a commit to branch ATLAS-5072
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit c4c180c03e3fa4ee79b096c41d29e54d2063b0f6
Author: Prasad Pawar <pr...@freestoneinfotech.com>
AuthorDate: Fri Jul 25 13:14:10 2025 +0530
ATLAS-5072: Make default landing UI as React UI
---
dashboard/src/views/Layout/Header.tsx | 2 +-
dashboard/src/views/Layout/Layout.tsx | 2 +-
dashboardv2/public/js/modules/atlasLogin.js | 32 +++++++++++++---------
dashboardv3/public/js/modules/atlasLogin.js | 32 +++++++++++++---------
.../apache/atlas/web/resources/AdminResource.java | 6 ++--
5 files changed, 43 insertions(+), 31 deletions(-)
diff --git a/dashboard/src/views/Layout/Header.tsx b/dashboard/src/views/Layout/Header.tsx
index 7df1486ed..11f919cc4 100644
--- a/dashboard/src/views/Layout/Header.tsx
+++ b/dashboard/src/views/Layout/Header.tsx
@@ -144,7 +144,7 @@ const Header: React.FC<Header> = ({
};
const handleLogout = () => {
- localStorage.setItem("atlas_ui", "beta");
+ localStorage.setItem("atlas_ui", "v3");
let path = getBaseUrl(window.location.pathname);
window.location.href = path + "/logout.html";
handleClose();
diff --git a/dashboard/src/views/Layout/Layout.tsx b/dashboard/src/views/Layout/Layout.tsx
index 57546794e..98dcc4e88 100644
--- a/dashboard/src/views/Layout/Layout.tsx
+++ b/dashboard/src/views/Layout/Layout.tsx
@@ -89,7 +89,7 @@ const Layout: React.FC = () => {
}, [getRemainingTime, isPrompted]);
const handleLogout = () => {
- localStorage.setItem("atlas_ui", "beta");
+ localStorage.setItem("atlas_ui", "v3");
let path = getBaseUrl(window.location.pathname);
window.location.href = path + "/logout.html";
handleCloseSessionModal();
diff --git a/dashboardv2/public/js/modules/atlasLogin.js b/dashboardv2/public/js/modules/atlasLogin.js
index 687645c8d..cbf9b4cd9 100644
--- a/dashboardv2/public/js/modules/atlasLogin.js
+++ b/dashboardv2/public/js/modules/atlasLogin.js
@@ -96,20 +96,26 @@ function doLogin() {
function redirect(baseUrl) {
$.ajax({
url: baseUrl + "api/atlas/admin/session",
- success: function(data) {
- var PRIMARY_UI = "v2",
- indexpath = "/n/index.html";
- if (data && data["atlas.ui.default.version"]) {
- PRIMARY_UI = data["atlas.ui.default.version"];
- }
- if (PRIMARY_UI !== "v2") {
- indexpath = "/index.html";
- }
- if (window.localStorage.last_ui_load === "v1") {
- indexpath = "/index.html";
- } else if (window.localStorage.last_ui_load === "v2") {
- indexpath = "/n/index.html";
+ success: function(data) {
+ // Default to react UI (v3)
+ var PRIMARY_UI = (data && data["atlas.ui.default.version"]) ? data["atlas.ui.default.version"] : "v3";
+ var lastUILoad = window.localStorage && window.localStorage.last_ui_load;
+ var uiVersion = lastUILoad || PRIMARY_UI;
+ var indexpath;
+
+ switch (uiVersion) {
+ case "v1":
+ indexpath = "/index.html"; // classic UI
+ break;
+ case "v2":
+ indexpath = "/n/index.html"; // beta UI
+ break;
+ case "v3":
+ default:
+ indexpath = "/n3/index.html"; // react UI
+ break;
}
+
indexpath = baseUrl + indexpath;
if (location.hash.length > 2) {
indexpath += location.hash;
diff --git a/dashboardv3/public/js/modules/atlasLogin.js b/dashboardv3/public/js/modules/atlasLogin.js
index 687645c8d..60b09120d 100644
--- a/dashboardv3/public/js/modules/atlasLogin.js
+++ b/dashboardv3/public/js/modules/atlasLogin.js
@@ -96,20 +96,26 @@ function doLogin() {
function redirect(baseUrl) {
$.ajax({
url: baseUrl + "api/atlas/admin/session",
- success: function(data) {
- var PRIMARY_UI = "v2",
- indexpath = "/n/index.html";
- if (data && data["atlas.ui.default.version"]) {
- PRIMARY_UI = data["atlas.ui.default.version"];
- }
- if (PRIMARY_UI !== "v2") {
- indexpath = "/index.html";
- }
- if (window.localStorage.last_ui_load === "v1") {
- indexpath = "/index.html";
- } else if (window.localStorage.last_ui_load === "v2") {
- indexpath = "/n/index.html";
+ success: function(data) {
+ // Default to react UI (v3)
+ var PRIMARY_UI = (data && data["atlas.ui.default.version"]) ? data["atlas.ui.default.version"] : "v3";
+ var lastUILoad = window.localStorage && window.localStorage.last_ui_load;
+ var uiVersion = lastUILoad || PRIMARY_UI;
+ var indexpath;
+
+ switch (uiVersion) {
+ case "v1":
+ indexpath = "/index.html"; // classic UI
+ break;
+ case "v2":
+ indexpath = "/n/index.html"; // beta UI
+ break;
+ case "v3":
+ default:
+ indexpath = "/n3/index.html"; // react UI
+ break;
}
+
indexpath = baseUrl + indexpath;
if (location.hash.length > 2) {
indexpath += location.hash;
diff --git a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
index f3128b5ab..06ff05339 100755
--- a/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
+++ b/webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
@@ -153,7 +153,7 @@ public class AdminResource {
private static final String editableEntityTypes = "atlas.ui.editable.entity.types";
private static final String DEFAULT_EDITABLE_ENTITY_TYPES = "hdfs_path";
private static final String DEFAULT_UI_VERSION = "atlas.ui.default.version";
- private static final String UI_VERSION_V2 = "v2";
+ private static final String UI_VERSION_V3 = "v3"; //v1:Classic UI, v2:Beta UI, v3:react ui
private static final String UI_DATE_TIMEZONE_FORMAT_ENABLED = "atlas.ui.date.timezone.format.enabled";
private static final String UI_DATE_FORMAT = "atlas.ui.date.format";
private static final String UI_DATE_DEFAULT_FORMAT = "MM/DD/YYYY hh:mm:ss A";
@@ -226,7 +226,7 @@ public class AdminResource {
this.atlasMetricsUtil = atlasMetricsUtil;
if (atlasProperties != null) {
- this.defaultUIVersion = atlasProperties.getString(DEFAULT_UI_VERSION, UI_VERSION_V2);
+ this.defaultUIVersion = atlasProperties.getString(DEFAULT_UI_VERSION, UI_VERSION_V3);
this.isTimezoneFormatEnabled = atlasProperties.getBoolean(UI_DATE_TIMEZONE_FORMAT_ENABLED, true);
this.uiDateFormat = atlasProperties.getString(UI_DATE_FORMAT, UI_DATE_DEFAULT_FORMAT);
this.isDebugMetricsEnabled = AtlasConfiguration.DEBUG_METRICS_ENABLED.getBoolean();
@@ -236,7 +236,7 @@ public class AdminResource {
this.defaultLineageNodeCount = AtlasConfiguration.LINEAGE_ON_DEMAND_DEFAULT_NODE_COUNT.getInt();
this.isRelationshipSearchEnabled = AtlasConfiguration.RELATIONSHIP_SEARCH_ENABLED.getBoolean();
} else {
- this.defaultUIVersion = UI_VERSION_V2;
+ this.defaultUIVersion = UI_VERSION_V3;
this.isTimezoneFormatEnabled = true;
this.uiDateFormat = UI_DATE_DEFAULT_FORMAT;
this.isDebugMetricsEnabled = false;