Skip to content

A
atlas
Commit 45bf48e6 by pratik24mac Committed by Sarath Subramanian
Options

ATLAS-2594: UI, Tag propagation : Add dialog box for blocked Propagated classifications list on UI

Signed-off-by: 's avatarSarath Subramanian <ssubramanian@hortonworks.com>
parent 7b14cfac
Showing with 90 additions and 33 deletions
dashboardv2/public/css/scss/override.scss
...@@ -429,4 +429,7 @@ div.columnmanager-dropdown-container { ...@@ -429,4 +429,7 @@ div.columnmanager-dropdown-container {
.fa-color { .fa-color {
color: $color_keppel_approx color: $color_keppel_approx
}
.w30{
width: 30% !important;
} }
\ No newline at end of file
dashboardv2/public/css/scss/theme.scss
...@@ -137,14 +137,17 @@ header { ...@@ -137,14 +137,17 @@ header {
a { a {
color: $color_jungle_green_approx; color: $color_jungle_green_approx;
cursor: pointer;
&:focus { &:focus {
color: $color_puerto_rico_approx; color: $color_puerto_rico_approx;
text-decoration: none; text-decoration: none;
outline: none; outline: none;
cursor: pointer;
} }
&:hover { &:hover {
color: $color_puerto_rico_approx; color: $color_puerto_rico_approx;
text-decoration: none; text-decoration: none;
cursor: pointer;
} }
} }
......
dashboardv2/public/js/templates/graph/PropagationPropertyModalView_tmpl.html
...@@ -15,38 +15,54 @@ ...@@ -15,38 +15,54 @@
* limitations under the License. * limitations under the License.
--> -->
<div class="lineage-edge-details" data-id="PropagationToolTip"> <div class="lineage-edge-details" data-id="PropagationToolTip">
<h4 class="title"><span data-id="edgeDetailName"></span></h4> <div class="col-sm-12">
<div class="overlay show"> <div class="row">
<div class="fontLoader show"> <div class="col-sm-9" style="margin-top: 5px;">
<i class="fa fa-refresh fa-spin-custom"></i> <span class="pull-left">Propagation flow</span>
<label class="switch pull-left">
<input type="checkbox" class="switch-input" name="editPropagationType" value="text">
<span class="switch-slider"></span>
</label>
<span class="pull-left">Block propagation</span>
</div>
</div> </div>
<hr style="margin-top: 0px;">
</div> </div>
<div class="col-md-12"> <div class="editPropagation col-sm-12">
<ul data-id="propagationOptions" class="propagation-list"> <h4 class="title"><span data-id="edgeDetailName"></span></h4>
<li> <div class="overlay show">
<div class="radio"> <div class="fontLoader show">
<input type="radio" name="propagateRelation" value="ONE_TO_TWO" id="ONE_TO_TWO"> <i class="fa fa-refresh fa-spin-custom"></i>
<label class="padding-left-0" for="ONE_TO_TWO">ONE TO TWO</label> </div>
</div> </div>
</li> <div class="col-md-12">
<li> <ul data-id="propagationOptions" class="propagation-list">
<div class="radio"> <li>
<input type="radio" name="propagateRelation" value="TWO_TO_ONE" id="TWO_TO_ONE"> <div class="radio">
<label class="padding-left-0" for="TWO_TO_ONE">TWO TO ONE</label> <input type="radio" name="propagateRelation" value="ONE_TO_TWO" id="ONE_TO_TWO">
</div> <label class="padding-left-0" for="ONE_TO_TWO">ONE TO TWO</label>
</li> </div>
<li> </li>
<div class="radio"> <li>
<input type="radio" name="propagateRelation" value="BOTH" id="BOTH"> <div class="radio">
<label class="padding-left-0" for="BOTH">BOTH</label> <input type="radio" name="propagateRelation" value="TWO_TO_ONE" id="TWO_TO_ONE">
</div> <label class="padding-left-0" for="TWO_TO_ONE">TWO TO ONE</label>
</li> </div>
<li> </li>
<div class="radio"> <li>
<input type="radio" name="propagateRelation" value="NONE" id="NONE"> <div class="radio">
<label class="padding-left-0" for="NONE">None</label> <input type="radio" name="propagateRelation" value="BOTH" id="BOTH">
</div> <label class="padding-left-0" for="BOTH">BOTH</label>
</li> </div>
</ul> </li>
<li>
<div class="radio">
<input type="radio" name="propagateRelation" value="NONE" id="NONE">
<label class="padding-left-0" for="NONE">None</label>
</div>
</li>
</ul>
</div>
</div> </div>
<div data-id="PropagatedClassificationTable" class="propagatedClassificationTable col-sm-12" style="display: none"></div>
</div> </div>
\ No newline at end of file
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
...@@ -242,6 +242,7 @@ define(['require', ...@@ -242,6 +242,7 @@ define(['require',
this.renderLineageLayoutView({ this.renderLineageLayoutView({
guid: this.id, guid: this.id,
entityDefCollection: this.entityDefCollection, entityDefCollection: this.entityDefCollection,
fetchCollection: this.fetchCollection.bind(this),
actionCallBack: function() { actionCallBack: function() {
that.$('#expand_collapse_panel').click(); that.$('#expand_collapse_panel').click();
} }
......
dashboardv2/public/js/views/graph/LineageLayoutView.js
...@@ -56,7 +56,7 @@ define(['require', ...@@ -56,7 +56,7 @@ define(['require',
* @constructs * @constructs
*/ */
initialize: function(options) { initialize: function(options) {
_.extend(this, _.pick(options, 'guid', 'entityDefCollection', 'actionCallBack')); _.extend(this, _.pick(options, 'guid', 'entityDefCollection', 'actionCallBack', 'fetchCollection'));
this.collection = new VLineageList(); this.collection = new VLineageList();
this.lineageData = null; this.lineageData = null;
this.typeMap = {}; this.typeMap = {};
...@@ -68,6 +68,9 @@ define(['require', ...@@ -68,6 +68,9 @@ define(['require',
var that = this; var that = this;
this.$('.fontLoader').show(); this.$('.fontLoader').show();
this.fetchGraphData(); this.fetchGraphData();
if (platform.name === "IE") {
this.$('svg').css('opacity', '0');
}
if (this.layoutRendered) { if (this.layoutRendered) {
this.layoutRendered(); this.layoutRendered();
} }
...@@ -180,6 +183,14 @@ define(['require', ...@@ -180,6 +183,14 @@ define(['require',
}); });
} }
}, },
toggleInformationSlider: function(options) {
if (options.open && !this.$('.lineage-edge-details').hasClass("open")) {
this.$('.lineage-edge-details').addClass('open');
} else if (options.close && this.$('.lineage-edge-details').hasClass("open")) {
d3.selectAll('circle').attr("stroke", "none");
this.$('.lineage-edge-details').removeClass('open');
}
},
setGraphZoomPositionCal: function(argument) { setGraphZoomPositionCal: function(argument) {
var initialScale = 1.2, var initialScale = 1.2,
svgEl = this.$('svg'), svgEl = this.$('svg'),
...@@ -371,6 +382,9 @@ define(['require', ...@@ -371,6 +382,9 @@ define(['require',
svg.call(zoom) svg.call(zoom)
.call(tooltip); .call(tooltip);
if (platform.name !== "IE") {
this.$('.fontLoader').hide();
}
render(svgGroup, this.g); render(svgGroup, this.g);
svg.on("dblclick.zoom", null) svg.on("dblclick.zoom", null)
.on("wheel.zoom", null); .on("wheel.zoom", null);
...@@ -429,7 +443,8 @@ define(['require', ...@@ -429,7 +443,8 @@ define(['require',
edgeInfo: data, edgeInfo: data,
relationshipId: relationshipId, relationshipId: relationshipId,
lineageData: that.lineageData, lineageData: that.lineageData,
apiGuid: that.apiGuid apiGuid: that.apiGuid,
detailPageFetchCollection: that.fetchCollection
}); });
}); });
}) })
...@@ -446,6 +461,23 @@ define(['require', ...@@ -446,6 +461,23 @@ define(['require',
this.setGraphZoomPositionCal(); this.setGraphZoomPositionCal();
zoom.event(svg); zoom.event(svg);
//svg.attr('height', this.g.graph().height * initialScale + 40); //svg.attr('height', this.g.graph().height * initialScale + 40);
if (platform.name === "IE") {
this.IEGraphRenderDone = 0;
this.$('svg .edgePath').each(function(argument) {
var childNode = $(this).find('marker');
$(this).find('marker').remove();
var eleRef = this;
++that.IEGraphRenderDone;
setTimeout(function(argument) {
$(eleRef).find('defs').append(childNode);
--that.IEGraphRenderDone;
if (that.IEGraphRenderDone === 0) {
this.$('.fontLoader').hide();
this.$('svg').fadeTo(1000, 1)
}
}, 1000);
});
}
} }
}); });
return LineageLayoutView; return LineageLayoutView;
......
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