tool
/
atlas
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ATLAS-4880: Temporarily disable the tasks tab on Entity Detail page on Atlas UI 

Signed-off-by: Pinal Shah <pinal.shah@freestoneinfotech.com>
This commit is contained in:
Brijesh Bhalala 2024-06-14 17:36:26 +05:30 committed by Pinal Shah
parent 445e4b820b
commit 70817c27c1
10 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dashboardv2/public/js/main.js
View File

@ -314,6 +314,9 @@ require(['App',
if (response['atlas.tasks.enabled'] !== undefined) {
Globals.isTasksEnabled = response['atlas.tasks.enabled'];
}
if (response['atlas.tasks.ui.tab.enabled'] !== undefined) {
Globals.isUiTasksTabEnabled = response['atlas.tasks.ui.tab.enabled'];
}
if (response['atlas.session.timeout.secs']) { Globals.idealTimeoutSeconds = response['atlas.session.timeout.secs']; }
if (response['atlas.lineage.on.demand.enabled'] !== undefined) {
Globals.isLineageOnDemandEnabled = response['atlas.lineage.on.demand.enabled'];

2
dashboardv2/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
View File

@ -59,8 +59,10 @@
<li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
<li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">Profile</a></li>
{{#if isTasksEnabled}}
{{#if isUiTasksTabEnabled }}
<li role="pendingTask" class="tab"><a href="#tab-pendingTask" aria-controls="tab-pendingTask" role="tab" data-toggle="tab">Tasks</a></li>
{{/if}}
{{/if}}
</ul>
</div>
</div>

1
dashboardv2/public/js/utils/Globals.js
View File

@ -54,6 +54,7 @@ define(["require", "underscore"], function(require, _) {
Globals.isDebugMetricsEnabled = false;
Globals.isTasksEnabled = false;
Globals.isUiTasksTabEnabled = false;
Globals.idealTimeoutSeconds = 900;
Globals.isFullScreenView = false;
Globals.isLineageOnDemandEnabled = false;

5
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View File

@ -75,7 +75,8 @@ define(['require',
templateHelpers: function() {
return {
entityUpdate: Globals.entityUpdate,
isTasksEnabled: Globals.isTasksEnabled
isTasksEnabled: Globals.isTasksEnabled,
isUiTasksTabEnabled: Globals.isUiTasksTabEnabled
};
},
/** ui events hash */
@ -322,7 +323,7 @@ define(['require',
this.renderRelationshipLayoutView(obj);
this.renderAuditTableLayoutView(obj);
this.renderTagTableLayoutView(obj);
if (Globals.isTasksEnabled) { this.renderPendingTaskTableLayoutView(); }
if (Globals.isTasksEnabled && Globals.isUiTasksTabEnabled) { this.renderPendingTaskTableLayoutView(); }
// To render profile tab check for attribute "profileData" or typeName = "hive_db","hbase_namespace"
if (collectionJSON && (!_.isUndefined(collectionJSON.attributes['profileData']) || collectionJSON.typeName === "hive_db" || collectionJSON.typeName === "hbase_namespace")) {

3
dashboardv3/public/js/main.js
View File

@ -341,6 +341,9 @@ require(['App',
if (response['atlas.tasks.enabled'] !== undefined) {
Globals.isTasksEnabled = response['atlas.tasks.enabled'];
}
if (response['atlas.tasks.ui.tab.enabled'] !== undefined) {
Globals.isUiTasksTabEnabled = response['atlas.tasks.ui.tab.enabled'];
}
if (response['atlas.session.timeout.secs']) { Globals.idealTimeoutSeconds = response['atlas.session.timeout.secs']; }
if (response['atlas.lineage.on.demand.enabled'] !== undefined) {
Globals.isLineageOnDemandEnabled = response['atlas.lineage.on.demand.enabled'];

2
dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
View File

@ -62,8 +62,10 @@
<li role="schema" class="tab schemaTable" style="display:none"><a href="#tab-schema" aria-controls="tab-schema" role="tab" data-toggle="tab">Schema</a></li>
<li role="profile" class="tab profileTab" style="display:none"><a href="#tab-profile" aria-controls="tab-profile" role="tab" data-toggle="tab">Profile</a></li>
{{#if isTasksEnabled}}
{{#if isUiTasksTabEnabled }}
<li role="pendingTask" class="tab"><a href="#tab-pendingTask" aria-controls="tab-pendingTask" role="tab" data-toggle="tab">Tasks</a></li>
{{/if}}
{{/if}}
</ul>
</div>
</div>

1
dashboardv3/public/js/utils/Globals.js
View File

@ -54,6 +54,7 @@ define(["require", "underscore"], function(require, _) {
Globals.isDebugMetricsEnabled = false;
Globals.isTasksEnabled = false;
Globals.isUiTasksTabEnabled = false;
Globals.advanceSearchData = {};
Globals.idealTimeoutSeconds = 900;
Globals.isFullScreenView = false;

5
dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js
View File

@ -76,7 +76,8 @@ define(['require',
templateHelpers: function() {
return {
entityUpdate: Globals.entityUpdate,
isTasksEnabled: Globals.isTasksEnabled
isTasksEnabled: Globals.isTasksEnabled,
isUiTasksTabEnabled: Globals.isUiTasksTabEnabled
};
},
/** ui events hash */
@ -327,7 +328,7 @@ define(['require',
this.renderRelationshipLayoutView(obj);
this.renderAuditTableLayoutView(obj);
this.renderTagTableLayoutView(obj);
if (Globals.isTasksEnabled) { this.renderPendingTaskTableLayoutView(); }
if (Globals.isTasksEnabled && Globals.isUiTasksTabEnabled) { this.renderPendingTaskTableLayoutView(); }
// To render profile tab check for attribute "profileData" or typeName = "hive_db","hbase_namespace"
if (collectionJSON && (!_.isUndefined(collectionJSON.attributes['profileData']) || collectionJSON.typeName === "hive_db" || collectionJSON.typeName === "hbase_namespace")) {

3
intg/src/main/java/org/apache/atlas/AtlasConfiguration.java
View File

@ -110,7 +110,8 @@ public enum AtlasConfiguration {
ATLAS_AUDIT_AGING_SEARCH_MAX_LIMIT("atlas.audit.aging.search.maxlimit", 10000),
ATLAS_AUDIT_DEFAULT_AGEOUT_IGNORE_TTL("atlas.audit.default.ageout.ignore.ttl", false),
ATLAS_AUDIT_AGING_TTL_TEST_AUTOMATION("atlas.audit.aging.ttl.test.automation", false),//Only for test automation
RELATIONSHIP_SEARCH_ENABLED("atlas.relationship.search.enabled" ,false);
RELATIONSHIP_SEARCH_ENABLED("atlas.relationship.search.enabled" ,false),
UI_TASKS_TAB_USE_ENABLED("atlas.tasks.ui.tab.enabled", false);
private static final Configuration APPLICATION_PROPERTIES;

5
webapp/src/main/java/org/apache/atlas/web/resources/AdminResource.java
View File

@ -154,6 +154,7 @@ public class AdminResource {
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";
private static final String UI_TASKS_TAB_USE_ENABLED = "atlas.tasks.ui.tab.enabled";
private static final String OPERATION_STATUS = "operationStatus";
private static final List TIMEZONE_LIST = Arrays.asList(TimeZone.getAvailableIDs());
@ -194,6 +195,7 @@ public class AdminResource {
private final int defaultLineageNodeCount;
private final boolean isRelationshipSearchEnabled;
private final AtlasMetricsUtil atlasMetricsUtil;
private final boolean isUiTasksTabEnabled;
private AtlasAuditReductionService auditReductionService;
@ -238,6 +240,7 @@ public class AdminResource {
this.uiDateFormat = atlasProperties.getString(UI_DATE_FORMAT, UI_DATE_DEFAULT_FORMAT);
this.isDebugMetricsEnabled = AtlasConfiguration.DEBUG_METRICS_ENABLED.getBoolean();
this.isTasksEnabled = AtlasConfiguration.TASKS_USE_ENABLED.getBoolean();
this.isUiTasksTabEnabled = AtlasConfiguration.UI_TASKS_TAB_USE_ENABLED.getBoolean();
this.isOnDemandLineageEnabled = AtlasConfiguration.LINEAGE_ON_DEMAND_ENABLED.getBoolean();
this.defaultLineageNodeCount = AtlasConfiguration.LINEAGE_ON_DEMAND_DEFAULT_NODE_COUNT.getInt();
this.isRelationshipSearchEnabled = AtlasConfiguration.RELATIONSHIP_SEARCH_ENABLED.getBoolean();
@ -247,6 +250,7 @@ public class AdminResource {
this.uiDateFormat = UI_DATE_DEFAULT_FORMAT;
this.isDebugMetricsEnabled = false;
this.isTasksEnabled = false;
this.isUiTasksTabEnabled = false;
this.isOnDemandLineageEnabled = false;
this.defaultLineageNodeCount = 3;
this.isRelationshipSearchEnabled = false;
@ -399,6 +403,7 @@ public class AdminResource {
responseData.put(UI_DATE_FORMAT, uiDateFormat);
responseData.put(AtlasConfiguration.DEBUG_METRICS_ENABLED.getPropertyName(), isDebugMetricsEnabled);
responseData.put(AtlasConfiguration.TASKS_USE_ENABLED.getPropertyName(), isTasksEnabled);
responseData.put(AtlasConfiguration.UI_TASKS_TAB_USE_ENABLED.getPropertyName(), isUiTasksTabEnabled);
responseData.put(AtlasConfiguration.LINEAGE_ON_DEMAND_ENABLED.getPropertyName(), isOnDemandLineageEnabled);
responseData.put(AtlasConfiguration.LINEAGE_ON_DEMAND_DEFAULT_NODE_COUNT.getPropertyName(), defaultLineageNodeCount);
responseData.put( AtlasConfiguration.RELATIONSHIP_SEARCH_ENABLED.getPropertyName(),isRelationshipSearchEnabled);