Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
b0ab2ffe
Commit
b0ab2ffe
authored
Oct 03, 2019
by
kevalbhatt
Committed by
Sarath Subramanian
Oct 03, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3436: UI: Show Incomplete entity status in the Lineage graph
Signed-off-by:
Sarath Subramanian
<
sarath@apache.org
>
parent
ddd0c9ca
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
110 additions
and
0 deletions
+110
-0
graph.scss
dashboardv2/public/css/scss/graph.scss
+38
-0
LineageLayoutView_tmpl.html
...dv2/public/js/templates/graph/LineageLayoutView_tmpl.html
+1
-0
LineageLayoutView.js
dashboardv2/public/js/views/graph/LineageLayoutView.js
+16
-0
graph.scss
dashboardv3/public/css/scss/graph.scss
+38
-0
LineageLayoutView_tmpl.html
...dv3/public/js/templates/graph/LineageLayoutView_tmpl.html
+1
-0
LineageLayoutView.js
dashboardv3/public/js/views/graph/LineageLayoutView.js
+16
-0
No files found.
dashboardv2/public/css/scss/graph.scss
View file @
b0ab2ffe
...
@@ -449,3 +449,40 @@ span#zoom_in {
...
@@ -449,3 +449,40 @@ span#zoom_in {
}
}
}
}
.isIncomplete
{
foreignObject
{
display
:
none
;
}
&
.show
{
image
{
opacity
:
0
.2
;
animation
:
blink
2
.5s
infinite
;
}
foreignObject
{
display
:
block
;
}
}
i
.fa-refresh
{
text-align
:
center
;
margin-top
:
33%
;
font-size
:
15px
;
}
}
@-webkit-keyframes
blink
{
from
{
opacity
:
0
.2
;
}
to
{
opacity
:
0
.5
;
}
}
\ No newline at end of file
dashboardv2/public/js/templates/graph/LineageLayoutView_tmpl.html
View file @
b0ab2ffe
...
@@ -139,6 +139,7 @@
...
@@ -139,6 +139,7 @@
</div>
</div>
<div
class=
"legends pull-left"
style=
"height: 25px; padding: 2px;"
>
<div
class=
"legends pull-left"
style=
"height: 25px; padding: 2px;"
>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-circle-o fa-fw"
></i>
Current Entity
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-circle-o fa-fw"
></i>
Current Entity
</span>
<span
style=
"margin-right: 8px;"
><i
class=
"fa fa-refresh fa-fw"
></i>
In Progress
</span>
<span
style=
"margin-right: 8px; color:#df9b00;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Lineage
</span>
<span
style=
"margin-right: 8px; color:#df9b00;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Lineage
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Impact
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Impact
</span>
</div>
</div>
...
...
dashboardv2/public/js/views/graph/LineageLayoutView.js
View file @
b0ab2ffe
...
@@ -329,6 +329,7 @@ define(['require',
...
@@ -329,6 +329,7 @@ define(['require',
toolTipLabel
:
relationObj
.
displayText
,
toolTipLabel
:
relationObj
.
displayText
,
id
:
relationObj
.
guid
,
id
:
relationObj
.
guid
,
isLineage
:
true
,
isLineage
:
true
,
isIncomplete
:
relationObj
.
isIncomplete
,
entityDef
:
this
.
getEntityDef
(
relationObj
.
typeName
)
entityDef
:
this
.
getEntityDef
(
relationObj
.
typeName
)
},
relationObj
);
},
relationObj
);
obj
[
"serviceType"
]
=
this
.
getServiceType
({
typeName
:
relationObj
.
typeName
,
entityDef
:
obj
.
entityDef
});
obj
[
"serviceType"
]
=
this
.
getServiceType
({
typeName
:
relationObj
.
typeName
,
entityDef
:
obj
.
entityDef
});
...
@@ -559,6 +560,12 @@ define(['require',
...
@@ -559,6 +560,12 @@ define(['require',
if
(
currentNode
)
{
if
(
currentNode
)
{
shapeSvg
.
attr
(
"stroke"
,
"#fb4200"
)
shapeSvg
.
attr
(
"stroke"
,
"#fb4200"
)
}
}
if
(
node
.
isIncomplete
===
true
)
{
parent
.
attr
(
"class"
,
"isIncomplete show"
);
}
else
{
parent
.
attr
(
"class"
,
"isIncomplete"
);
}
parent
.
insert
(
"defs"
)
parent
.
insert
(
"defs"
)
.
append
(
"pattern"
)
.
append
(
"pattern"
)
.
attr
(
"x"
,
"0%"
)
.
attr
(
"x"
,
"0%"
)
...
@@ -625,6 +632,15 @@ define(['require',
...
@@ -625,6 +632,15 @@ define(['require',
.
attr
(
"y"
,
currentNode
?
"3"
:
"4"
).
attr
(
"width"
,
"40"
)
.
attr
(
"y"
,
currentNode
?
"3"
:
"4"
).
attr
(
"width"
,
"40"
)
.
attr
(
"height"
,
"40"
);
.
attr
(
"height"
,
"40"
);
parent
.
insert
(
"foreignObject"
)
.
attr
(
"x"
,
"-25"
)
.
attr
(
"y"
,
"-25"
)
.
attr
(
"width"
,
"50"
)
.
attr
(
"height"
,
"50"
)
.
append
(
"xhtml:div"
)
.
insert
(
"i"
)
.
attr
(
"class"
,
"fa fa-refresh fa-spin-custom"
);
node
.
intersect
=
function
(
point
)
{
node
.
intersect
=
function
(
point
)
{
return
dagreD3
.
intersect
.
circle
(
node
,
currentNode
?
24
:
21
,
point
);
return
dagreD3
.
intersect
.
circle
(
node
,
currentNode
?
24
:
21
,
point
);
};
};
...
...
dashboardv3/public/css/scss/graph.scss
View file @
b0ab2ffe
...
@@ -442,3 +442,40 @@ span#zoom_in {
...
@@ -442,3 +442,40 @@ span#zoom_in {
}
}
}
}
.isIncomplete
{
foreignObject
{
display
:
none
;
}
&
.show
{
image
{
opacity
:
0
.2
;
animation
:
blink
2
.5s
infinite
;
}
foreignObject
{
display
:
block
;
}
}
i
.fa-refresh
{
text-align
:
center
;
margin-top
:
33%
;
font-size
:
15px
;
}
}
@-webkit-keyframes
blink
{
from
{
opacity
:
0
.2
;
}
to
{
opacity
:
0
.5
;
}
}
\ No newline at end of file
dashboardv3/public/js/templates/graph/LineageLayoutView_tmpl.html
View file @
b0ab2ffe
...
@@ -139,6 +139,7 @@
...
@@ -139,6 +139,7 @@
</div>
</div>
<div
class=
"legends pull-left"
style=
"height: 25px; padding: 2px;"
>
<div
class=
"legends pull-left"
style=
"height: 25px; padding: 2px;"
>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-circle-o fa-fw"
></i>
Current Entity
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-circle-o fa-fw"
></i>
Current Entity
</span>
<span
style=
"margin-right: 8px;"
><i
class=
"fa fa-refresh fa-fw"
></i>
In Progress
</span>
<span
style=
"margin-right: 8px; color:#df9b00;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Lineage
</span>
<span
style=
"margin-right: 8px; color:#df9b00;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Lineage
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Impact
</span>
<span
style=
"margin-right: 8px; color:#fb4200;"
><i
class=
"fa fa-long-arrow-right fa-fw"
></i>
Impact
</span>
</div>
</div>
...
...
dashboardv3/public/js/views/graph/LineageLayoutView.js
View file @
b0ab2ffe
...
@@ -344,6 +344,7 @@ define(['require',
...
@@ -344,6 +344,7 @@ define(['require',
toolTipLabel
:
relationObj
.
displayText
,
toolTipLabel
:
relationObj
.
displayText
,
id
:
relationObj
.
guid
,
id
:
relationObj
.
guid
,
isLineage
:
true
,
isLineage
:
true
,
isIncomplete
:
relationObj
.
isIncomplete
,
entityDef
:
this
.
getEntityDef
(
relationObj
.
typeName
)
entityDef
:
this
.
getEntityDef
(
relationObj
.
typeName
)
},
relationObj
);
},
relationObj
);
obj
[
"serviceType"
]
=
this
.
getServiceType
({
typeName
:
relationObj
.
typeName
,
entityDef
:
obj
.
entityDef
});
obj
[
"serviceType"
]
=
this
.
getServiceType
({
typeName
:
relationObj
.
typeName
,
entityDef
:
obj
.
entityDef
});
...
@@ -574,6 +575,12 @@ define(['require',
...
@@ -574,6 +575,12 @@ define(['require',
if
(
currentNode
)
{
if
(
currentNode
)
{
shapeSvg
.
attr
(
"stroke"
,
"#fb4200"
)
shapeSvg
.
attr
(
"stroke"
,
"#fb4200"
)
}
}
if
(
node
.
isIncomplete
===
true
)
{
parent
.
attr
(
"class"
,
"isIncomplete show"
);
}
else
{
parent
.
attr
(
"class"
,
"isIncomplete"
);
}
parent
.
insert
(
"defs"
)
parent
.
insert
(
"defs"
)
.
append
(
"pattern"
)
.
append
(
"pattern"
)
.
attr
(
"x"
,
"0%"
)
.
attr
(
"x"
,
"0%"
)
...
@@ -640,6 +647,15 @@ define(['require',
...
@@ -640,6 +647,15 @@ define(['require',
.
attr
(
"y"
,
currentNode
?
"3"
:
"4"
).
attr
(
"width"
,
"40"
)
.
attr
(
"y"
,
currentNode
?
"3"
:
"4"
).
attr
(
"width"
,
"40"
)
.
attr
(
"height"
,
"40"
);
.
attr
(
"height"
,
"40"
);
parent
.
insert
(
"foreignObject"
)
.
attr
(
"x"
,
"-25"
)
.
attr
(
"y"
,
"-25"
)
.
attr
(
"width"
,
"50"
)
.
attr
(
"height"
,
"50"
)
.
append
(
"xhtml:div"
)
.
insert
(
"i"
)
.
attr
(
"class"
,
"fa fa-refresh fa-spin-custom"
);
node
.
intersect
=
function
(
point
)
{
node
.
intersect
=
function
(
point
)
{
return
dagreD3
.
intersect
.
circle
(
node
,
currentNode
?
24
:
21
,
point
);
return
dagreD3
.
intersect
.
circle
(
node
,
currentNode
?
24
:
21
,
point
);
};
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment