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
79caa79a
Commit
79caa79a
authored
5 years ago
by
kevalbhatt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-3851: UI: removed hourglass icon from lineage graph legend #2
parent
5e8b7f34
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
42 deletions
+20
-42
Utils.js
dashboardv2/public/js/utils/Utils.js
+0
-14
CreateEntityLayoutView.js
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
+10
-7
Utils.js
dashboardv3/public/js/utils/Utils.js
+0
-14
CreateEntityLayoutView.js
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
+10
-7
No files found.
dashboardv2/public/js/utils/Utils.js
View file @
79caa79a
...
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
...
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
var
Utils
=
{};
var
Utils
=
{};
var
prevNetworkErrorTime
=
0
;
var
prevNetworkErrorTime
=
0
;
Utils
.
escapeHtml
=
function
(
string
)
{
var
entityMap
=
{
"&"
:
"&"
,
"<"
:
"<"
,
">"
:
">"
,
'"'
:
'"'
,
"'"
:
'''
,
"/"
:
'/'
};
return
String
(
string
).
replace
(
/
[
&<>"'
\/]
/g
,
function
(
s
)
{
return
entityMap
[
s
];
});
}
Utils
.
generatePopover
=
function
(
options
)
{
Utils
.
generatePopover
=
function
(
options
)
{
if
(
options
.
el
)
{
if
(
options
.
el
)
{
var
defaultObj
=
{
var
defaultObj
=
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv2/public/js/views/entity/CreateEntityLayoutView.js
View file @
79caa79a
...
@@ -499,7 +499,7 @@ define(['require',
...
@@ -499,7 +499,7 @@ define(['require',
entityLabel
=
this
.
capitalize
(
_
.
escape
(
value
.
name
));
entityLabel
=
this
.
capitalize
(
_
.
escape
(
value
.
name
));
return
'<div class=" row '
+
value
.
isOptional
+
'"><span class="col-sm-3">'
+
return
'<div class=" row '
+
value
.
isOptional
+
'"><span class="col-sm-3">'
+
'<label><span class="'
+
(
value
.
isOptional
?
'true'
:
'false required'
)
+
'">'
+
entityLabel
+
'</span><span class="center-block ellipsis-with-margin text-gray" title="Data Type : '
+
value
.
typeName
+
'">'
+
'('
+
Utils
.
escapeHtml
(
value
.
typeName
)
+
')'
+
'</span></label></span>'
+
'<label><span class="'
+
(
value
.
isOptional
?
'true'
:
'false required'
)
+
'">'
+
entityLabel
+
'</span><span class="center-block ellipsis-with-margin text-gray" title="Data Type : '
+
value
.
typeName
+
'">'
+
'('
+
_
.
escape
(
value
.
typeName
)
+
')'
+
'</span></label></span>'
+
'<span class="col-sm-9">'
+
(
this
.
getElement
(
object
))
+
'<span class="col-sm-9">'
+
(
this
.
getElement
(
object
))
+
'</input></span></div>'
;
'</input></span></div>'
;
},
},
...
@@ -513,6 +513,7 @@ define(['require',
...
@@ -513,6 +513,7 @@ define(['require',
},
},
getSelect
:
function
(
object
)
{
getSelect
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
;
isRelation
=
object
.
isRelation
;
...
@@ -521,7 +522,7 @@ define(['require',
...
@@ -521,7 +522,7 @@ define(['require',
'" data-type="'
+
value
.
typeName
+
'" data-type="'
+
value
.
typeName
+
'" data-attribute="'
+
isAttribute
+
'" data-attribute="'
+
isAttribute
+
'" data-relation="'
+
isRelation
+
'" data-relation="'
+
isRelation
+
'" data-key="'
+
value
.
name
+
'" data-key="'
+
name
+
'" data-id="entityInput">'
+
'" data-id="entityInput">'
+
'<option value="">--Select true or false--</option><option value="true">true</option>'
+
'<option value="">--Select true or false--</option><option value="true">true</option>'
+
'<option value="false">false</option></select>'
;
'<option value="false">false</option></select>'
;
...
@@ -536,13 +537,14 @@ define(['require',
...
@@ -536,13 +537,14 @@ define(['require',
'" data-type="'
+
value
.
typeName
+
'" data-type="'
+
value
.
typeName
+
'" data-attribute="'
+
isAttribute
+
'" data-attribute="'
+
isAttribute
+
'" data-relation="'
+
isRelation
+
'" data-relation="'
+
isRelation
+
'" data-key="'
+
value
.
name
+
'" data-key="'
+
name
+
'" data-id="entitySelectData" data-queryData="'
+
splitTypeName
+
'">'
+
(
this
.
guid
?
entityValue
:
""
)
+
'</select>'
;
'" data-id="entitySelectData" data-queryData="'
+
splitTypeName
+
'">'
+
(
this
.
guid
?
entityValue
:
""
)
+
'</select>'
;
}
}
},
},
getTextArea
:
function
(
object
)
{
getTextArea
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
setValue
=
_
.
escape
(
object
.
entityValue
),
setValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
,
isRelation
=
object
.
isRelation
,
...
@@ -558,25 +560,26 @@ define(['require',
...
@@ -558,25 +560,26 @@ define(['require',
return
'<textarea class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
return
'<textarea class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-key="'
+
value
.
name
+
'"'
+
' data-key="'
+
name
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' placeholder="'
+
value
.
name
+
'"'
+
' placeholder="'
+
name
+
'"'
+
' data-id="entityInput">'
+
setValue
+
'</textarea>'
;
' data-id="entityInput">'
+
setValue
+
'</textarea>'
;
},
},
getInput
:
function
(
object
)
{
getInput
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
;
isRelation
=
object
.
isRelation
;
return
'<input class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
return
'<input class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' value="'
+
entityValue
+
'"'
+
' value="'
+
entityValue
+
'"'
+
' data-key="'
+
value
.
name
+
'"'
+
' data-key="'
+
name
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' placeholder="'
+
value
.
name
+
'"'
+
' placeholder="'
+
name
+
'"'
+
' data-id="entityInput">'
;
' data-id="entityInput">'
;
},
},
getElement
:
function
(
object
)
{
getElement
:
function
(
object
)
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/utils/Utils.js
View file @
79caa79a
...
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
...
@@ -22,20 +22,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
var
Utils
=
{};
var
Utils
=
{};
var
prevNetworkErrorTime
=
0
;
var
prevNetworkErrorTime
=
0
;
Utils
.
escapeHtml
=
function
(
string
)
{
var
entityMap
=
{
"&"
:
"&"
,
"<"
:
"<"
,
">"
:
">"
,
'"'
:
'"'
,
"'"
:
'''
,
"/"
:
'/'
};
return
String
(
string
).
replace
(
/
[
&<>"'
\/]
/g
,
function
(
s
)
{
return
entityMap
[
s
];
});
}
Utils
.
generatePopover
=
function
(
options
)
{
Utils
.
generatePopover
=
function
(
options
)
{
if
(
options
.
el
)
{
if
(
options
.
el
)
{
var
defaultObj
=
{
var
defaultObj
=
{
...
...
This diff is collapsed.
Click to expand it.
dashboardv3/public/js/views/entity/CreateEntityLayoutView.js
View file @
79caa79a
...
@@ -502,7 +502,7 @@ define(['require',
...
@@ -502,7 +502,7 @@ define(['require',
entityLabel
=
this
.
capitalize
(
_
.
escape
(
value
.
name
));
entityLabel
=
this
.
capitalize
(
_
.
escape
(
value
.
name
));
return
'<div class=" row '
+
value
.
isOptional
+
'"><span class="col-sm-3">'
+
return
'<div class=" row '
+
value
.
isOptional
+
'"><span class="col-sm-3">'
+
'<label><span class="'
+
(
value
.
isOptional
?
'true'
:
'false required'
)
+
'">'
+
entityLabel
+
'</span><span class="center-block ellipsis-with-margin text-gray" title="Data Type : '
+
value
.
typeName
+
'">'
+
'('
+
Utils
.
escapeHtml
(
value
.
typeName
)
+
')'
+
'</span></label></span>'
+
'<label><span class="'
+
(
value
.
isOptional
?
'true'
:
'false required'
)
+
'">'
+
entityLabel
+
'</span><span class="center-block ellipsis-with-margin text-gray" title="Data Type : '
+
value
.
typeName
+
'">'
+
'('
+
_
.
escape
(
value
.
typeName
)
+
')'
+
'</span></label></span>'
+
'<span class="col-sm-9">'
+
(
this
.
getElement
(
object
))
+
'<span class="col-sm-9">'
+
(
this
.
getElement
(
object
))
+
'</input></span></div>'
;
'</input></span></div>'
;
},
},
...
@@ -516,6 +516,7 @@ define(['require',
...
@@ -516,6 +516,7 @@ define(['require',
},
},
getSelect
:
function
(
object
)
{
getSelect
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
;
isRelation
=
object
.
isRelation
;
...
@@ -524,7 +525,7 @@ define(['require',
...
@@ -524,7 +525,7 @@ define(['require',
'" data-type="'
+
value
.
typeName
+
'" data-type="'
+
value
.
typeName
+
'" data-attribute="'
+
isAttribute
+
'" data-attribute="'
+
isAttribute
+
'" data-relation="'
+
isRelation
+
'" data-relation="'
+
isRelation
+
'" data-key="'
+
value
.
name
+
'" data-key="'
+
name
+
'" data-id="entityInput">'
+
'" data-id="entityInput">'
+
'<option value="">--Select true or false--</option><option value="true">true</option>'
+
'<option value="">--Select true or false--</option><option value="true">true</option>'
+
'<option value="false">false</option></select>'
;
'<option value="false">false</option></select>'
;
...
@@ -539,13 +540,14 @@ define(['require',
...
@@ -539,13 +540,14 @@ define(['require',
'" data-type="'
+
value
.
typeName
+
'" data-type="'
+
value
.
typeName
+
'" data-attribute="'
+
isAttribute
+
'" data-attribute="'
+
isAttribute
+
'" data-relation="'
+
isRelation
+
'" data-relation="'
+
isRelation
+
'" data-key="'
+
value
.
name
+
'" data-key="'
+
name
+
'" data-id="entitySelectData" data-queryData="'
+
splitTypeName
+
'">'
+
(
this
.
guid
?
entityValue
:
""
)
+
'</select>'
;
'" data-id="entitySelectData" data-queryData="'
+
splitTypeName
+
'">'
+
(
this
.
guid
?
entityValue
:
""
)
+
'</select>'
;
}
}
},
},
getTextArea
:
function
(
object
)
{
getTextArea
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
setValue
=
_
.
escape
(
object
.
entityValue
),
setValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
,
isRelation
=
object
.
isRelation
,
...
@@ -561,25 +563,26 @@ define(['require',
...
@@ -561,25 +563,26 @@ define(['require',
return
'<textarea class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
return
'<textarea class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-key="'
+
value
.
name
+
'"'
+
' data-key="'
+
name
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' placeholder="'
+
value
.
name
+
'"'
+
' placeholder="'
+
name
+
'"'
+
' data-id="entityInput">'
+
setValue
+
'</textarea>'
;
' data-id="entityInput">'
+
setValue
+
'</textarea>'
;
},
},
getInput
:
function
(
object
)
{
getInput
:
function
(
object
)
{
var
value
=
object
.
value
,
var
value
=
object
.
value
,
name
=
_
.
escape
(
value
.
name
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
entityValue
=
_
.
escape
(
object
.
entityValue
),
isAttribute
=
object
.
isAttribute
,
isAttribute
=
object
.
isAttribute
,
isRelation
=
object
.
isRelation
;
isRelation
=
object
.
isRelation
;
return
'<input class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
return
'<input class="form-control entityInputBox '
+
(
value
.
isOptional
===
true
?
"false"
:
"true"
)
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' data-type="'
+
value
.
typeName
+
'"'
+
' value="'
+
entityValue
+
'"'
+
' value="'
+
entityValue
+
'"'
+
' data-key="'
+
value
.
name
+
'"'
+
' data-key="'
+
name
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-attribute="'
+
isAttribute
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' data-relation="'
+
isRelation
+
'"'
+
' placeholder="'
+
value
.
name
+
'"'
+
' placeholder="'
+
name
+
'"'
+
' data-id="entityInput">'
;
' data-id="entityInput">'
;
},
},
getElement
:
function
(
object
)
{
getElement
:
function
(
object
)
{
...
...
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