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
15baa4da
Commit
15baa4da
authored
8 years ago
by
kevalbhatt
Committed by
Madhan Neethiraj
8 years ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-1521 : Update UI to eliminate REST calls to obtain schema data (#2)
Signed-off-by:
Madhan Neethiraj
<
madhan@apache.org
>
parent
dd744765
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
15 additions
and
10 deletions
+15
-10
AuditTableLayoutView.js
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
+2
-2
CreateAuditTableLayoutView.js
...ardv2/public/js/views/audit/CreateAuditTableLayoutView.js
+7
-2
DetailPageLayoutView.js
...ardv2/public/js/views/detail_page/DetailPageLayoutView.js
+2
-2
SchemaLayoutView.js
dashboardv2/public/js/views/schema/SchemaLayoutView.js
+1
-1
TagDetailTableLayoutView.js
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
+3
-3
No files found.
dashboardv2/public/js/views/audit/AuditTableLayoutView.js
View file @
15baa4da
...
...
@@ -57,7 +57,7 @@ define(['require',
* @constructs
*/
initialize
:
function
(
options
)
{
_
.
extend
(
this
,
_
.
pick
(
options
,
'guid'
,
'entity'
));
_
.
extend
(
this
,
_
.
pick
(
options
,
'guid'
,
'entity'
,
'entityName'
));
this
.
entityCollection
=
new
VEntityList
();
this
.
count
=
26
;
this
.
entityCollection
.
url
=
UrlLinks
.
entityCollectionaudit
(
this
.
guid
);
...
...
@@ -224,7 +224,7 @@ define(['require',
that
.
action
=
$
(
e
.
target
).
data
(
"action"
);
var
eventModel
=
that
.
entityCollection
.
findWhere
({
'eventKey'
:
$
(
e
.
currentTarget
).
data
(
'modalid'
)
}).
toJSON
(),
collectionModel
=
new
that
.
entityCollection
.
model
(
eventModel
),
view
=
new
CreateAuditTableLayoutView
({
guid
:
that
.
guid
,
entityModel
:
collectionModel
,
action
:
that
.
action
,
entity
:
that
.
entity
});
view
=
new
CreateAuditTableLayoutView
({
guid
:
that
.
guid
,
entityModel
:
collectionModel
,
action
:
that
.
action
,
entity
:
that
.
entity
,
entityName
:
that
.
entityName
});
var
modal
=
new
Modal
({
title
:
that
.
action
,
content
:
view
,
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/audit/CreateAuditTableLayoutView.js
View file @
15baa4da
...
...
@@ -54,7 +54,7 @@ define(['require',
* @constructs
*/
initialize
:
function
(
options
)
{
_
.
extend
(
this
,
_
.
pick
(
options
,
'guid'
,
'entityModel'
,
'action'
,
'entity'
));
_
.
extend
(
this
,
_
.
pick
(
options
,
'guid'
,
'entityModel'
,
'action'
,
'entity'
,
'entityName'
));
},
bindEvents
:
function
()
{},
onRender
:
function
()
{
...
...
@@ -79,7 +79,7 @@ define(['require',
var
values
=
parseDetailsObject
.
values
;
if
(
this
.
action
&&
(
Enums
.
auditAction
.
ENTITY_CREATE
!==
this
.
action
&&
Enums
.
auditAction
.
ENTITY_UPDATE
!==
this
.
action
)
&&
name
)
{
this
.
ui
.
auditHeaderValue
.
html
(
'<th>'
+
this
.
action
+
'</th>'
);
this
.
ui
.
auditValue
.
html
(
"<tr><td>"
+
name
+
"</td></tr>"
);
this
.
ui
.
auditValue
.
html
(
"<tr><td>"
+
(
name
?
name
:
this
.
entityName
)
+
"</td></tr>"
);
}
else
if
(
parseDetailsObject
&&
parseDetailsObject
.
values
)
{
this
.
ui
.
auditHeaderValue
.
html
(
'<th>Key</th><th>New Value</th>'
);
//CommonViewFunction.findAndmergeRefEntity(attributeObject, that.referredEntities);
...
...
@@ -93,6 +93,11 @@ define(['require',
this
.
ui
.
tableAudit
.
hide
();
}
}
}
else
{
if
(
Enums
.
auditAction
.
ENTITY_DELETE
===
this
.
action
)
{
this
.
ui
.
auditHeaderValue
.
html
(
'<th>'
+
this
.
action
+
'</th>'
);
this
.
ui
.
auditValue
.
html
(
"<tr><td>"
+
(
name
?
name
:
this
.
entityName
)
+
"</td></tr>"
);
}
}
},
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/detail_page/DetailPageLayoutView.js
View file @
15baa4da
...
...
@@ -166,7 +166,7 @@ define(['require',
entity
:
collectionJSON
,
referredEntities
:
entityObject
.
referredEntities
,
guid
:
this
.
id
,
asset
Name
:
this
.
name
,
entity
Name
:
this
.
name
,
entityDefCollection
:
this
.
entityDefCollection
,
fetchCollection
:
this
.
fetchCollection
.
bind
(
that
)
}
...
...
@@ -176,7 +176,7 @@ define(['require',
this
.
renderTermTableLayoutView
(
_
.
extend
({},
obj
,
{
term
:
true
}));
this
.
renderLineageLayoutView
(
obj
);
// To render Schema check attribute "schemaElementsAttribute"
var
schemaOptions
=
this
.
entityDefCollection
.
find
({
name
:
collectionJSON
.
typeName
}).
get
(
'options'
);
var
schemaOptions
=
this
.
entityDefCollection
.
f
ullCollection
.
f
ind
({
name
:
collectionJSON
.
typeName
}).
get
(
'options'
);
if
(
schemaOptions
&&
schemaOptions
.
hasOwnProperty
(
'schemaElementsAttribute'
)
&&
schemaOptions
.
schemaElementsAttribute
!==
""
)
{
this
.
$
(
'.schemaTable'
).
show
();
this
.
renderSchemaLayoutView
(
_
.
extend
({},
obj
,
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/schema/SchemaLayoutView.js
View file @
15baa4da
...
...
@@ -144,7 +144,7 @@ define(['require',
onRender
:
function
()
{
var
that
=
this
;
_
.
each
(
this
.
attribute
,
function
(
obj
)
{
var
defObj
=
that
.
entityDefCollection
.
find
({
name
:
obj
.
typeName
});
var
defObj
=
that
.
entityDefCollection
.
f
ullCollection
.
f
ind
({
name
:
obj
.
typeName
});
if
(
defObj
&&
defObj
.
get
(
'options'
)
&&
defObj
.
get
(
'options'
).
schemaAttributes
)
{
try
{
var
mapObj
=
JSON
.
parse
(
defObj
.
get
(
'options'
).
schemaAttributes
);
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/tag/TagDetailTableLayoutView.js
View file @
15baa4da
...
...
@@ -60,7 +60,7 @@ define(['require',
* @constructs
*/
initialize
:
function
(
options
)
{
_
.
extend
(
this
,
_
.
pick
(
options
,
'entity'
,
'guid'
,
'term'
,
'
asset
Name'
));
_
.
extend
(
this
,
_
.
pick
(
options
,
'entity'
,
'guid'
,
'term'
,
'
entity
Name'
));
this
.
collectionObject
=
this
.
entity
;
this
.
tagTermCollection
=
new
VTagList
();
var
tagorterm
=
_
.
toArray
(
this
.
collectionObject
.
classifications
),
...
...
@@ -176,13 +176,13 @@ define(['require',
that
=
this
;
if
(
that
.
term
)
{
var
modal
=
CommonViewFunction
.
deleteTagModel
({
msg
:
"<div class='ellipsis'>Remove: "
+
"<b>"
+
_
.
escape
(
tagName
)
+
"</b> assignment from"
+
" "
+
"<b>"
+
this
.
asset
Name
+
"?</b></div>"
,
msg
:
"<div class='ellipsis'>Remove: "
+
"<b>"
+
_
.
escape
(
tagName
)
+
"</b> assignment from"
+
" "
+
"<b>"
+
this
.
entity
Name
+
"?</b></div>"
,
titleMessage
:
Messages
.
removeTerm
,
buttonText
:
"Remove"
,
});
}
else
{
var
modal
=
CommonViewFunction
.
deleteTagModel
({
msg
:
"<div class='ellipsis'>Remove: "
+
"<b>"
+
_
.
escape
(
tagName
)
+
"</b> assignment from"
+
" "
+
"<b>"
+
this
.
asset
Name
+
"?</b></div>"
,
msg
:
"<div class='ellipsis'>Remove: "
+
"<b>"
+
_
.
escape
(
tagName
)
+
"</b> assignment from"
+
" "
+
"<b>"
+
this
.
entity
Name
+
"?</b></div>"
,
titleMessage
:
Messages
.
removeTag
,
buttonText
:
"Remove"
,
});
...
...
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