You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by kb...@apache.org on 2020/04/24 17:02:21 UTC
[atlas] 02/02: ATLAS-3721 : UI: Render attributes in filters of
admin audits using entity def
This is an automated email from the ASF dual-hosted git repository.
kbhatt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/atlas.git
commit 40fa099cc52eb7e5646be43986da5ed2b4d08a99
Author: kevalbhatt <kb...@apache.org>
AuthorDate: Fri Apr 24 19:36:15 2020 +0530
ATLAS-3721 : UI: Render attributes in filters of admin audits using entity def
---
dashboardv3/public/css/scss/old-style.scss | 78 --------------
dashboardv3/public/css/scss/override.scss | 8 +-
dashboardv3/public/css/scss/table.scss | 5 -
dashboardv3/public/css/scss/theme.scss | 58 ++---------
dashboardv3/public/index.html.tpl | 48 +--------
dashboardv3/public/js/router/Router.js | 3 -
.../AdministratorLayoutView_tmpl.html | 23 ++---
.../BusinessMetadataContainerLayoutView_tmpl.html | 2 +-
.../BusinessMetadataDetailLayoutView_tmpl.html | 2 +-
.../detail_page/DetailPageLayoutView_tmpl.html | 112 ++++++++++-----------
.../glossary/GlossaryContainerLayoutView_tmpl.html | 2 +-
.../glossary/GlossaryDetailLayoutView_tmpl.html | 40 ++++----
.../search/SearchConainerLayoutView_tmpl.html | 2 +-
.../tag/TagAttributeDetailLayoutView_tmpl.html | 2 +-
.../templates/tag/TagContainerLayoutView_tmpl.html | 2 +-
.../js/templates/tag/TagDetailLayoutView_tmpl.html | 4 +-
.../tag/TagDetailTableLayoutView_tmpl.html | 2 +-
dashboardv3/public/js/utils/Utils.js | 13 ---
.../views/administrator/AdministratorLayoutView.js | 4 +-
.../js/views/audit/AdminAuditTableLayoutView.js | 101 +++++++------------
.../CreateBusinessMetadataLayoutView.js | 2 +-
.../public/js/views/search/QueryBuilderView.js | 22 +++-
22 files changed, 160 insertions(+), 375 deletions(-)
diff --git a/dashboardv3/public/css/scss/old-style.scss b/dashboardv3/public/css/scss/old-style.scss
index 1c76ab2..c37b86a 100644
--- a/dashboardv3/public/css/scss/old-style.scss
+++ b/dashboardv3/public/css/scss/old-style.scss
@@ -61,84 +61,6 @@
margin-left: 15px;
}
-
-
-
-/* .switch {
- float: left;
- margin-top: 4px;
- position: absolute;
- z-index: 99;
- top: 0;
- left: 20px;
- height: 26px;
- width: 120px;
- background: $color_alto_approx;
- //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
- border-radius: 3px;
- //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
- box-shadow: inset 0 1px 3px $color_fuscous_gray_approx, 0 1px $white;
-} */
-
-
-/* .switch-label {
- position: relative;
- z-index: 2;
- float: left;
- width: 58px;
- line-height: 26px;
- font-size: 11px;
- text-align: center;
- cursor: pointer;
- &:active {
- font-weight: bold;
- }
-}
-
-.switch-label-off {
- padding-left: 2px;
-}
-
-.switch-label-on {
- padding-right: 2px;
-}
-
-.switch-input {
- display: none;
- &:checked + {
- &.switch-label {
- font-weight: bold;
- color: $black_65;
- //Instead of the line below you could use @include text-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
- text-shadow: 0 1px $white_25;
- //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
- transition: 0.15s ease-out;
- }
- &.switch-label-on ~ .switch-selection {
- left: 60px;
- }
- }
-}
-
-.switch-selection {
- display: block;
- position: absolute;
- z-index: 1;
- top: 2px;
- left: 2px;
- width: 58px;
- height: 22px;
- background: $color_fern_approx;
- //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
- border-radius: 3px;
- background-image: linear-gradient(to bottom, $color_opal_approx, $color_jungle_green_approx);
- background-image: linear-gradient(to bottom, $color_opal_approx, $color_jungle_green_approx);
- //Instead of the line below you could use @include box-shadow($shadow-1, $shadow-2, $shadow-3, $shadow-4, $shadow-5, $shadow-6, $shadow-7, $shadow-8, $shadow-9, $shadow-10)
- box-shadow: inset 0 1px $white_50, 0 0 2px $black_20;
- //Instead of the line below you could use @include transition($transition-1, $transition-2, $transition-3, $transition-4, $transition-5, $transition-6, $transition-7, $transition-8, $transition-9, $transition-10)
- transition: left 0.15s ease-out;
-} */
-
.scrollTagList {
height: 330px;
overflow-y: auto;
diff --git a/dashboardv3/public/css/scss/override.scss b/dashboardv3/public/css/scss/override.scss
index c375cd8..4d60217 100644
--- a/dashboardv3/public/css/scss/override.scss
+++ b/dashboardv3/public/css/scss/override.scss
@@ -247,13 +247,7 @@
.tab-content>.tab-pane.active {
overflow-x: hidden;
-}
-
-.admin-details {
- .tab-pane.active {
- min-height: 400px;
- }
-
+ overflow: initial;
}
.advancedInfo {
diff --git a/dashboardv3/public/css/scss/table.scss b/dashboardv3/public/css/scss/table.scss
index bed6eef..2ee30a2 100644
--- a/dashboardv3/public/css/scss/table.scss
+++ b/dashboardv3/public/css/scss/table.scss
@@ -36,11 +36,6 @@ tr.empty {
}
}
-.table-action-btn {
- right: 0px;
- top: -5px;
-}
-
.entity-detail-table,
.relationship-detail-table {
position: relative;
diff --git a/dashboardv3/public/css/scss/theme.scss b/dashboardv3/public/css/scss/theme.scss
index 7584df5..84552cb 100644
--- a/dashboardv3/public/css/scss/theme.scss
+++ b/dashboardv3/public/css/scss/theme.scss
@@ -38,27 +38,6 @@ body {
padding-top: 15px !important;
padding-bottom: 10px !important;
}
-
- // &:after {
- // content: "beta";
- // position: fixed;
- // width: 80px;
- // height: 25px;
- // background: #509ce7;
- // top: 5px;
- // left: -23px;
- // text-align: center;
- // font-size: 13px;
- // font-family: sans-serif;
- // text-transform: uppercase;
- // font-weight: bold;
- // color: #fff;
- // line-height: 27px;
- // -ms-transform: rotate(-45deg);
- // -webkit-transform: rotate(-40deg);
- // transform: rotate(-45deg);
- // z-index: 9;
- // }
}
.back-button {
@@ -66,8 +45,8 @@ body {
float: left;
position: absolute;
left: 4px;
- top: 32px;
- font-size: 47px;
+ top: 9px;
+ font-size: 38px;
color: #bfbfbf;
cursor: pointer;
@@ -244,27 +223,6 @@ header.atlas-header {
}
}
-// .sidebar-fixed-filter {
-// position: fixed;
-// overflow: scroll;
-// padding: 15px 15px 15px 5px;
-// width: auto;
-// left: 16px;
-// width: 340px;
-// top: 91px;
-// bottom: 0;
-// border-right: 1px solid #eeeaea;
-
-// .add-seperator {
-// border-bottom: 1px solid #eeeaea;
-// }
-// }
-
-.sidebar-fixed-left-container {
- width: calc(100% - 350px);
- margin-left: 350px;
-}
-
.main-search {
.form-control {
border: none;
@@ -301,8 +259,7 @@ header.atlas-header {
}
.page-title {
- //background-color: $color_white_lilac_approx;
- padding: 15px 15px 0px 15px;
+ padding: 0px 15px 0px 15px;
.title {
padding-top: 0;
@@ -469,12 +426,9 @@ hr[size="10"] {
}
}
-@media (min-width: 768px) {
- .col-sm-custom {
- //width: 92%;
- margin: 25px 25px 0px;
- position: relative;
- }
+.col-sm-custom {
+ margin: 15px 25px 0px;
+ position: relative;
}
.no-padding {
diff --git a/dashboardv3/public/index.html.tpl b/dashboardv3/public/index.html.tpl
index 07e5bd3..75eba8a 100644
--- a/dashboardv3/public/index.html.tpl
+++ b/dashboardv3/public/index.html.tpl
@@ -72,53 +72,7 @@
</head>
<body>
- <!-- <div id="wrapper">
- <div id="sidebar-wrapper" class="sidebar-wrapper">
- <div id="sideNav-wrapper"></div>
- </div>
- <div id="page-content-wrapper" class="page-content-wrapper">
- <header id="new-header" class="clearfix"></header>
- <div id="new-page-wrapper">
- <div>
- <div class="initialLoading"></div>
- </div>
- </div>
- </div>
- </div> -->
- <!-- <div id="wrapper">
- <div id="sidebar-wrapper" class="sidebar-wrapper">
- <div id="sideNav-wrapper"></div>
- </div>
- <div id="page-content-wrapper" class="page-content-wrapper">
-
- <div id="new-page-wrapper">
- <div>
- <div class="initialLoading"></div>
- </div>
- </div>
- </div>
- </div> -->
- <!-- <div class="container-fluid gray-bg">
- <div class="col-sm-12">
- <div id="new-page-wrapper">
- <div>
- <div class="initialLoading"></div>
- </div>
- </div>
- <div class="fix-filter">
- <div class="sideBar">
- <div class="header">
- <span>Filter</span>
- </div>
- <div class="body">
- <div id="sideNav-wrapper"></div>
- </div>
- </div>
- </div>
- </div>
- </div>
- -->
- <div class="">
+ <div>
<div id="header" class="clearfix"></div>
<div class="container-fluid view-container">
<div id="sidebar-wrapper" class="col-sm-3 no-padding"></div>
diff --git a/dashboardv3/public/js/router/Router.js b/dashboardv3/public/js/router/Router.js
index f2c1f1d..40b22dd 100644
--- a/dashboardv3/public/js/router/Router.js
+++ b/dashboardv3/public/js/router/Router.js
@@ -36,9 +36,6 @@ define([
"!/search/searchResult": function() {
this.renderDefaultSearchLayoutView({ fromSearchResultView: true });
},
- "!/search/customFilter": function() {
- this.renderDefaultSearchLayoutView({ fromCustomFilterView: true });
- },
// Tag
"!/tag": "renderTagLayoutView",
"!/tag/tagAttribute/(*name)": "renderTagLayoutView",
diff --git a/dashboardv3/public/js/templates/administrator/AdministratorLayoutView_tmpl.html b/dashboardv3/public/js/templates/administrator/AdministratorLayoutView_tmpl.html
index 70f96e1..be0d726 100644
--- a/dashboardv3/public/js/templates/administrator/AdministratorLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/administrator/AdministratorLayoutView_tmpl.html
@@ -15,9 +15,6 @@
* limitations under the License.
-->
<div class="clearfix">
- <!-- <div class="fontLoader">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div> -->
<div class="col-sm-12 default-tab">
<ul class="nav nav-tabs" data-id="tab-list">
<li role="businessMetadata" class="tab active"><a href="#tab-businessMetadata" aria-controls="tab-businessMetadata" role="tab" data-toggle="tab">Business Metadata</a></li>
@@ -26,19 +23,17 @@
</ul>
</div>
</div>
-<div>
- <div class="tab-content admin-details">
- <div id="tab-businessMetadata" role="businessMetadata" class="tab-pane active animated fadeIn">
- <div id="r_businessMetadataTableLayoutView">
- </div>
+<div class="tab-content admin-details">
+ <div id="tab-businessMetadata" role="businessMetadata" class="tab-pane active animated fadeIn">
+ <div id="r_businessMetadataTableLayoutView">
</div>
- <div id="tab-enum" role="enum" class="tab-pane animated fadeIn">
- <div id="r_enumTableLayoutView">
- </div>
+ </div>
+ <div id="tab-enum" role="enum" class="tab-pane animated fadeIn">
+ <div id="r_enumTableLayoutView">
</div>
- <div id="tab-audit" role="audit" class="tab-pane animated fadeIn">
- <div id="r_adminTableLayoutView">
- </div>
+ </div>
+ <div id="tab-audit" role="audit" class="tab-pane animated fadeIn">
+ <div id="r_adminTableLayoutView">
</div>
</div>
</div>
diff --git a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataContainerLayoutView_tmpl.html b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataContainerLayoutView_tmpl.html
index 72b5c2f..d964202 100644
--- a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataContainerLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataContainerLayoutView_tmpl.html
@@ -15,6 +15,6 @@
* limitations under the License.
-->
<div>
- <div id="r_businessMetadataDetailContainer" class="sidebar-fixed-filter"></div>
+ <div id="r_businessMetadataDetailContainer"></div>
<div id="r_businessMetadataAttrContainer" class="col-sm-12"></div>
</div>
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataDetailLayoutView_tmpl.html b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataDetailLayoutView_tmpl.html
index 84ab494..2ad5ba5 100644
--- a/dashboardv3/public/js/templates/business_metadata/BusinessMetadataDetailLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/business_metadata/BusinessMetadataDetailLayoutView_tmpl.html
@@ -18,7 +18,7 @@
<div class="fontLoader">
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
- <div class="back-button" title="Back to search page" style="top:15px">
+ <div class="back-button" title="Back to search page">
<i class="fa fa-angle-left" data-id="backButton"></i>
</div>
<div class="tagDetail clearfix form-horizontal col-sm-12">
diff --git a/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html b/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
index 0e838f5..1182a49 100644
--- a/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/detail_page/DetailPageLayoutView_tmpl.html
@@ -65,83 +65,81 @@
</div>
</div>
</div>
-<div>
- <div class="tab-content">
- <div id="tab-details" role="properties" class="tab-pane active animated fadeIn">
- <div class="row">
- <div class="col-md-6">
- <div id="r_entityDetailTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+<div class="tab-content">
+ <div id="tab-details" role="properties" class="tab-pane active animated fadeIn">
+ <div class="row">
+ <div class="col-md-6">
+ <div id="r_entityDetailTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div class="col-md-6 loader-row">
- <div id="r_entityUserDefineView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div class="col-md-6 loader-row">
+ <div id="r_entityUserDefineView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
- <div id="r_entityLabelDefineView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="r_entityLabelDefineView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
- <div id="r_entityBusinessMetadataView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="r_entityBusinessMetadataView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
</div>
</div>
- <div id="tab-lineage" role="lineage" class="tab-pane animated fadeIn">
- <div id="r_lineageLayoutView" class="animated position-relative" align="center">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-lineage" role="lineage" class="tab-pane animated fadeIn">
+ <div id="r_lineageLayoutView" class="animated position-relative" align="center">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-relationship" role="relationship" class="tab-pane animated fadeIn">
- <div id="r_relationshipLayoutView" class="animated position-relative">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-relationship" role="relationship" class="tab-pane animated fadeIn">
+ <div id="r_relationshipLayoutView" class="animated position-relative">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-tagTable" role="classification" class="tab-pane animated fadeIn">
- <div id="r_tagTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-tagTable" role="classification" class="tab-pane animated fadeIn">
+ <div id="r_tagTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-audit" role="audit" class="tab-pane animated fadeIn">
- <div id="r_auditTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-audit" role="audit" class="tab-pane animated fadeIn">
+ <div id="r_auditTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-raudit" role="raudits" class="tab-pane">
- <div id="r_replicationAuditTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-raudit" role="raudits" class="tab-pane">
+ <div id="r_replicationAuditTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-schema" role="schema" class="tab-pane animated fadeIn">
- <div id="r_schemaTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-schema" role="schema" class="tab-pane animated fadeIn">
+ <div id="r_schemaTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-profile" role="profile" class="tab-pane animated fadeIn">
- <div id="r_profileLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-profile" role="profile" class="tab-pane animated fadeIn">
+ <div id="r_profileLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
</div>
diff --git a/dashboardv3/public/js/templates/glossary/GlossaryContainerLayoutView_tmpl.html b/dashboardv3/public/js/templates/glossary/GlossaryContainerLayoutView_tmpl.html
index fd8715e..c7e97bd 100644
--- a/dashboardv3/public/js/templates/glossary/GlossaryContainerLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/glossary/GlossaryContainerLayoutView_tmpl.html
@@ -15,7 +15,7 @@
* limitations under the License.
-->
<div>
- <div id="r_glossaryLayoutView" class="sidebar-fixed-filter"></div>
+ <div id="r_glossaryLayoutView"></div>
<div id="r_glossaryDetailLayoutView">
<div class="fontLoader">
<i class="fa fa-refresh fa-spin-custom"></i>
diff --git a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
index d2d2649..89ec57a 100644
--- a/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/glossary/GlossaryDetailLayoutView_tmpl.html
@@ -18,7 +18,7 @@
<div class="fontLoader">
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
- <div class="back-button" title="Back to search page" style="top:15px">
+ <div class="back-button" title="Back to search page">
<i class="fa fa-angle-left" data-id="backButton"></i>
</div>
<div data-id="details" class="clearfix form-horizontal col-sm-12">
@@ -75,30 +75,28 @@
{{/if}}
</div>
</div>
-<div class="container-fluid">
- {{#if isTermView}}
- <div class="tab-content">
- <div id="tab-entities" role="entities" class="tab-pane active animated fadeIn">
- <div id="r_searchResultLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+{{#if isTermView}}
+<div class="tab-content">
+ <div id="tab-entities" role="entities" class="tab-pane active animated fadeIn">
+ <div id="r_searchResultLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-tagTable" role="classification" class="tab-pane animated fadeIn">
- <div id="r_tagTableLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-tagTable" role="classification" class="tab-pane animated fadeIn">
+ <div id="r_tagTableLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
- <div id="tab-relatedTerm" role="relatedTerm" class="tab-pane animated fadeIn">
- <div id="r_relationLayoutView">
- <div class="fontLoader-relative">
- <i class="fa fa-refresh fa-spin-custom"></i>
- </div>
+ </div>
+ <div id="tab-relatedTerm" role="relatedTerm" class="tab-pane animated fadeIn">
+ <div id="r_relationLayoutView">
+ <div class="fontLoader-relative">
+ <i class="fa fa-refresh fa-spin-custom"></i>
</div>
</div>
</div>
- {{/if}}
-</div>
\ No newline at end of file
+</div>
+{{/if}}
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/search/SearchConainerLayoutView_tmpl.html b/dashboardv3/public/js/templates/search/SearchConainerLayoutView_tmpl.html
index 2def516..53f3e5d 100644
--- a/dashboardv3/public/js/templates/search/SearchConainerLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/search/SearchConainerLayoutView_tmpl.html
@@ -15,6 +15,6 @@
* limitations under the License.
-->
<div>
- <div id="r_searchLayoutView" class="sidebar-fixed-filter"></div>
+ <div id="r_searchLayoutView"></div>
<div id="r_searchDetailLayoutView"></div>
</div>
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html b/dashboardv3/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
index 4aab7bb..c999fe1 100644
--- a/dashboardv3/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/TagAttributeDetailLayoutView_tmpl.html
@@ -18,7 +18,7 @@
<div class="fontLoader">
<i class="fa fa-refresh fa-spin-custom"></i>
</div>
- <div class="back-button" title="Back to search page" style="top:15px">
+ <div class="back-button" title="Back to search page">
<i class="fa fa-angle-left" data-id="backButton"></i>
</div>
<div class="tagDetail clearfix form-horizontal col-sm-12">
diff --git a/dashboardv3/public/js/templates/tag/TagContainerLayoutView_tmpl.html b/dashboardv3/public/js/templates/tag/TagContainerLayoutView_tmpl.html
index c5a4393..89ac21d 100644
--- a/dashboardv3/public/js/templates/tag/TagContainerLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/TagContainerLayoutView_tmpl.html
@@ -15,6 +15,6 @@
* limitations under the License.
-->
<div>
- <div id="r_tagLayoutView" class="sidebar-fixed-filter"></div>
+ <div id="r_tagLayoutView"></div>
<div id="r_tagDetailLayoutView"></div>
</div>
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/tag/TagDetailLayoutView_tmpl.html b/dashboardv3/public/js/templates/tag/TagDetailLayoutView_tmpl.html
index f04b85e..26b1ef8 100644
--- a/dashboardv3/public/js/templates/tag/TagDetailLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/TagDetailLayoutView_tmpl.html
@@ -18,9 +18,7 @@
<div class="container-fluid">
<div class="row">
<div class="col-sm-custom">
- <div class="atlast-tabbable">
- <div id="r_searchResultLayoutView"></div>
- </div>
+ <div id="r_searchResultLayoutView"></div>
</div>
</div>
</div>
\ No newline at end of file
diff --git a/dashboardv3/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html b/dashboardv3/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
index cfe74c2..b84a0d0 100644
--- a/dashboardv3/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
+++ b/dashboardv3/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html
@@ -16,7 +16,7 @@
-->
<div class="position-relative">
<div class="tableOverlay"></div>
- <div class="inline-content-fr table-action-btn">
+ <div class="inline-content-fr">
<div class="inline">
<label class="checkbox-inline btn">
<input type="checkbox" data-id="checkPropagtedTag" class="input" checked="true" name="queryType" value="text" name="check" value="1" /> Show Propagated Classifications</label>
diff --git a/dashboardv3/public/js/utils/Utils.js b/dashboardv3/public/js/utils/Utils.js
index ecc9ab3..28a0bfd 100644
--- a/dashboardv3/public/js/utils/Utils.js
+++ b/dashboardv3/public/js/utils/Utils.js
@@ -407,12 +407,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
matchString: "administrator"
});
},
- isCustomFilterTab: function(url) {
- return this.checkTabUrl({
- url: url,
- matchString: "search/customFilter"
- });
- },
isGlossaryTab: function(url) {
return this.checkTabUrl({
url: url,
@@ -425,12 +419,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
matchString: "detailPage"
});
},
- isPurgePage: function(url) {
- return this.checkTabUrl({
- url: url,
- matchString: "purge"
- });
- },
getLastValue: function() {
return this.getQueryUrl().lastValue;
},
@@ -932,7 +920,6 @@ define(['require', 'utils/Globals', 'pnotify', 'utils/Messages', 'utils/Enums',
} else {
tableEl.addClass('hide-empty-value');
}
-
}
$.fn.showButtonLoader = function() {
$(this).attr("disabled", "true").addClass('button-loader');
diff --git a/dashboardv3/public/js/views/administrator/AdministratorLayoutView.js b/dashboardv3/public/js/views/administrator/AdministratorLayoutView.js
index 49f4635..869371c 100644
--- a/dashboardv3/public/js/views/administrator/AdministratorLayoutView.js
+++ b/dashboardv3/public/js/views/administrator/AdministratorLayoutView.js
@@ -106,7 +106,9 @@ define(['require',
var that = this;
require(["views/audit/AdminAuditTableLayoutView"], function(AdminAuditTableLayoutView) {
var view = new AdminAuditTableLayoutView({
- searchTableFilters: that.searchTableFilters
+ searchTableFilters: that.searchTableFilters,
+ entityDefCollection: that.entityDefCollection,
+ enumDefCollection: that.enumDefCollection
});
that.RAdminTableLayoutView.show(view);
});
diff --git a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
index 456ceda..ba8a9f8 100644
--- a/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
+++ b/dashboardv3/public/js/views/audit/AdminAuditTableLayoutView.js
@@ -74,7 +74,7 @@ define(['require',
* @constructs
*/
initialize: function(options) {
- _.extend(this, _.pick(options, 'searchTableFilters'));
+ _.extend(this, _.pick(options, 'searchTableFilters', 'entityDefCollection', 'enumDefCollection'));
this.entityCollection = new VEntityList();
this.limit = 25;
this.entityCollection.url = UrlLinks.adminApiUrl();
@@ -106,49 +106,6 @@ define(['require',
paginatorOpts: {}
};
this.isFilters = null;
- this.adminAttrFilters = [{
- "id": "startTime",
- "label": "startTime (date)",
- "operators": [
- "=",
- "!=",
- ">",
- "<",
- ">=",
- "<="
- ],
- "plugin": "daterangepicker",
- "plugin_config": {
- "locale": {
- "format": "MM/DD/YYYY h:mm A"
- },
- "showDropdowns": true,
- "singleDatePicker": true,
- "timePicker": true
- },
- "type": "date"
- }, {
- "id": "endTime",
- "label": "endTime (date)",
- "operators": [
- "=",
- "!=",
- ">",
- "<",
- ">=",
- "<="
- ],
- "plugin": "daterangepicker",
- "plugin_config": {
- "locale": {
- "format": "MM/DD/YYYY h:mm A"
- },
- "showDropdowns": true,
- "singleDatePicker": true,
- "timePicker": true
- },
- "type": "date"
- }]
},
onRender: function() {
var str = '<option>All</option><option>Purged</option>';
@@ -167,28 +124,30 @@ define(['require',
that.$('.fa-angle-right').toggleClass('fa-angle-down');
that.$('.attribute-filter-container, .attr-filter-overlay').toggleClass('hide');
},
- getAttributes: function() {
- var adminAttributes = [{
- "attributeName": "userName",
- "operator": "like",
- "attributeValue": "admin"
- }];
- if (this.onlyPurged === true) {
- adminAttributes.push({
- "attributeName": "operation",
- "operator": "like",
- "attributeValue": "PURGE"
- })
- }
- if (this.isFilters) {
- _.each(this.isFilters, function(adminFilter) {
+ getAttributes: function(options) {
+ var adminAttributes = [];
+ if (options.isFilter) {
+ _.each(options.isFilter, function(adminFilter) {
adminAttributes.push({
"attributeName": adminFilter.id,
"operator": adminFilter.operator,
- "attributeValue": Date.parse(adminFilter.value).toString(),
+ "attributeValue": (adminFilter.type == "date" && options.isDateParsed) ? Date.parse(adminFilter.value).toString() : adminFilter.value
})
})
this.isFilters = null;
+ } else {
+ adminAttributes = [{
+ "attributeName": "userName",
+ "operator": "=",
+ "attributeValue": "admin"
+ }];
+ if (this.onlyPurged === true) {
+ adminAttributes.push({
+ "attributeName": "operation",
+ "operator": "=",
+ "attributeValue": "PURGE"
+ })
+ }
}
return adminAttributes;
},
@@ -196,7 +155,7 @@ define(['require',
var that = this;
this.ui.adminRegion.show();
require(['views/search/QueryBuilderView'], function(QueryBuilderView) {
- that.RQueryBuilderAdmin.show(new QueryBuilderView({ adminAttrFilters: that.adminAttrFilters, searchTableFilters: that.searchTableFilters }));
+ that.RQueryBuilderAdmin.show(new QueryBuilderView({ adminAttrFilters: true, searchTableFilters: that.searchTableFilters, entityDefCollection: that.entityDefCollection, enumDefCollection: that.enumDefCollection }));
});
},
okAttrFilterButton: function(options) {
@@ -207,7 +166,6 @@ define(['require',
var queryBuilder = queryBuilderRef.queryBuilder("getRules");
if (queryBuilder) {
that.isFilters = queryBuilder.rules;
- that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: queryBuilder, formatedDateToLong: true });
} else {
isFilterValidate = false
}
@@ -219,10 +177,20 @@ define(['require',
},
getAdminCollection: function() {
var that = this,
+ options = {
+ isDateParsed: true,
+ isFilter: this.isFilters
+ },
adminParam = {
condition: "AND",
- criterion: that.getAttributes()
+ criterion: that.getAttributes(options)
};
+ options.isDateParsed = false;
+ var auditQueryParam = {
+ condition: "AND",
+ criterion: that.getAttributes(options)
+ };
+ that.searchTableFilters["adminAttrFilters"] = CommonViewFunction.attributeFilter.generateUrl({ value: auditQueryParam, formatedDateToLong: true });
this.$('.fontLoader').show();
this.$('.tableOverlay').show();
$.extend(that.entityCollection.queryParams, { limit: this.limit, offset: 0, auditFilters: adminParam });
@@ -266,7 +234,7 @@ define(['require',
expand: function(el, model) {
var adminValues = '<div class="col-sm-6">',
newColumn = '';
- el.attr('colspan', '6');
+ el.attr('colspan', '7');
if (model.attributes.params) {
var guids = model.attributes.result.replace('[', '').replace(']', '').split(',');
_.each(guids, function(adminGuid, index) {
@@ -300,6 +268,11 @@ define(['require',
cell: "String",
editable: false
},
+ resultCount: {
+ label: "Result Count",
+ cell: "String",
+ editable: false
+ },
startTime: {
label: "Start Time",
cell: "html",
diff --git a/dashboardv3/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js b/dashboardv3/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
index 0399c36..761ef55 100644
--- a/dashboardv3/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
+++ b/dashboardv3/public/js/views/business_metadata/CreateBusinessMetadataLayoutView.js
@@ -292,7 +292,7 @@ define(['require',
data: this.json,
success: function(model, response) {
Utils.notifySuccess({
- content: "One or more Business Metadada attribute" + Messages.getAbbreviationMsg(false, 'editSuccessMessage')
+ content: "One or more Business Metadada attribute" + Messages.getAbbreviationMsg(true, 'editSuccessMessage')
});
if (model.businessMetadataDefs && model.businessMetadataDefs.length) {
that.selectedBusinessMetadata.set(model.businessMetadataDefs[0]);
diff --git a/dashboardv3/public/js/views/search/QueryBuilderView.js b/dashboardv3/public/js/views/search/QueryBuilderView.js
index 82677ea..4be24f2 100644
--- a/dashboardv3/public/js/views/search/QueryBuilderView.js
+++ b/dashboardv3/public/js/views/search/QueryBuilderView.js
@@ -65,6 +65,9 @@ define(['require',
}
if (type === "string") {
obj.operators = ['=', '!=', 'contains', 'begins_with', 'ends_with'];
+ if (this.adminAttrFilters) {
+ obj.operators = obj.operators.concat(['like', 'in']);
+ }
}
if (type === "date") {
obj.operators = ['>', '<'];
@@ -279,12 +282,13 @@ define(['require',
_.extend(obj, this.getOperator(obj.type));
return obj;
}
+
if (this.isPrimitive(obj.type)) {
if (obj.type === "boolean") {
obj['input'] = 'select';
obj['values'] = ['true', 'false'];
}
- _.extend(obj, this.getOperator(obj.type));
+ _.extend(obj, this.getOperator(obj.type, false));
if (_.has(Enums.regex.RANGE_CHECK, obj.type)) {
obj.validation = {
min: Enums.regex.RANGE_CHECK[obj.type].min,
@@ -318,7 +322,19 @@ define(['require',
placeHolder = '--Select Attribute--';
var rules_widgets = null;
if (this.adminAttrFilters) {
- filters = this.adminAttrFilters;
+ var entityDef = this.entityDefCollection.fullCollection.find({ name: "__AtlasAuditEntry" }),
+ auditEntryAttributeDefs = null;
+ if (entityDef) {
+ auditEntryAttributeDefs = $.extend(true, {}, entityDef.get("attributeDefs")) || null;
+ }
+ if (auditEntryAttributeDefs) {
+ _.each(auditEntryAttributeDefs, function(attributes) {
+ var returnObj = that.getObjDef(attributes, rules_widgets);
+ if (returnObj) {
+ filters.push(returnObj);
+ }
+ });
+ }
rules_widgets = CommonViewFunction.attributeFilter.extractUrl({ "value": this.searchTableFilters ? this.searchTableFilters["adminAttrFilters"] : null, "formatDate": true });;
} else {
if (this.value) {
@@ -427,6 +443,8 @@ define(['require',
{ type: '>=', nb_inputs: 1, multiple: false, apply_to: ['number', 'string', 'boolean'] },
{ type: '<=', nb_inputs: 1, multiple: false, apply_to: ['number', 'string', 'boolean'] },
{ type: 'contains', nb_inputs: 1, multiple: false, apply_to: ['string'] },
+ { type: 'like', nb_inputs: 1, multiple: false, apply_to: ['string'] },
+ { type: 'in', nb_inputs: 1, multiple: false, apply_to: ['string'] },
{ type: 'begins_with', nb_inputs: 1, multiple: false, apply_to: ['string'] },
{ type: 'ends_with', nb_inputs: 1, multiple: false, apply_to: ['string'] },
{ type: 'is_null', nb_inputs: false, multiple: false, apply_to: ['number', 'string', 'boolean', 'enum'] },