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
4551dcd7
Commit
4551dcd7
authored
6 years ago
by
gutkaBinit
Committed by
kevalbhatt
6 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3103 UI : Render schema table from relationshipattributes node in the entity API
Signed-off-by:
kevalbhatt
<
kbhatt@apache.org
>
parent
ba5e6b24
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
3 deletions
+16
-3
Utils.js
dashboardv2/public/js/utils/Utils.js
+3
-1
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+9
-1
SearchResultLayoutView.js
dashboardv2/public/js/views/search/SearchResultLayoutView.js
+4
-1
No files found.
dashboardv2/public/js/utils/Utils.js
View file @
4551dcd7
...
...
@@ -550,7 +550,9 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
loaderEl
.
hide
?
loaderEl
.
hide
()
:
null
;
titleBoxEl
.
fadeIn
?
titleBoxEl
.
fadeIn
()
:
null
;
}
Utils
.
findAndMergeRefEntity
=
function
(
attributeObject
,
referredEntities
)
{
Utils
.
findAndMergeRefEntity
=
function
(
options
)
{
var
attributeObject
=
options
.
attributeObject
,
referredEntities
=
options
.
referredEntities
var
mergeObject
=
function
(
obj
)
{
if
(
obj
)
{
if
(
obj
.
attributes
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
4551dcd7
...
...
@@ -131,7 +131,15 @@ define(['require',
this
.
$
(
".termBox"
).
hide
();
}
// MergerRefEntity.
Utils
.
findAndMergeRefEntity
(
collectionJSON
.
attributes
,
this
.
entityObject
.
referredEntities
);
Utils
.
findAndMergeRefEntity
({
attributeObject
:
collectionJSON
.
attributes
,
referredEntities
:
this
.
entityObject
.
referredEntities
});
Utils
.
findAndMergeRefEntity
({
attributeObject
:
collectionJSON
.
relationshipAttributes
,
referredEntities
:
this
.
entityObject
.
referredEntities
});
// check if entity is process
var
isProcess
=
false
,
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/search/SearchResultLayoutView.js
View file @
4551dcd7
...
...
@@ -417,7 +417,10 @@ define(['require',
}
if
(
isPostMethod
)
{
that
.
searchCollection
.
referredEntities
=
dataOrCollection
.
referredEntities
;
Utils
.
findAndMergeRefEntity
(
dataOrCollection
.
entities
,
dataOrCollection
.
referredEntities
);
Utils
.
findAndMergeRefEntity
({
attributeObject
:
dataOrCollection
.
entities
,
referredEntities
:
dataOrCollection
.
referredEntities
});
that
.
searchCollection
.
reset
(
dataOrCollection
.
entities
,
{
silent
:
true
});
}
...
...
This diff is collapsed.
Click to expand it.
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