ATLAS-3576 : UI: Improve system attributes presentation

dashboardv2/public/css/scss/form.scss

@@ -429,7 +429,7 @@ button:focus {
     border-color: $color_mountain_mist_approx;
     color: $color_mountain_mist_approx;
     cursor: default;
-    margin: 5px 10px;
+    margin: 0px 10px;
 
     &:hover {
         border-color: $color_mountain_mist_approx;

dashboardv2/public/css/scss/glossary.scss

@@ -20,33 +20,41 @@
 
 .jstree-default-dark {
     background: transparent !important;
+
     .jstree-anchor {
         width: calc(100% - 50px);
         overflow: hidden;
         text-overflow: ellipsis;
     }
+
     .jstree-children.jstree-children>li>a {
         max-width: 500px;
     }
+
     .jstree-clicked,
     .jstree-wholerow-clicked {
         background: $color_jungle_green_approx !important;
     }
+
     .jstree-hovered {
         background: $color_star_dust_approx;
     }
+
     .jstree-anchor {
         color: #dbdbdb;
     }
+
     .jstree-search {
         color: #fbfece !important
     }
+
     li[role="treeitem"] {
         .jstree-wholerow-clicked {
             .tools {
                 display: inline-block;
             }
         }
+
         .tools {
             display: none;
             position: absolute;

dashboardv2/public/css/scss/loader.scss

@@ -79,6 +79,7 @@
     background: url("../img/ring.gif") no-repeat;
     background-position: 50% 50%;
     background-size: 60px;
+
     @media (min-width: 768px) {
         left: 350px;
     }

dashboardv2/public/css/scss/nav.scss

@@ -20,17 +20,21 @@
 .navbar-atlas {
     background-color: $color_tuna_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 0 0 $black_10, 0 1px 10px $black_10;
+
     .navbar-brand {
         color: $white;
     }
+
     .nav>li>a {
         color: $white;
         padding-top: 18px;
         padding-bottom: 18px;
         font-size: 100%;
+
         &:focus {
             background-color: transparent;
         }
+
         &:hover {
             background-color: transparent;
         }
@@ -54,6 +58,7 @@
 .navbar-form {
     width: 30%;
     padding: 0;
+
     .form-control {
         width: 100%;
         padding: 6px 0;
@@ -64,6 +69,6 @@
     }
 }
 
-.navbar-nav>li>a{
+.navbar-nav>li>a {
     padding: 15px 10px;
 }
\ No newline at end of file

dashboardv2/public/css/scss/old-style.scss

@@ -38,6 +38,7 @@
         //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
         border-radius: 0;
     }
+
     &:last-child {
         //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
         border-radius: 0;
@@ -142,6 +143,7 @@
     height: 330px;
     overflow-y: auto;
     margin-bottom: 0;
+
     i.fa {
         margin-right: 5px;
     }

dashboardv2/public/css/scss/override.scss

@@ -381,6 +381,7 @@ div.columnmanager-visibilitycontrol {
 div.columnmanager-dropdown-container {
     &.open {
         overflow: auto;
+        width: auto;
     }
 
     >li>span.column-label {

dashboardv2/public/css/scss/panel.scss

@@ -128,11 +128,13 @@
 
     .panel-title {
         font-weight: normal;
+
         a:hover {
             color: $color_jungle_green_approx;
             opacity: 0.7;
         }
     }
+
     .btn-group {
         margin-top: 4px;
     }
@@ -141,6 +143,7 @@
 .panel-default.custom-panel>.panel-actions {
     float: right;
     margin-top: 15px;
+
     button {
         margin-right: 10px;
         margin-top: -4px;
@@ -150,6 +153,7 @@
 .panel-default.custom-panel>.panel-collapse>.panel-body {
     border-top: none;
 }
-.panel-default.custom-panel>.panel-heading > .btn-group > button {
+
+.panel-default.custom-panel>.panel-heading>.btn-group>button {
     color: $color_jungle_green_approx;
 }
\ No newline at end of file

dashboardv2/public/css/scss/profile-table.scss

@@ -24,6 +24,7 @@
 
 .graphval {
     font-size: 15px;
+
     .value-loader {
         top: 10px;
     }
@@ -48,9 +49,11 @@ svg.dateType .nv-bar {
 
 .progress.cstm_progress {
     margin-bottom: 0px;
+
     .progress-bar-success.cstm_success-bar {
         background-color: $color_jungle_green_approx;
     }
+
     .progress-bar-success.cstm_success-bar:hover {
         background-color: $color_puerto_rico_approx;
     }

dashboardv2/public/css/scss/search.scss

@@ -228,10 +228,18 @@ hr.hr-filter {
 
 
 
-.searchTable{
-    &.noData{
-        .labelShowRecord,.inline[data-id="colManager"],.row.searach-result-pagination,table thead{
+.searchTable {
+    &.noData {
+
+        .labelShowRecord,
+        .inline[data-id="colManager"],
+        .row.searach-result-pagination,
+        table thead {
             display: none !important;
         }
     }
 }
+
+.filter-btn-wrapper {
+    padding-left: 0;
+}
\ No newline at end of file

dashboardv2/public/css/scss/tab.scss

@@ -19,8 +19,10 @@
 
 .atlast-tabbable {
     margin: 25px 0;
+
     .nav-tabs {
         border-bottom: 1px solid $color_mystic_approx;
+
         >li {
             >a {
                 padding: 15px 30px;
@@ -28,13 +30,16 @@
                 letter-spacing: 1px; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
                 border-radius: 2px 2px 0 0;
             }
+
             &.active>a {
                 border: 1px solid $color_mystic_approx;
                 border-bottom-color: transparent;
+
                 &:focus {
                     border: 1px solid $color_mystic_approx;
                     border-bottom-color: transparent;
                 }
+
                 &:hover {
                     border: 1px solid $color_mystic_approx;
                     border-bottom-color: transparent;
@@ -42,6 +47,7 @@
             }
         }
     }
+
     .tab-content {
         background-color: $white;
         padding: 35px;
@@ -60,6 +66,7 @@ ul.tabs li.tab {
     height: 0;
     padding: 0px;
     overflow: hidden;
+
     &.active {
         padding: 25px;
         opacity: 1;
@@ -70,9 +77,11 @@ ul.tabs li.tab {
 
 .tagsList .atlast-tabbable {
     margin: 0;
+
     .tab-content {
         padding: 10px 22px;
     }
+
     .nav-tabs>li>a {
         padding: 10px 20px;
     }
@@ -86,6 +95,7 @@ ul.tabs li.tab {
     white-space: nowrap;
     padding: 0;
     transition: color 0.28s ease;
+
     .indicator {
         position: absolute;
         bottom: 0;
@@ -93,6 +103,7 @@ ul.tabs li.tab {
         background-color: $color_keppel_approx;
         will-change: left, right;
     }
+
     li.tab {
         display: block;
         float: left;
@@ -104,6 +115,7 @@ ul.tabs li.tab {
         text-transform: uppercase;
         letter-spacing: 0.8px;
         border-bottom: 1px solid $color_mirage_approx;
+
         a {
             font-size: 14px;
             font-weight: 600;
@@ -130,8 +142,10 @@ ul.tabs li.tab {
 
 .atlast-tabbable {
     margin: 25px 0;
+
     .nav-tabs {
         border-bottom: 1px solid $color_mystic_approx;
+
         >li {
             >a {
                 padding: 15px 30px;
@@ -139,13 +153,16 @@ ul.tabs li.tab {
                 letter-spacing: 1px; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
                 border-radius: 2px 2px 0 0;
             }
+
             &.active>a {
                 border: 1px solid $color_mystic_approx;
                 border-bottom-color: transparent;
+
                 &:focus {
                     border: 1px solid $color_mystic_approx;
                     border-bottom-color: transparent;
                 }
+
                 &:hover {
                     border: 1px solid $color_mystic_approx;
                     border-bottom-color: transparent;
@@ -153,6 +170,7 @@ ul.tabs li.tab {
             }
         }
     }
+
     .tab-content {
         background-color: $white;
         padding: 35px;
@@ -169,6 +187,7 @@ ul.tabs li.tab {
                     color: $color_jungle_green_approx;
                 }
             }
+
             >a {
                 color: $black;
             }

dashboardv2/public/css/scss/wizard.scss

@@ -25,7 +25,7 @@ $color_falu_red_approx: #8a1f11;
 }
 
 %extend_2 {
-    list-style: none!important;
+    list-style: none !important;
     padding: 0;
     margin: 0;
 }
@@ -67,28 +67,35 @@ $color_falu_red_approx: #8a1f11;
 
 .wizard {
     @extend %wizard_tabcontrol;
+
     a {
         outline: 0;
     }
+
     ul {
         @extend %extend_2;
+
         >li {
             display: block;
             padding: 0;
         }
     }
+
     > {
         .steps {
             position: relative;
             display: block;
             width: 100%;
+
             .current-info {
                 position: absolute;
                 left: -999em;
             }
+
             .number {
                 font-size: 1.429em;
             }
+
             &>ul {
                 position: relative;
                 border: 0;
@@ -98,52 +105,66 @@ $color_falu_red_approx: #8a1f11;
                 list-style: none;
                 overflow: hidden;
                 margin-bottom: 10px;
+
                 >li {
                     width: 25%;
                     float: left;
+
                     &:first-child>a {
                         padding-left: 15px;
                     }
+
                     a {
                         @extend %extend_3;
+
                         &:hover {
                             cursor: pointer;
                         }
+
                         margin: 0;
                         border: none;
                         border-radius: 0;
                         padding: 10px 0 10px 45px;
+
                         &:before {
                             @extend %extend_befor_after;
                             border-left: 30px solid #ddd;
                             margin-left: 1px;
                             z-index: 1;
                         }
+
                         &:after {
                             @extend %extend_befor_after;
                             border-left: 30px solid #f5f5f5;
                             z-index: 2;
                         }
                     }
+
                     &.disabled a {
                         @extend %extend_4;
                     }
+
                     &.current a {
                         @extend %extend_5;
+
                         &:after {
                             border-left: 30px solid $color_keppel_approx;
                         }
                     }
+
                     &.done a {
                         background: #b4e5d9;
                         color: $white;
+
                         &:after {
                             border-left: 30px solid #b4e5d9;
                         }
                     }
+
                     &.error a {
                         background: $color_scarlet_approx;
                         color: $white;
+
                         &:after {
                             border-left: 30px solid $color_scarlet_approx;
                         }
@@ -151,6 +172,7 @@ $color_falu_red_approx: #8a1f11;
                 }
             }
         }
+
         .content {
             background: #f5f5f5;
             display: block;
@@ -158,17 +180,21 @@ $color_falu_red_approx: #8a1f11;
             position: relative;
             width: 100%; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
             border-radius: 5px;
+
             > {
                 .title {
                     display: none;
                 }
+
                 .body {
                     float: left;
                     width: 100%;
                     height: 95%;
                     padding: 2.5%;
+
                     >ul {
-                        list-style: disc!important;
+                        list-style: disc !important;
+
                         >li {
                             display: list-item;
                         }
@@ -176,20 +202,24 @@ $color_falu_red_approx: #8a1f11;
                 }
             }
         }
+
         .actions {
             position: relative;
             display: block;
             text-align: right;
             width: 100%;
+
             ul[role="menu"] {
                 li+li {
                     margin-left: 5px;
                 }
+
                 li.disabled {
                     a {
                         opacity: .65;
                     }
                 }
+
                 a {
                     padding: 10px 20px;
                     background-color: $color_keppel_approx;
@@ -200,6 +230,7 @@ $color_falu_red_approx: #8a1f11;
                     transition: all .3s ease;
                     margin: 2px;
                 }
+
                 a[href="#cancel"] {
                     padding: 10px 20px;
                     background-color: transparent;
@@ -211,38 +242,46 @@ $color_falu_red_approx: #8a1f11;
                     margin: 2px;
                 }
             }
+
             >ul {
                 display: inline-block;
                 text-align: right;
+
                 >li {
                     float: left;
                     margin: 0 .5em;
                 }
             }
         }
+
         .loading .spinner {}
     }
+
     &.vertical> {
         .steps {
             display: inline;
             float: left;
             width: 30%;
+
             >ul>li {
                 float: none;
                 width: 100%;
             }
         }
+
         .content {
             display: inline;
             float: left;
             margin: 0 2.5% .5em 2.5%;
             width: 65%;
         }
+
         .actions {
             display: inline;
             float: right;
             margin: 0 2.5%;
             width: 95%;
+
             >ul>li {
                 margin: 0 0 0 1em;
             }
@@ -252,21 +291,26 @@ $color_falu_red_approx: #8a1f11;
 
 .tabcontrol {
     @extend %wizard_tabcontrol;
+
     a {
         outline: 0;
     }
+
     ul {
         @extend %extend_2;
+
         >li {
             display: block;
             padding: 0;
         }
     }
+
     > {
         .steps .current-info {
             position: absolute;
             left: -999em;
         }
+
         .content>.title {
             display: none;
         }
@@ -278,28 +322,34 @@ $color_falu_red_approx: #8a1f11;
         >.steps {
             a {
                 margin-top: .5em;
+
                 &:hover {
                     margin-top: .5em;
                 }
+
                 &:active {
                     margin-top: .5em;
                 }
             }
+
             >ul>li {
                 width: 50%;
             }
         }
+
         &.vertical> {
             .steps {
                 display: block;
                 float: none;
                 width: 100%;
             }
+
             .actions {
                 display: block;
                 float: none;
                 width: 100%;
             }
+
             .content {
                 display: block;
                 float: none;
@@ -321,15 +371,18 @@ $color_falu_red_approx: #8a1f11;
         overflow: hidden;
         max-height: none;
     }
+
     .wizard {
         position: relative;
         width: 100%;
         height: 100%;
+
         .content {
             max-height: 400px;
             overflow: auto;
             margin: 0px 0px 15px 0px;
         }
+
         .actions {
             >ul>li {
                 margin: 0px;

dashboardv2/public/js/models/VSearch.js

@@ -41,7 +41,7 @@ define(['require',
          * Non - CRUD operations
          *************************/
         getEntity: function(id, options) {
-            var url = UrlLinks.entitiesApiUrl({guid: id});
+            var url = UrlLinks.entitiesApiUrl({ guid: id });
 
             options = _.extend({
                 contentType: 'application/json',

dashboardv2/public/js/templates/entity/EntityDetailTableLayoutView_tmpl.html

@@ -26,7 +26,7 @@
         </div>
         <div class="panel-actions">
             <div class="pretty p-switch p-fill" style="margin-right: 20px">
-                <input type="checkbox" data-id="noValueToggle" title="Show Empty Values"/>
+                <input type="checkbox" data-id="noValueToggle" title="Show Empty Values" />
                 <div class="state p-primary">
                     <label></label>
                 </div>

dashboardv2/public/js/templates/entity/EntityUserDefineItemView_tmpl.html

@@ -14,20 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
 -->
-
-
 <table class="custom-table">
     {{#each items}}
     <tr class="custom-tr">
         <td class="custom-col-1">
             <input placeholder="key" type="text" data-type="key" data-index={{@index}} class="form-control" value={{key}}></input>
             <p class="errorMsg"></p>
-            </td >
-            <td  class="custom-col-0"> : </td >
+        </td>
+        <td class="custom-col-0"> : </td>
         <td class="custom-col-1">
             <textarea placeholder="value" data-type="value" data-index={{@index}} class="form-control" class="form-control">{{value}}</textarea>
             <p class="errorMsg"></p>
-            </td >
+        </td>
         <td class="custom-col-2">
             <button class="btn btn-default btn-sm" title="" data-index={{@index}} data-id="deleteItem">
                 <i class="fa fa-minus"> </i>
@@ -35,7 +33,7 @@
             <button class="btn btn-default btn-sm" title="" data-index={{@index}} data-id="addItem">
                 <i class="fa fa-plus"> </i>
             </button>
-            </td >
+        </td>
     </tr>
     {{/each}}
     <tr>

dashboardv2/public/js/templates/entity/EntityUserDefineView_tmpl.html

@@ -15,7 +15,6 @@
  * limitations under the License.
 -->
 <div class="panel-group" id="accordion">
-
     <div class="panel panel-default custom-panel expand_collapse_panel-icon" data-id="userDefine">
         {{#ifCond customAttibutes.length "===" 0}}
         <div class="panel-heading collapsed" data-toggle="collapse" href={{divId_1.anchor}} aria-expanded="false" style="width: 70%">
@@ -35,9 +34,7 @@
                 <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
             </div>
         </div>
-
         {{/ifCond}}
-
         {{#ifCond readOnlyEntity "===" false}}
         <div class="panel-actions">
             {{#ifCond swapItem "!==" true}}
@@ -50,7 +47,6 @@
             {{/ifCond}}
         </div>
         {{/ifCond}}
-
         <div id={{divId_1.id}} {{#ifCond swapItem "===" false}} class="panel-collapse collapse" {{else}} class="panel-collapse collapse in" {{/ifCond}}>
             {{#ifCond customAttibutes.length "===" 0}}
             <div class="panel-body">
@@ -65,7 +61,9 @@
                                     {{#each customAttibutes}}
                                     <tr>
                                         <td>
-                                                            <div class="scroll-y">{{key}}</div>                                              </div></td>
+                                            <div class="scroll-y">{{key}}</div>
+                        </div>
+                        </td>
                         <td>
                             <div class="scroll-y">{{value}}</div>
                         </td>
@@ -80,9 +78,8 @@
         </div>
         {{/ifCond}}
     </div>
-
     {{#ifCond customAttibutes.length ">" 0}}
-                <div id={{divId_2.id}} class="panel-collapse collapse in" >
+    <div id={{divId_2.id}} class="panel-collapse collapse in">
         <div class="panel-body">
             <div class="row">
                 <div class="col-md-12">
@@ -95,7 +92,9 @@
                                 {{#each customAttibutes}}
                                 <tr>
                                     <td>
-                                                            <div class="scroll-y">{{key}}</div>                                              </div></td>
+                                        <div class="scroll-y">{{key}}</div>
+                    </div>
+                    </td>
                     <td>
                         <div class="scroll-y">{{value}}</div>
                     </td>
@@ -108,8 +107,7 @@
             </div>
         </div>
     </div>
-                </div>
-            {{/ifCond}}
-
-        </div>
-    </div>
+</div>
+{{/ifCond}}
+</div>
+</div>
\ No newline at end of file

dashboardv2/public/js/templates/glossary/CreateEditCategoryTermLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" data-id="name" name="name" value="{{modelJSON.name}}" placeholder="Name(required)" autofocus/>
+            <input class="form-control" data-id="name" name="name" value="{{modelJSON.name}}" placeholder="Name(required)" autofocus />
         </div>
     </div>
     <div class="form-group">

dashboardv2/public/js/templates/glossary/CreateEditGlossaryLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" name="name" value="{{name}}" data-id="name" placeholder="Name(required)" autofocus/>
+            <input class="form-control" name="name" value="{{name}}" data-id="name" placeholder="Name(required)" autofocus />
         </div>
     </div>
     <div class="form-group">

dashboardv2/public/js/templates/glossary/TermRelationAttributeTable_tmpl.html

@@ -47,7 +47,7 @@
                                 <td>{{@key}}</td>
                                 {{#if ../../editMode}}
                                 <td>
-                                    <input data-id="attributeUpdate" class="form-control" type="text" data-name="{{@key}}" data-termguid="{{../../this.termGuid}}" " value="{{lookup ../../this @key ''}} ">
+                                    <input data-id="attributeUpdate" class="form-control" type="text" data-name="{{@key}}" data-termguid="{{../../this.termGuid}}" " value=" {{lookup ../../this @key ''}} ">
                                 </td>{{else}}
                                 <td>{{lookup ../../this @key "- "}}</td>
                                 {{/if}}
@@ -59,8 +59,8 @@
             </td>
         </tr>
         {{/each}}{{else}}
-        <tr class="empty text-center ">
-            <td colspan="3 "><span>No records found!</span></td>
+        <tr class=" empty text-center ">
+            <td colspan=" 3 "><span>No records found!</span></td>
         </tr>{{/if}} {{/if}}
     </tbody>
 </table>
\ No newline at end of file

dashboardv2/public/js/templates/profile/ProfileColumnLayoutView_tmpl.html

@@ -18,19 +18,25 @@
     <div class="">
         <div class="col-sm-3 rowValue">
             <div><span class="graphkey">Rows</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_created">
             <div><span class="graphkey">Date Created</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-6 table_name">
             <div><span class="graphkey">Table</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
     </div>
 </div>
-<hr/>
+<hr />
 <div class="row">
     <h4 class="col-sm-12">{{typeObject.label}}</h4>
 </div>
@@ -49,37 +55,37 @@
                 <div><span class="graphkey">Cardinality</span></div>
                 <div title="{{profileData.cardinality}}"><span class="graphval text-right"><b>{{profileData.cardinality}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">% NonNull</span></div>
                 <div title="{{profileData.nonNullData}}%"><span class="graphval text-right"><b>{{profileData.nonNullData}}%</b></span></div>
             </div>
-            <hr/> {{#ifCond typeObject.type "==" "string"}}
+            <hr /> {{#ifCond typeObject.type "==" "string"}}
             <div class="">
                 <div><span class="graphkey">Average Length</span></div>
                 <div title="{{profileData.averageLength}}"><span class="graphval text-right"><b>{{profileData.averageLength}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Max Length</span></div>
                 <div title="{{profileData.maxLength}}"><span class="graphval text-right"><b>{{profileData.maxLength}}</b></span></div>
             </div>
-            <hr/> {{/ifCond}} {{#ifCond typeObject.type "==" "numeric"}}
+            <hr /> {{/ifCond}} {{#ifCond typeObject.type "==" "numeric"}}
             <div class="">
                 <div><span class="graphkey">Min</span></div>
                 <div title="{{profileData.minValue}}"><span class="graphval text-right"><b>{{profileData.minValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Max</span></div>
                 <div title="{{profileData.maxValue}}"><span class="graphval text-right"><b>{{profileData.maxValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Mean</span></div>
                 <div title="{{profileData.meanValue}}"><span class="graphval text-right"><b>{{profileData.meanValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Median</span></div>
                 <div title="{{profileData.medianValue}}"><span class="graphval text-right"><b>{{profileData.medianValue}}</b></span></div>

dashboardv2/public/js/templates/profile/ProfileTableLayoutView_tmpl.html

@@ -18,23 +18,31 @@
     <div class="">
         <div class="col-sm-3 rowValue">
             <div><span class="graphkey">Rows</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_created">
             <div><span class="graphkey">Date Created</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_name">
             <div><span class="graphkey">Table</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 db_name">
             <div><span class="graphkey">DB</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
     </div>
 </div>
-<hr/>
+<hr />
 <div class="">
     <div id="r_profileTableLayoutView"></div>
 </div>
\ No newline at end of file

dashboardv2/public/js/templates/search/SearchLayoutView_tmpl.html

@@ -26,8 +26,8 @@
                 <span class="pull-left">Advanced</span>
                 <span class="advancedInfo" data-id="advancedInfo"><i class="fa fa-question-circle-o"></i></span>
             </div>
-            <div class="col-sm-3">
-                <button type="button" class="btn btn-action btn-md pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button>
+            <div class="col-sm-3 filter-btn-wrapper">
+                <button type="button" class="btn btn-action btn-sm pull-right typeLOV" title="Refresh" data-id="refreshBtn"><i class="fa fa-refresh"></i></button>
             </div>
         </div>
     </div>

dashboardv2/public/js/templates/search/save/SaveModalLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 required" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" data-id="saveAsName" placeholder="Name(required)" value="{{selectedModel.name}}" autofocus/>
+            <input class="form-control" data-id="saveAsName" placeholder="Name(required)" value="{{selectedModel.name}}" autofocus />
         </div>
     </div>
 </form>
\ No newline at end of file

dashboardv2/public/js/templates/tag/AddTagModalView_tmpl.html

@@ -19,7 +19,8 @@
         <div class="row modalHeight">
             <div class="form-group col-md-12">
                 {{#if tagModel}}
-                <h4>{{tagModel.typeName}}</h4> </div>{{else}}
+                <h4>{{tagModel.typeName}}</h4>
+            </div>{{else}}
             <select class="form-control row-margin-bottom" data-id="addTagOptions" required>
             </select>
         </div>
@@ -32,7 +33,7 @@
                 </div>
                 <div class="inline" data-id="removePropagationOnEntityDeleteBox">
                     <label class="checkbox-inline btn">
-                        <input type="checkbox" data-id="removePropagationOnEntityDelete" class="input" title="Propagated classification are removed during entity delete"/> Remove propagation on entity delete</label>
+                        <input type="checkbox" data-id="removePropagationOnEntityDelete" class="input" title="Propagated classification are removed during entity delete" /> Remove propagation on entity delete</label>
                 </div>
             </div>
         </div>

dashboardv2/public/js/templates/tag/CreateTagLayoutView_tmpl.html

@@ -22,7 +22,7 @@
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         {{#if create}}
         <div class="col-sm-10">
-            <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus/>
+            <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus />
         </div>
         {{else}}
         <span class="ellipsis-with-margin control-label text-left col-sm-10" data-id="title"></span> {{/if}}

dashboardv2/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html

@@ -17,7 +17,7 @@
 <div class="position-relative">
     <div class="tableOverlay"></div>
     <div class="inline-content-fr table-action-btn">
-        <div class="inline" >
+        <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>
         </div>

dashboardv2/public/js/utils/CommonViewFunction.js

@@ -382,7 +382,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 if (_.has(obj, 'condition')) {
                     return '&nbsp<span class="operator">' + obj.condition + '</span>&nbsp' + '(' + objToString(obj) + ')';
                 } else {
-                    return '<span class="key">' + _.escape(obj.id) + '</span>&nbsp<span class="operator">' + _.escape(obj.operator) + '</span>&nbsp<span class="value">' + _.escape(obj.value) + "</span>";
+                    return '<span class="key">' + (Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] : _.escape(obj.id)) + '</span>&nbsp<span class="operator">' + _.escape(obj.operator) + '</span>&nbsp<span class="value">' + (Enums[obj.id] ? Enums[obj.id][obj.value] : _.escape(obj.value)) + "</span>";
                 }
             });
             return generatedQuery;
@@ -467,7 +467,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 val = val.join(',');
                             } else if (k == "tagFilters") {
                                 if (classificationDefCollection) {
-                                    var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value[skey].classification }), attributeDefs = [];
+                                    var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value[skey].classification }),
+                                        attributeDefs = [];
                                     if (classificationDef) {
                                         Utils.getNestedSuperTypeObj({
                                             collection: classificationDefCollection,
@@ -482,7 +483,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 val = CommonViewFunction.attributeFilter.generateUrl({ "value": val, "attributeDefs": attributeDefs });
                             } else if (k == "entityFilters") {
                                 if (entityDefCollection) {
-                                    var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value[skey].typeName }), attributeDefs = [];
+                                    var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value[skey].typeName }),
+                                        attributeDefs = [];
                                     if (entityDef) {
                                         Utils.getNestedSuperTypeObj({
                                             collection: entityDefCollection,
@@ -961,7 +963,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
         });
         return list.join(',');
     }
-    CommonViewFunction.fetchRootEntityAttributes = function (options) {
+    CommonViewFunction.fetchRootEntityAttributes = function(options) {
             $.ajax({
                 url: options.url,
                 methods: 'GET',
@@ -981,7 +983,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 }
             });
         },
-    CommonViewFunction.fetchRootClassificationAttributes = function (options) {
+        CommonViewFunction.fetchRootClassificationAttributes = function(options) {
             $.ajax({
                 url: options.url,
                 methods: 'GET',

dashboardv2/public/js/utils/Enums.js

@@ -37,7 +37,7 @@ define(['require'], function(require) {
         TERM_ADD: "Term Added",
         TERM_DELETE: "Term Deleted",
         LABEL_ADD: "Label(s) Added",
-        LABEL_DELETE:"Label(s) Deleted"
+        LABEL_DELETE: "Label(s) Deleted"
     }
 
     Enums.entityStateReadOnly = {
@@ -192,5 +192,23 @@ define(['require'], function(require) {
             "failedMessageCount": "number"
         }
     };
+    Enums.systemAttributes = {
+        "__classificationNames": "Classification(s)",
+        "__createdBy": "Created By",
+        "__customAttributes": "User-defined attributes",
+        "__guid": "Guid",
+        "__isIncomplete": "IsIncomplete",
+        "__labels": "Label(s)",
+        "__modificationTimestamp": "Last Modified Timestamp",
+        "__modifiedBy": "Last Modified User",
+        "__propagatedClassificationNames": "Propagated Classification(s)",
+        "__state": "Status",
+        "__timestamp": "Created Timestamp",
+        "__typeName": "Type Name"
+    };
+    Enums.__isIncomplete = {
+        0: "false",
+        1: "true"
+    };
     return Enums;
 });
\ No newline at end of file

dashboardv2/public/js/utils/Overrides.js

@@ -206,7 +206,7 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
     var HeaderDecodeCell = Backgrid.HeaderHTMLDecodeCell = Backgrid.HeaderCell.extend({
         initialize: function(options) {
             Backgrid.HeaderCell.prototype.initialize.apply(this, arguments);
-            this.name = _.unescape(this.column.get("name"))
+            this.name = _.unescape(this.column.get("label"))
             // Add class
             this.$el.addClass(this.name);
         },

dashboardv2/public/js/utils/UrlLinks.js

@@ -40,7 +40,7 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require
         enumDefApiUrl: function(name) {
             return this.getDefApiUrl('enum', name);
         },
-        metricsApiUrl: function(){
+        metricsApiUrl: function() {
             return this.baseUrl + '/admin/metrics'
         },
         rootEntityDefUrl: function(name) {
@@ -50,7 +50,8 @@ define(['require', 'utils/Enums', 'utils/Utils', 'underscore'], function(require
             return this.baseUrlV2 + '/types/classificationdef/name/' + name;
         },
         getDefApiUrl: function(type, name) {
-            var defApiUrl = this.typedefsUrl(), defUrl;
+            var defApiUrl = this.typedefsUrl(),
+                defUrl;
             if (name) {
                 defUrl = defApiUrl.def + '/name/' + name;
             } else {

dashboardv2/public/js/views/entity/EntityLabelDefineView.js

@@ -87,7 +87,7 @@ define(['require',
                         }
                     });
                 } else {
-                    return []
+                    return [];
                 }
             };
             this.ui.addLabelOptions.select2({

dashboardv2/public/js/views/entity/EntityUserDefineItemView.js

@@ -60,16 +60,15 @@ define(['require',
          */
         initialize: function(options) {
             if (options.items.length === 0) {
-                this.items = [{ key: "", value: ""}];
+                this.items = [{ key: "", value: "" }];
             } else {
                 this.items = options.items;
             }
         },
-        onRender: function() {
-        },
+        onRender: function() {},
         onAddItemClick: function(e) {
             var el = e.currentTarget;
-            this.items.splice(parseInt(el.dataset.index) + 1, 0, { key: "", value: ""});
+            this.items.splice(parseInt(el.dataset.index) + 1, 0, { key: "", value: "" });
             this.render();
         },
         onDeleteItemClick: function(e) {
@@ -77,18 +76,18 @@ define(['require',
             this.items.splice(el.dataset.index, 1);
             this.render();
         },
-        onItemKeyChange: function (e) {
+        onItemKeyChange: function(e) {
             var el = e.currentTarget;
             this.handleCharSupport(el);
             if (!el.value.trim().includes(':')) {
-                this.items[ el.dataset.index].key =  _.escape(el.value.trim());
+                this.items[el.dataset.index].key = _.escape(el.value.trim());
             }
         },
-        onItemValueChange: function (e) {
+        onItemValueChange: function(e) {
             var el = e.currentTarget;
             this.handleCharSupport(el);
             if (!el.value.trim().includes(':')) {
-                this.items[ el.dataset.index].value =  _.escape(el.value.trim());
+                this.items[el.dataset.index].value = _.escape(el.value.trim());
             }
         },
         handleCharSupport: function(el) {

dashboardv2/public/js/views/entity/EntityUserDefineView.js

@@ -17,15 +17,15 @@
  */
 
 define(['require',
-'backbone',
-'hbs!tmpl/entity/EntityUserDefineView_tmpl',
-'models/VEntity',
-'utils/Utils',
-'utils/Enums',
-'utils/Messages',
-'utils/CommonViewFunction',
+    'backbone',
+    'hbs!tmpl/entity/EntityUserDefineView_tmpl',
+    'models/VEntity',
+    'utils/Utils',
+    'utils/Enums',
+    'utils/Messages',
+    'utils/CommonViewFunction',
 ], function(require, Backbone, EntityUserDefineView_tmpl, VEntity, Utils, Enums, Messages, CommonViewFunction) {
-'use strict';
+    'use strict';
 
     return Backbone.Marionette.LayoutView.extend({
         _viewName: 'EntityUserDefineView',
@@ -33,7 +33,7 @@ define(['require',
         templateHelpers: function() {
             return {
                 customAttibutes: this.customAttibutes,
-                readOnlyEntity : this.readOnlyEntity,
+                readOnlyEntity: this.readOnlyEntity,
                 swapItem: this.swapItem,
                 saveAttrItems: this.saveAttrItems,
                 divId_1: this.dynamicId_1,
@@ -57,19 +57,18 @@ define(['require',
             this.userDefineAttr = this.entity.customAttributes || [];
             this.initialCall = false;
             this.swapItem = false, this.saveAttrItems = false;
-            this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter ;
+            this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter;
             this.entityModel = new VEntity(this.entity);
             this.dynamicId_1 = CommonViewFunction.getRandomIdAndAnchor();
             this.dynamicId_2 = CommonViewFunction.getRandomIdAndAnchor();
             this.generateTableFields();
         },
-        onRender: function() {
-        },
+        onRender: function() {},
         renderEntityUserDefinedItems: function() {
             var that = this;
 
             require(['views/entity/EntityUserDefineItemView'], function(EntityUserDefineItemView) {
-                that.itemView = new EntityUserDefineItemView({items: that.customAttibutes});
+                that.itemView = new EntityUserDefineItemView({ items: that.customAttibutes });
                 that.REntityUserDefinedItemView.show(that.itemView);
             });
         },
@@ -103,23 +102,23 @@ define(['require',
                 });
             });
         },
-        onEditAttrClick: function () {
+        onEditAttrClick: function() {
             this.initialCall = this.customAttibutes.length > 0 ? false : true;
             this.setAttributeModal(this.itemView);
         },
-        structureAttributes: function (list) {
-            var obj={}
-            list.map(function (o) {
+        structureAttributes: function(list) {
+            var obj = {}
+            list.map(function(o) {
                 obj[o.key] = o.value;
             });
             return obj;
         },
-        saveAttributes: function (list) {
+        saveAttributes: function(list) {
             var that = this;
             var entityJson = that.entityModel.toJSON();
             var properties = that.structureAttributes(list);
             entityJson.customAttributes = properties;
-            var payload = {entity: entityJson};
+            var payload = { entity: entityJson };
             that.entityModel.createOreditEntity({
                 data: JSON.stringify(payload),
                 type: 'POST',
@@ -138,14 +137,14 @@ define(['require',
                     that.saveAttrItems = false;
                     that.render();
                 },
-                error: function (e) {
+                error: function(e) {
                     that.initialCall = false;
                     Utils.notifySuccess({
                         content: e.message
                     });
                     that.ui.saveAttrItems.attr("disabled", false);
                 },
-                complete: function () {
+                complete: function() {
                     that.ui.saveAttrItems.attr("disabled", false);
                     that.initialCall = false;
                 }

dashboardv2/public/js/views/search/QueryBuilderView.js

@@ -83,15 +83,34 @@ define(['require',
                 }
                 return false;
             },
-            getObjDef: function(attrObj, rules, isGroup, groupType) {
+            getObjDef: function(attrObj, rules, isGroup, groupType, isSystemAttr) {
+                if (attrObj.name === "__classificationsText" || attrObj.name === "__historicalGuids") {
+                    return;
+                }
                 var obj = {
                     id: attrObj.name,
-                    label: _.escape(attrObj.name.capitalize() + " (" + attrObj.typeName + ")"),
+                    label: (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (" + attrObj.typeName + ")",
                     type: _.escape(attrObj.typeName)
                 };
                 if (isGroup) {
                     obj.optgroup = groupType;
                 }
+                if (isSystemAttr && attrObj.name === "__isIncomplete" || isSystemAttr && attrObj.name === "IsIncomplete") {
+                    obj.type = "boolean";
+                    obj.label = (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (boolean)";
+                    obj['input'] = 'select';
+                    obj['values'] = [{ 1: 'true' }, { 0: 'false' }];
+                    obj.operators = ['=', '!=', 'is_null', 'not_null'];
+                    return obj;
+                }
+                if (isSystemAttr && attrObj.name === "Status" || isSystemAttr && attrObj.name === "__state") {
+                    obj.label = (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (enum)";
+                    obj['input'] = 'select';
+                    obj['values'] = ['ACTIVE', 'DELETED'];
+                    obj.operators = ['=', '!='];
+                    return obj;
+                }
+
                 if (obj.type === "date") {
                     obj['plugin'] = 'daterangepicker';
                     obj['plugin_config'] = {
@@ -167,7 +186,7 @@ define(['require',
                     }
                 });
                 _.each(this.systemAttrArr, function(obj) {
-                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select System Attribute');
+                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select System Attribute', true);
                     if (returnObj) {
                         filters.push(returnObj);
                     }

dashboardv2/public/js/views/search/SearchLayoutView.js

@@ -23,8 +23,9 @@ define(['require',
     'utils/Globals',
     'utils/Enums',
     'collection/VSearchList',
-    'utils/CommonViewFunction'
-], function(require, Backbone, SearchLayoutViewTmpl, Utils, UrlLinks, Globals, Enums, VSearchList, CommonViewFunction) {
+    'utils/CommonViewFunction',
+    'modules/Modal'
+], function(require, Backbone, SearchLayoutViewTmpl, Utils, UrlLinks, Globals, Enums, VSearchList, CommonViewFunction, Modal) {
     'use strict';
 
     var SearchLayoutView = Backbone.Marionette.LayoutView.extend(
@@ -239,7 +240,7 @@ define(['require',
                     }
                 }
                 var tagCheck = function(filterObj, type) {
-                    var filterAddOn = Enums.addOnClassification.filter(function(a) { a !== Enums.addOnClassification[0]});
+                    var filterAddOn = Enums.addOnClassification.filter(function(a) { a !== Enums.addOnClassification[0] });
                     if (that.value.tag && !_.contains(filterAddOn, that.value.tag)) {
                         that.ui.tagAttrFilter.prop('disabled', false);
                         if (filterObj && filterObj.length) {
@@ -435,13 +436,17 @@ define(['require',
                 });
             },
             okAttrFilterButton: function(e) {
-                var isTag = this.attrModal.tag ? true : false,
+                var that = this,
+                    isTag = this.attrModal.tag ? true : false,
                     filtertype = isTag ? 'tagFilters' : 'entityFilters',
                     queryBuilderRef = this.attrModal.RQueryBuilder.currentView.ui.builder,
                     col = [];
 
                 function getIdFromRuleObject(rule) {
                     _.map(rule.rules, function(obj, key) {
+                        if (obj.id === "__state") {
+                            that.value.includeDE = (obj.value === "ACTIVE" && obj.operator === "=") || (obj.value === "DELETED" && obj.operator === "!=") ? false : true;
+                        }
                         if (_.has(obj, 'condition')) {
                             return getIdFromRuleObject(obj);
                         } else {

dashboardv2/public/js/views/search/SearchQueryView.js

@@ -59,7 +59,7 @@ define(['require',
                     title: 'Attribute Filter',
                     content: this,
                     allowCancel: true,
-                    mainClass : 'modal-lg',
+                    mainClass: 'modal-lg',
                     okCloses: false,
                     buttons: [{
                             text: 'Cancel',
@@ -115,7 +115,7 @@ define(['require',
                             attrMerge: true
                         });
                     }
-                    if (Globals[this.value.type] ||Globals[Enums.addOnEntities[0]]) {
+                    if (Globals[this.value.type] || Globals[Enums.addOnEntities[0]]) {
                         obj['systemAttrArr'] = (Globals[this.value.type] || Globals[Enums.addOnEntities[0]]).attributeDefs;
                     }
                 }

dashboardv2/public/js/views/search/SearchResultLayoutView.js

@@ -218,7 +218,7 @@ define(['require',
                         Utils.notifyError({
                             content: errorText
                         });
-                        this.$('.searchTable > .well').html('<center>' + errorText + '</center>')
+                        this.$('.searchTable > .well').html('<center>' + _.escape(errorText) + '</center>')
                     }
                 }, this);
                 this.listenTo(this.searchCollection, "state-changed", function(state) {
@@ -536,15 +536,6 @@ define(['require',
                 }
 
             },
-            renderSearchQueryView: function() {
-                var that = this;
-                require(['views/search/SearchQueryView'], function(SearchQueryView) {
-                    that.RSearchQuery.show(new SearchQueryView({
-                        value: that.value,
-                        searchVent: that.searchVent
-                    }));
-                });
-            },
             tableRender: function(options) {
                 var that = this,
                     savedColumnOrder = options.order,
@@ -790,18 +781,19 @@ define(['require',
                     }
 
                     if (this.value && this.value.searchType === "basic") {
-                        var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }), systemAttr = [];
+                        var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }),
+                            systemAttr = [];
                         if (def || Globals[this.value.type] || (
-                            this.value.tag
-                            ? Globals[this.value.tag]
-                                ? Globals[this.value.tag]
-                                : Globals[Enums.addOnClassification[0]]
-                            : undefined)) {
+                                this.value.tag ?
+                                Globals[this.value.tag] ?
+                                Globals[this.value.tag] :
+                                Globals[Enums.addOnClassification[0]] :
+                                undefined)) {
                             var attrObj = def ? Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }) : [];
-                            if (this.value.type && ( Globals[this.value.type] || Globals[Enums.addOnEntities[0]])) {
+                            if (this.value.type && (Globals[this.value.type] || Globals[Enums.addOnEntities[0]])) {
                                 systemAttr = (Globals[this.value.type] || Globals[Enums.addOnEntities[0]]).attributeDefs;
                             }
-                            if (this.value.tag && ( Globals[this.value.tag] || Globals[Enums.addOnClassification[0]])) {
+                            if (this.value.tag && (Globals[this.value.tag] || Globals[Enums.addOnClassification[0]])) {
                                 systemAttr = (Globals[this.value.tag] || Globals[Enums.addOnClassification[0]]).attributeDefs;
                             }
                             attrObj = attrObj.concat(systemAttr);
@@ -816,7 +808,7 @@ define(['require',
                                     return;
                                 }
                                 col[obj.name] = {
-                                    label: _.escape(obj.name).capitalize(),
+                                    label: Enums.systemAttributes[obj.name] ? Enums.systemAttributes[obj.name] : _.escape(obj.name).capitalize(),
                                     cell: "Html",
                                     headerCell: Backgrid.HeaderHTMLDecodeCell,
                                     editable: false,

dashboardv2/public/js/views/search/save/SaveSearchItemView.js

@@ -41,7 +41,7 @@ define(['require',
             return events;
         },
         initialize: function(options) {
-            _.extend(this, _.pick(options, 'collection', 'typeHeaders', 'applyValue', 'fetchFavioriteCollection', 'isBasic', 'classificationDefCollection', 'entityDefCollection','searchTypeObj'));
+            _.extend(this, _.pick(options, 'collection', 'typeHeaders', 'applyValue', 'fetchFavioriteCollection', 'isBasic', 'classificationDefCollection', 'entityDefCollection', 'searchTypeObj'));
             this.model.id = this.model.get('guid');
             this.model.idAttribute = 'guid';
         },

dashboardv2/public/js/views/search/save/SaveSearchView.js

@@ -147,7 +147,7 @@ define(['require',
             if (options && options.model) {
                 var searchParameters = options.model.toJSON().searchParameters,
                     params = CommonViewFunction.generateUrlFromSaveSearchObject({
-                        value: {"searchParameters" : searchParameters, "uiParameters": options.model.get('uiParameters')},
+                        value: { "searchParameters": searchParameters, "uiParameters": options.model.get('uiParameters') },
                         classificationDefCollection: this.classificationDefCollection,
                         entityDefCollection: this.entityDefCollection
                     });

dashboardv3/public/css/scss/common.scss

@@ -188,7 +188,7 @@ pre {
     }
 }
 
-.panel-body .memory-details{
+.panel-body .memory-details {
     pre {
         &.code-block {
             &.shrink {

dashboardv3/public/css/scss/form.scss

@@ -459,7 +459,7 @@ button:focus {
     border-color: $color_mountain_mist_approx;
     color: $color_mountain_mist_approx;
     cursor: default;
-    margin: 5px 10px;
+    margin: 0px 10px;
 
     &:hover {
         border-color: $color_mountain_mist_approx;

dashboardv3/public/css/scss/glossary.scss

@@ -20,33 +20,41 @@
 
 .jstree-default-dark {
     background: transparent !important;
+
     .jstree-anchor {
         width: calc(100% - 50px);
         overflow: hidden;
         text-overflow: ellipsis;
     }
+
     .jstree-children.jstree-children>li>a {
         max-width: 500px;
     }
+
     .jstree-clicked,
     .jstree-wholerow-clicked {
         background: $color_jungle_green_approx !important;
     }
+
     .jstree-hovered {
         background: $color_star_dust_approx;
     }
+
     .jstree-anchor {
         color: #dbdbdb;
     }
+
     .jstree-search {
         color: #fbfece !important
     }
+
     li[role="treeitem"] {
         .jstree-wholerow-clicked {
             .tools {
                 display: inline-block;
             }
         }
+
         .tools {
             display: none;
             position: absolute;

dashboardv3/public/css/scss/nav.scss

@@ -19,17 +19,21 @@
 .navbar-atlas {
     background-color: $color_tuna_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 0 0 $black_10, 0 1px 10px $black_10;
+
     .navbar-brand {
         color: $white;
     }
+
     .nav>li>a {
         color: $white;
         padding-top: 18px;
         padding-bottom: 18px;
         font-size: 100%;
+
         &:focus {
             background-color: transparent;
         }
+
         &:hover {
             background-color: transparent;
         }
@@ -53,6 +57,7 @@
 .navbar-form {
     width: 30%;
     padding: 0;
+
     .form-control {
         width: 100%;
         padding: 6px 0;
@@ -63,6 +68,6 @@
     }
 }
 
-.navbar-nav>li>a{
+.navbar-nav>li>a {
     padding: 15px 10px;
 }
\ No newline at end of file

dashboardv3/public/css/scss/old-style.scss

@@ -38,6 +38,7 @@
         //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
         border-radius: 0;
     }
+
     &:last-child {
         //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
         border-radius: 0;
@@ -142,6 +143,7 @@
     height: 330px;
     overflow-y: auto;
     margin-bottom: 0;
+
     i.fa {
         margin-right: 5px;
     }

dashboardv3/public/css/scss/override.scss

@@ -333,6 +333,7 @@ div.columnmanager-visibilitycontrol {
 div.columnmanager-dropdown-container {
     &.open {
         overflow: auto;
+        width: auto;
     }
 
     >li>span.column-label {

dashboardv3/public/css/scss/panel.scss

@@ -144,11 +144,13 @@
 
     .panel-title {
         font-weight: normal;
+
         a:hover {
             color: $color_jungle_green_approx;
             opacity: 0.7;
         }
     }
+
     .btn-group {
         margin-top: 4px;
     }
@@ -157,6 +159,7 @@
 .panel-default.custom-panel>.panel-actions {
     float: right;
     margin-top: 15px;
+
     button {
         margin-right: 10px;
         margin-top: -4px;
@@ -166,6 +169,7 @@
 .panel-default.custom-panel>.panel-collapse>.panel-body {
     border-top: none;
 }
-.panel-default.custom-panel>.panel-heading > .btn-group > button {
+
+.panel-default.custom-panel>.panel-heading>.btn-group>button {
     color: $color_jungle_green_approx;
 }
\ No newline at end of file

dashboardv3/public/css/scss/profile-table.scss

@@ -24,6 +24,7 @@
 
 .graphval {
     font-size: 15px;
+
     .value-loader {
         top: 10px;
     }
@@ -48,9 +49,11 @@ svg.dateType .nv-bar {
 
 .progress.cstm_progress {
     margin-bottom: 0px;
+
     .progress-bar-success.cstm_success-bar {
         background-color: $color_jungle_green_approx;
     }
+
     .progress-bar-success.cstm_success-bar:hover {
         background-color: $color_puerto_rico_approx;
     }

dashboardv3/public/css/scss/search.scss

@@ -55,7 +55,7 @@ $color_celeste_approx: #1D1F2B;
         height: 16px;
         background-color: $color_jungle_green_approx;
         border-radius: 10px;
-        @include transition(inherit)
+        @include transition(inherit);
     }
 
     .switch-input:checked~& {
@@ -72,13 +72,13 @@ $color_celeste_approx: #1D1F2B;
 
     .srchTitle {
         font-size: 14px;
-        color: $gray
+        color: $gray;
     }
 }
 
 body.ui-autocomplete-small-height {
     .ui-menu.ui-widget-content.ui-autocomplete {
-        max-height: 40%
+        max-height: 40%;
     }
 }
 
@@ -152,7 +152,8 @@ body.ui-autocomplete-small-height {
         animation-fill-mode: backwards;
         animation: bottom-top 0.4s ease-in;
     }
-    .create-entity{
+
+    .create-entity {
         position: absolute;
         top: 0px;
         right: 0px;
@@ -219,8 +220,9 @@ body.ui-autocomplete-small-height {
             border-radius: 15px;
         }
     }
-    .queryContainer{
-        float:left;
+
+    .queryContainer {
+        float: left;
     }
 
     .capsuleView {
@@ -423,7 +425,8 @@ hr.hr-filter {
                 padding: 0px 15px;
             }
 
-            .attribute-result-footer,.attribute-edit-footer {
+            .attribute-result-footer,
+            .attribute-edit-footer {
                 display: inline-block;
             }
         }
@@ -448,7 +451,8 @@ hr.hr-filter {
             border: none;
         }
 
-        .attribute-result-footer, .attribute-edit-footer {
+        .attribute-result-footer,
+        .attribute-edit-footer {
             text-align: right;
         }
     }
@@ -462,14 +466,15 @@ hr.hr-filter {
 .ellipsis-with-margin {
     .searchResult {
         p {
-            margin: 10px 0px
+            margin: 10px 0px;
         }
     }
 }
-.popover{
+
+.popover {
     max-width: 800px;
 
-    .attributePopOver{
+    .attributePopOver {
         min-height: 190px;
     }
 }
\ No newline at end of file

dashboardv3/public/css/scss/wizard.scss

@@ -25,7 +25,7 @@ $color_falu_red_approx: #8a1f11;
 }
 
 %extend_2 {
-    list-style: none!important;
+    list-style: none !important;
     padding: 0;
     margin: 0;
 }
@@ -67,28 +67,35 @@ $color_falu_red_approx: #8a1f11;
 
 .wizard {
     @extend %wizard_tabcontrol;
+
     a {
         outline: 0;
     }
+
     ul {
         @extend %extend_2;
+
         >li {
             display: block;
             padding: 0;
         }
     }
+
     > {
         .steps {
             position: relative;
             display: block;
             width: 100%;
+
             .current-info {
                 position: absolute;
                 left: -999em;
             }
+
             .number {
                 font-size: 1.429em;
             }
+
             &>ul {
                 position: relative;
                 border: 0;
@@ -98,52 +105,66 @@ $color_falu_red_approx: #8a1f11;
                 list-style: none;
                 overflow: hidden;
                 margin-bottom: 10px;
+
                 >li {
                     width: 25%;
                     float: left;
+
                     &:first-child>a {
                         padding-left: 15px;
                     }
+
                     a {
                         @extend %extend_3;
+
                         &:hover {
                             cursor: pointer;
                         }
+
                         margin: 0;
                         border: none;
                         border-radius: 0;
                         padding: 10px 0 10px 45px;
+
                         &:before {
                             @extend %extend_befor_after;
                             border-left: 30px solid #ddd;
                             margin-left: 1px;
                             z-index: 1;
                         }
+
                         &:after {
                             @extend %extend_befor_after;
                             border-left: 30px solid #f5f5f5;
                             z-index: 2;
                         }
                     }
+
                     &.disabled a {
                         @extend %extend_4;
                     }
+
                     &.current a {
                         @extend %extend_5;
+
                         &:after {
                             border-left: 30px solid $color_keppel_approx;
                         }
                     }
+
                     &.done a {
                         background: #b4e5d9;
                         color: $white;
+
                         &:after {
                             border-left: 30px solid #b4e5d9;
                         }
                     }
+
                     &.error a {
                         background: $color_scarlet_approx;
                         color: $white;
+
                         &:after {
                             border-left: 30px solid $color_scarlet_approx;
                         }
@@ -151,6 +172,7 @@ $color_falu_red_approx: #8a1f11;
                 }
             }
         }
+
         .content {
             background: #f5f5f5;
             display: block;
@@ -158,17 +180,21 @@ $color_falu_red_approx: #8a1f11;
             position: relative;
             width: 100%; //Instead of the line below you could use @include border-radius($radius, $vertical-radius)
             border-radius: 5px;
+
             > {
                 .title {
                     display: none;
                 }
+
                 .body {
                     float: left;
                     width: 100%;
                     height: 95%;
                     padding: 2.5%;
+
                     >ul {
-                        list-style: disc!important;
+                        list-style: disc !important;
+
                         >li {
                             display: list-item;
                         }
@@ -176,20 +202,24 @@ $color_falu_red_approx: #8a1f11;
                 }
             }
         }
+
         .actions {
             position: relative;
             display: block;
             text-align: right;
             width: 100%;
+
             ul[role="menu"] {
                 li+li {
                     margin-left: 5px;
                 }
+
                 li.disabled {
                     a {
                         opacity: .65;
                     }
                 }
+
                 a {
                     padding: 10px 20px;
                     background-color: $color_keppel_approx;
@@ -200,6 +230,7 @@ $color_falu_red_approx: #8a1f11;
                     transition: all .3s ease;
                     margin: 2px;
                 }
+
                 a[href="#cancel"] {
                     padding: 10px 20px;
                     background-color: transparent;
@@ -211,38 +242,46 @@ $color_falu_red_approx: #8a1f11;
                     margin: 2px;
                 }
             }
+
             >ul {
                 display: inline-block;
                 text-align: right;
+
                 >li {
                     float: left;
                     margin: 0 .5em;
                 }
             }
         }
+
         .loading .spinner {}
     }
+
     &.vertical> {
         .steps {
             display: inline;
             float: left;
             width: 30%;
+
             >ul>li {
                 float: none;
                 width: 100%;
             }
         }
+
         .content {
             display: inline;
             float: left;
             margin: 0 2.5% .5em 2.5%;
             width: 65%;
         }
+
         .actions {
             display: inline;
             float: right;
             margin: 0 2.5%;
             width: 95%;
+
             >ul>li {
                 margin: 0 0 0 1em;
             }
@@ -252,21 +291,26 @@ $color_falu_red_approx: #8a1f11;
 
 .tabcontrol {
     @extend %wizard_tabcontrol;
+
     a {
         outline: 0;
     }
+
     ul {
         @extend %extend_2;
+
         >li {
             display: block;
             padding: 0;
         }
     }
+
     > {
         .steps .current-info {
             position: absolute;
             left: -999em;
         }
+
         .content>.title {
             display: none;
         }
@@ -278,28 +322,34 @@ $color_falu_red_approx: #8a1f11;
         >.steps {
             a {
                 margin-top: .5em;
+
                 &:hover {
                     margin-top: .5em;
                 }
+
                 &:active {
                     margin-top: .5em;
                 }
             }
+
             >ul>li {
                 width: 50%;
             }
         }
+
         &.vertical> {
             .steps {
                 display: block;
                 float: none;
                 width: 100%;
             }
+
             .actions {
                 display: block;
                 float: none;
                 width: 100%;
             }
+
             .content {
                 display: block;
                 float: none;
@@ -321,15 +371,18 @@ $color_falu_red_approx: #8a1f11;
         overflow: hidden;
         max-height: none;
     }
+
     .wizard {
         position: relative;
         width: 100%;
         height: 100%;
+
         .content {
             max-height: 400px;
             overflow: auto;
             margin: 0px 0px 15px 0px;
         }
+
         .actions {
             >ul>li {
                 margin: 0px;

dashboardv3/public/js/models/VSearch.js

@@ -41,7 +41,7 @@ define(['require',
          * Non - CRUD operations
          *************************/
         getEntity: function(id, options) {
-            var url = UrlLinks.entitiesApiUrl({guid: id});
+            var url = UrlLinks.entitiesApiUrl({ guid: id });
 
             options = _.extend({
                 contentType: 'application/json',

dashboardv3/public/js/templates/entity/EntityUserDefineView_tmpl.html

@@ -15,7 +15,6 @@
  * limitations under the License.
 -->
 <div class="panel-group" id="accordion">
-
     <div class="panel panel-default custom-panel expand_collapse_panel-icon" data-id="userDefine">
         {{#ifCond customAttibutes.length "===" 0}}
         <div class="panel-heading collapsed" data-toggle="collapse" href={{divId_1.anchor}} aria-expanded="false" style="width: 70%">
@@ -35,9 +34,7 @@
                 <button type="button" title="Collapse"><i class="ec-icon fa"></i></button>
             </div>
         </div>
-
         {{/ifCond}}
-
         {{#ifCond readOnlyEntity "===" false}}
         <div class="panel-actions">
             {{#ifCond swapItem "!==" true}}
@@ -50,7 +47,6 @@
             {{/ifCond}}
         </div>
         {{/ifCond}}
-
         <div id={{divId_1.id}} {{#ifCond swapItem "===" false}} class="panel-collapse collapse" {{else}} class="panel-collapse collapse in" {{/ifCond}}>
             {{#ifCond customAttibutes.length "===" 0}}
             <div class="panel-body">
@@ -65,7 +61,9 @@
                                     {{#each customAttibutes}}
                                     <tr>
                                         <td>
-                                                            <div class="scroll-y">{{key}}</div>                                              </div></td>
+                                            <div class="scroll-y">{{key}}</div>
+                        </div>
+                        </td>
                         <td>
                             <div class="scroll-y">{{value}}</div>
                         </td>
@@ -80,9 +78,8 @@
         </div>
         {{/ifCond}}
     </div>
-
     {{#ifCond customAttibutes.length ">" 0}}
-                <div id={{divId_2.id}} class="panel-collapse collapse in" >
+    <div id={{divId_2.id}} class="panel-collapse collapse in">
         <div class="panel-body">
             <div class="row">
                 <div class="col-md-12">
@@ -95,7 +92,9 @@
                                 {{#each customAttibutes}}
                                 <tr>
                                     <td>
-                                                            <div class="scroll-y">{{key}}</div>                                              </div></td>
+                                        <div class="scroll-y">{{key}}</div>
+                    </div>
+                    </td>
                     <td>
                         <div class="scroll-y">{{value}}</div>
                     </td>
@@ -108,8 +107,7 @@
             </div>
         </div>
     </div>
-                </div>
-            {{/ifCond}}
-
-        </div>
-    </div>
+</div>
+{{/ifCond}}
+</div>
+</div>
\ No newline at end of file

dashboardv3/public/js/templates/glossary/CreateEditCategoryTermLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" data-id="name" name="name" value="{{modelJSON.name}}" placeholder="Name(required)" autofocus/>
+            <input class="form-control" data-id="name" name="name" value="{{modelJSON.name}}" placeholder="Name(required)" autofocus />
         </div>
     </div>
     <div class="form-group">

dashboardv3/public/js/templates/glossary/CreateEditGlossaryLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" name="name" value="{{name}}" data-id="name" placeholder="Name(required)" autofocus/>
+            <input class="form-control" name="name" value="{{name}}" data-id="name" placeholder="Name(required)" autofocus />
         </div>
     </div>
     <div class="form-group">

dashboardv3/public/js/templates/glossary/TermRelationAttributeTable_tmpl.html

@@ -47,7 +47,7 @@
                                 <td>{{@key}}</td>
                                 {{#if ../../editMode}}
                                 <td>
-                                    <input data-id="attributeUpdate" class="form-control" type="text" data-name="{{@key}}" data-termguid="{{../../this.termGuid}}" " value="{{lookup ../../this @key ''}} ">
+                                    <input data-id="attributeUpdate" class="form-control" type="text" data-name="{{@key}}" data-termguid="{{../../this.termGuid}}" " value=" {{lookup ../../this @key ''}} ">
                                 </td>{{else}}
                                 <td>{{lookup ../../this @key "- "}}</td>
                                 {{/if}}
@@ -59,8 +59,8 @@
             </td>
         </tr>
         {{/each}}{{else}}
-        <tr class="empty text-center ">
-            <td colspan="3 "><span>No records found!</span></td>
+        <tr class=" empty text-center ">
+            <td colspan=" 3 "><span>No records found!</span></td>
         </tr>{{/if}} {{/if}}
     </tbody>
 </table>
\ No newline at end of file

dashboardv3/public/js/templates/graph/RelationshipLayoutView_tmpl.html

@@ -15,7 +15,7 @@
  * limitations under the License.
 -->
 <div class="relationship-details">
-<div class="graph-button-group form-group clearfix">
+    <div class="graph-button-group form-group clearfix">
         <div class="btn-group pull-left">
             <span class="pull-left">Graph</span>
             <label class="switch pull-left">
@@ -34,8 +34,8 @@
                 <span class="entity-status deleted" title="Deleted Entity"><i class="fa fa-long-arrow-right fa-fw" aria-hidden="true"></i>Deleted</span>
             </div>
         </div>
-</div>
-<div class="white-bg no-padding relationship-box invisible" data-id='relationshipSVG'>
+    </div>
+    <div class="white-bg no-padding relationship-box invisible" data-id='relationshipSVG'>
         <div class="fontLoader">
             <i class="fa fa-refresh fa-spin-custom"></i>
         </div>
@@ -52,8 +52,8 @@
                 </div>
             </div>
         </div>
-</div>
-<div class="relationship-detail-table">
+    </div>
+    <div class="relationship-detail-table">
         <div class="entity-relationship-table-toggle">
             <div class="pretty p-switch p-fill">
                 <input type="checkbox" data-id="noValueToggle" />
@@ -72,7 +72,7 @@
             <tbody data-id="relationshipDetailValue">
             </tbody>
         </table>
-</div>
+    </div>
 </div>
 <div class="no-data" style="display: none;">
     <h4 style="text-align: center;">No Records found!</h4>

dashboardv3/public/js/templates/profile/ProfileColumnLayoutView_tmpl.html

@@ -18,19 +18,25 @@
     <div class="">
         <div class="col-sm-3 rowValue">
             <div><span class="graphkey">Rows</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_created">
             <div><span class="graphkey">Date Created</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-6 table_name">
             <div><span class="graphkey">Table</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
     </div>
 </div>
-<hr/>
+<hr />
 <div class="row">
     <h4 class="col-sm-12">{{typeObject.label}}</h4>
 </div>
@@ -49,37 +55,37 @@
                 <div><span class="graphkey">Cardinality</span></div>
                 <div title="{{profileData.cardinality}}"><span class="graphval text-right"><b>{{profileData.cardinality}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">% NonNull</span></div>
                 <div title="{{profileData.nonNullData}}%"><span class="graphval text-right"><b>{{profileData.nonNullData}}%</b></span></div>
             </div>
-            <hr/> {{#ifCond typeObject.type "==" "string"}}
+            <hr /> {{#ifCond typeObject.type "==" "string"}}
             <div class="">
                 <div><span class="graphkey">Average Length</span></div>
                 <div title="{{profileData.averageLength}}"><span class="graphval text-right"><b>{{profileData.averageLength}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Max Length</span></div>
                 <div title="{{profileData.maxLength}}"><span class="graphval text-right"><b>{{profileData.maxLength}}</b></span></div>
             </div>
-            <hr/> {{/ifCond}} {{#ifCond typeObject.type "==" "numeric"}}
+            <hr /> {{/ifCond}} {{#ifCond typeObject.type "==" "numeric"}}
             <div class="">
                 <div><span class="graphkey">Min</span></div>
                 <div title="{{profileData.minValue}}"><span class="graphval text-right"><b>{{profileData.minValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Max</span></div>
                 <div title="{{profileData.maxValue}}"><span class="graphval text-right"><b>{{profileData.maxValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Mean</span></div>
                 <div title="{{profileData.meanValue}}"><span class="graphval text-right"><b>{{profileData.meanValue}}</b></span></div>
             </div>
-            <hr/>
+            <hr />
             <div class="">
                 <div><span class="graphkey">Median</span></div>
                 <div title="{{profileData.medianValue}}"><span class="graphval text-right"><b>{{profileData.medianValue}}</b></span></div>

dashboardv3/public/js/templates/profile/ProfileTableLayoutView_tmpl.html

@@ -18,23 +18,31 @@
     <div class="">
         <div class="col-sm-3 rowValue">
             <div><span class="graphkey">Rows</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_created">
             <div><span class="graphkey">Date Created</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 table_name">
             <div><span class="graphkey">Table</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
         <div class="col-sm-3 db_name">
             <div><span class="graphkey">DB</span></div>
-            <div><span class="graphval"><div class="value-loader"></div></span></div>
+            <div><span class="graphval">
+                    <div class="value-loader"></div>
+                </span></div>
         </div>
     </div>
 </div>
-<hr/>
+<hr />
 <div class="">
     <div id="r_profileTableLayoutView"></div>
 </div>
\ No newline at end of file

dashboardv3/public/js/templates/search/SearchFilterBrowseLayoutView_tmpl.html

@@ -21,16 +21,14 @@
             <button data-id="sliderBar"><i class="fa fa-chevron-left"></i></button>
         </div>
         <div class="header row col-sm-12 add-seperator" style="padding-top: 20px;">
-            <h3 style="margin-top: 0;margin-left: 13px;float: left;">Browse</h3>
-            <div class="col-sm-12" style="padding-right: 0;">
-                <div style="margin-top: 5px;margin-bottom: 5px;">
+            <h3 style="margin-top: 0;margin-left: 13px;">Browse</h3>
+            <div class="col-sm-12" style="padding-right: 0px;margin-bottom: 5px;">
                 <div class="has-feedback align-left">
                     <span class="fa fa-search form-control-feedback"></span>
                     <input type="text" class="form-control" placeholder="Entities, Classifications , Glossaries" data-id="searchNode" autocomplete="off" />
                 </div>
             </div>
         </div>
-        </div>
         <div class="col-sm-12 filter-tree-box">
             <div class="filter-tree-content">
                 <div class="form-group clearfix">

dashboardv3/public/js/templates/search/save/SaveModalLayoutView_tmpl.html

@@ -18,7 +18,7 @@
     <div class="form-group">
         <label class="control-label col-sm-2 required" for="name">Name</label>
         <div class="col-sm-10">
-            <input class="form-control" data-id="saveAsName" placeholder="Name(required)" value="{{selectedModel.name}}" autofocus/>
+            <input class="form-control" data-id="saveAsName" placeholder="Name(required)" value="{{selectedModel.name}}" autofocus />
         </div>
     </div>
 </form>
\ No newline at end of file

dashboardv3/public/js/templates/tag/AddTagModalView_tmpl.html

@@ -19,7 +19,8 @@
         <div class="row modalHeight">
             <div class="form-group col-md-12">
                 {{#if tagModel}}
-                <h4>{{tagModel.typeName}}</h4> </div>{{else}}
+                <h4>{{tagModel.typeName}}</h4>
+            </div>{{else}}
             <select class="form-control row-margin-bottom" data-id="addTagOptions" required>
             </select>
         </div>
@@ -32,7 +33,7 @@
                 </div>
                 <div class="inline" data-id="removePropagationOnEntityDeleteBox">
                     <label class="checkbox-inline btn">
-                        <input type="checkbox" data-id="removePropagationOnEntityDelete" class="input" title="Propagated classification are removed during entity delete"/> Remove propagation on entity delete</label>
+                        <input type="checkbox" data-id="removePropagationOnEntityDelete" class="input" title="Propagated classification are removed during entity delete" /> Remove propagation on entity delete</label>
                 </div>
             </div>
         </div>

dashboardv3/public/js/templates/tag/CreateTagLayoutView_tmpl.html

@@ -22,7 +22,7 @@
         <label class="control-label col-sm-2 {{#if create}}required{{/if}}" for="name">Name</label>
         {{#if create}}
         <div class="col-sm-10">
-            <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus/>
+            <input class="form-control" data-id="tagName" placeholder="Name(required)" autofocus />
         </div>
         {{else}}
         <span class="ellipsis-with-margin control-label text-left col-sm-10" data-id="title"></span> {{/if}}

dashboardv3/public/js/templates/tag/TagDetailTableLayoutView_tmpl.html

@@ -17,7 +17,7 @@
 <div class="position-relative">
     <div class="tableOverlay"></div>
     <div class="inline-content-fr table-action-btn">
-        <div class="inline" >
+        <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>
         </div>

dashboardv3/public/js/utils/CommonViewFunction.js

@@ -383,9 +383,9 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                     return '<span class="operator">' + obj.condition + '</span>' + '(' + objToString(obj).join("") + ')';
                 } else {
                     if (isCapsuleView) {
-                        return '<div class="capsuleView"><span class="key">' + _.escape(obj.id) + '</span><span class="operator">' + _.escape(obj.operator) + '</span><span class="value">' + _.escape(obj.value) + "</span><div class='fa fa-close clear-attr' data-type=" + type + " data-id=" + _.escape(obj.id) + "></div></div>";
+                        return '<div class="capsuleView"><span class="key">' + (Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] : _.escape(obj.id)) + '</span><span class="operator">' + _.escape(obj.operator) + '</span><span class="value">' + (Enums[obj.id] ? Enums[obj.id][obj.value] : _.escape(obj.value)) + "</span><div class='fa fa-close clear-attr' data-type=" + type + " data-id=" + _.escape(obj.id) + "></div></div>";
                     }
-                    return '<span class="key">' + _.escape(obj.id) + '</span><span class="operator">' + _.escape(obj.operator) + '</span><span class="value">' + _.escape(obj.value) + "</span>";
+                    return '<span class="key">' + (Enums.systemAttributes[obj.id] ? Enums.systemAttributes[obj.id] : _.escape(obj.id)) + '</span><span class="operator">' + _.escape(obj.operator) + '</span><span class="value">' + (Enums[obj.id] ? Enums[obj.id][obj.value] : _.escape(obj.value)) + "</span>";
                 }
             });
             return generatedQuery;
@@ -487,7 +487,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 val = val.join(',');
                             } else if (k == "tagFilters") {
                                 if (classificationDefCollection) {
-                                    var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value[skey].classification }), attributeDefs = []
+                                    var classificationDef = classificationDefCollection.fullCollection.findWhere({ 'name': value[skey].classification }),
+                                        attributeDefs = []
                                     if (classificationDef) {
                                         Utils.getNestedSuperTypeObj({
                                             collection: classificationDefCollection,
@@ -502,7 +503,8 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                                 val = CommonViewFunction.attributeFilter.generateUrl({ "value": val, "attributeDefs": attributeDefs });
                             } else if (k == "entityFilters") {
                                 if (entityDefCollection) {
-                                    var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value[skey].typeName }), attributeDefs = [];
+                                    var entityDef = entityDefCollection.fullCollection.findWhere({ 'name': value[skey].typeName }),
+                                        attributeDefs = [];
                                     if (entityDef) {
                                         attributeDefs = Utils.getNestedSuperTypeObj({
                                             collection: entityDefCollection,
@@ -981,7 +983,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
         });
         return list.join(',');
     }
-    CommonViewFunction.fetchRootEntityAttributes = function (options) {
+    CommonViewFunction.fetchRootEntityAttributes = function(options) {
             $.ajax({
                 url: options.url,
                 methods: 'GET',
@@ -990,8 +992,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 cache: true,
                 success: function(response) {
                     if (response) {
-                    var entity = Object.assign(response, { name: options.entity , guid: options.entity });
-                    Globals[options.entity] = entity;
+                        Globals[options.entity] = Object.assign(response, { name: options.entity, guid: options.entity });;
                     }
                 },
                 complete: function(response) {
@@ -1001,7 +1002,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 }
             });
         },
-    CommonViewFunction.fetchRootClassificationAttributes = function (options) {
+        CommonViewFunction.fetchRootClassificationAttributes = function(options) {
             $.ajax({
                 url: options.url,
                 methods: 'GET',
@@ -1010,8 +1011,7 @@ define(['require', 'utils/Utils', 'modules/Modal', 'utils/Messages', 'utils/Enum
                 cache: true,
                 success: function(response) {
                     if (response) {
-                    var classification = Object.assign(response, { name: options.classification, guid: options.classification });
-                    Globals[options.classification] = classification;
+                        Globals[options.classification] = Object.assign(response, { name: options.classification, guid: options.classification });
                     }
                 },
                 complete: function(response) {

dashboardv3/public/js/utils/Enums.js

@@ -37,7 +37,7 @@ define(['require'], function(require) {
         TERM_ADD: "Term Added",
         TERM_DELETE: "Term Deleted",
         LABEL_ADD: "Label(s) Added",
-        LABEL_DELETE:"Label(s) Deleted"
+        LABEL_DELETE: "Label(s) Deleted"
     }
 
     Enums.entityStateReadOnly = {
@@ -192,5 +192,23 @@ define(['require'], function(require) {
             "failedMessageCount": "number"
         }
     };
+    Enums.systemAttributes = {
+        "__classificationNames": "Classification(s)",
+        "__createdBy": "Created By",
+        "__customAttributes": "User-defined attributes",
+        "__guid": "Guid",
+        "__isIncomplete": "IsIncomplete",
+        "__labels": "Label(s)",
+        "__modificationTimestamp": "Last Modified Timestamp",
+        "__modifiedBy": "Last Modified User",
+        "__propagatedClassificationNames": "Propagated Classification(s)",
+        "__state": "Status",
+        "__timestamp": "Created Timestamp",
+        "__typeName": "Type Name"
+    };
+    Enums.__isIncomplete = {
+        0: "false",
+        1: "rue"
+    }
     return Enums;
 });
\ No newline at end of file

dashboardv3/public/js/utils/Overrides.js

@@ -206,7 +206,7 @@ define(['require', 'utils/Utils', 'marionette', 'backgrid', 'asBreadcrumbs', 'jq
     var HeaderDecodeCell = Backgrid.HeaderHTMLDecodeCell = Backgrid.HeaderCell.extend({
         initialize: function(options) {
             Backgrid.HeaderCell.prototype.initialize.apply(this, arguments);
-            this.name = _.unescape(this.column.get("name"))
+            this.name = _.unescape(this.column.get("label"))
             // Add class
             this.$el.addClass(this.name);
         },

dashboardv3/public/js/views/detail_page/DetailPageLayoutView.js

@@ -432,7 +432,7 @@ define(['require',
                     termData = "";
                 _.each(data, function(val) {
                     // if (val.relationshipStatus == "ACTIVE") {
-                    termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + _.escape(val.displayText) + '>' + _.escape(val.displayText) + '</span><i class="'+(val.relationshipStatus == "ACTIVE" ? 'fa fa-close': "") + '" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>';
+                    termData += '<span class="btn btn-action btn-sm btn-icon btn-blue" data-id="termClick"><span title=' + _.escape(val.displayText) + '>' + _.escape(val.displayText) + '</span><i class="' + (val.relationshipStatus == "ACTIVE" ? 'fa fa-close' : "") + '" data-id="deleteTerm" data-guid="' + val.guid + '" data-type="term" title="Remove Term"></i></span>';
                     // }
                 });
                 this.ui.termList.find("span.btn").remove();

dashboardv3/public/js/views/entity/EntityLabelDefineView.js

@@ -87,7 +87,7 @@ define(['require',
                         }
                     });
                 } else {
-                    return []
+                    return [];
                 }
             };
             this.ui.addLabelOptions.select2({

dashboardv3/public/js/views/entity/EntityUserDefineItemView.js

@@ -60,16 +60,15 @@ define(['require',
          */
         initialize: function(options) {
             if (options.items.length === 0) {
-                this.items = [{ key: "", value: ""}];
+                this.items = [{ key: "", value: "" }];
             } else {
                 this.items = options.items;
             }
         },
-        onRender: function() {
-        },
+        onRender: function() {},
         onAddItemClick: function(e) {
             var el = e.currentTarget;
-            this.items.splice(parseInt(el.dataset.index) + 1, 0, { key: "", value: ""});
+            this.items.splice(parseInt(el.dataset.index) + 1, 0, { key: "", value: "" });
             this.render();
         },
         onDeleteItemClick: function(e) {
@@ -77,18 +76,18 @@ define(['require',
             this.items.splice(el.dataset.index, 1);
             this.render();
         },
-        onItemKeyChange: function (e) {
+        onItemKeyChange: function(e) {
             var el = e.currentTarget;
             this.handleCharSupport(el);
             if (!el.value.trim().includes(':')) {
-                this.items[ el.dataset.index].key =  _.escape(el.value.trim());
+                this.items[el.dataset.index].key = _.escape(el.value.trim());
             }
         },
-        onItemValueChange: function (e) {
+        onItemValueChange: function(e) {
             var el = e.currentTarget;
             this.handleCharSupport(el);
             if (!el.value.trim().includes(':')) {
-                this.items[ el.dataset.index].value =  _.escape(el.value.trim());
+                this.items[el.dataset.index].value = _.escape(el.value.trim());
             }
         },
         handleCharSupport: function(el) {

dashboardv3/public/js/views/entity/EntityUserDefineView.js

@@ -17,15 +17,15 @@
  */
 
 define(['require',
-'backbone',
-'hbs!tmpl/entity/EntityUserDefineView_tmpl',
-'models/VEntity',
-'utils/Utils',
-'utils/Enums',
-'utils/Messages',
-'utils/CommonViewFunction',
+    'backbone',
+    'hbs!tmpl/entity/EntityUserDefineView_tmpl',
+    'models/VEntity',
+    'utils/Utils',
+    'utils/Enums',
+    'utils/Messages',
+    'utils/CommonViewFunction',
 ], function(require, Backbone, EntityUserDefineView_tmpl, VEntity, Utils, Enums, Messages, CommonViewFunction) {
-'use strict';
+    'use strict';
 
     return Backbone.Marionette.LayoutView.extend({
         _viewName: 'EntityUserDefineView',
@@ -33,7 +33,7 @@ define(['require',
         templateHelpers: function() {
             return {
                 customAttibutes: this.customAttibutes,
-                readOnlyEntity : this.readOnlyEntity,
+                readOnlyEntity: this.readOnlyEntity,
                 swapItem: this.swapItem,
                 saveAttrItems: this.saveAttrItems,
                 divId_1: this.dynamicId_1,
@@ -57,19 +57,18 @@ define(['require',
             this.userDefineAttr = this.entity.customAttributes || [];
             this.initialCall = false;
             this.swapItem = false, this.saveAttrItems = false;
-            this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter ;
+            this.readOnlyEntity = this.customFilter === undefined ? Enums.entityStateReadOnly[this.entity.status] : this.customFilter;
             this.entityModel = new VEntity(this.entity);
             this.dynamicId_1 = CommonViewFunction.getRandomIdAndAnchor();
             this.dynamicId_2 = CommonViewFunction.getRandomIdAndAnchor();
             this.generateTableFields();
         },
-        onRender: function() {
-        },
+        onRender: function() {},
         renderEntityUserDefinedItems: function() {
             var that = this;
 
             require(['views/entity/EntityUserDefineItemView'], function(EntityUserDefineItemView) {
-                that.itemView = new EntityUserDefineItemView({items: that.customAttibutes});
+                that.itemView = new EntityUserDefineItemView({ items: that.customAttibutes });
                 that.REntityUserDefinedItemView.show(that.itemView);
             });
         },
@@ -103,23 +102,23 @@ define(['require',
                 });
             });
         },
-        onEditAttrClick: function () {
+        onEditAttrClick: function() {
             this.initialCall = this.customAttibutes.length > 0 ? false : true;
             this.setAttributeModal(this.itemView);
         },
-        structureAttributes: function (list) {
-            var obj={}
-            list.map(function (o) {
+        structureAttributes: function(list) {
+            var obj = {}
+            list.map(function(o) {
                 obj[o.key] = o.value;
             });
             return obj;
         },
-        saveAttributes: function (list) {
+        saveAttributes: function(list) {
             var that = this;
             var entityJson = that.entityModel.toJSON();
             var properties = that.structureAttributes(list);
             entityJson.customAttributes = properties;
-            var payload = {entity: entityJson};
+            var payload = { entity: entityJson };
             that.entityModel.createOreditEntity({
                 data: JSON.stringify(payload),
                 type: 'POST',
@@ -138,14 +137,14 @@ define(['require',
                     that.saveAttrItems = false;
                     that.render();
                 },
-                error: function (e) {
+                error: function(e) {
                     that.initialCall = false;
                     Utils.notifySuccess({
                         content: e.message
                     });
                     that.ui.saveAttrItems.attr("disabled", false);
                 },
-                complete: function () {
+                complete: function() {
                     that.ui.saveAttrItems.attr("disabled", false);
                     that.initialCall = false;
                 }

dashboardv3/public/js/views/graph/RelationshipLayoutView.js

@@ -51,8 +51,8 @@ define(['require',
                 zoomControl: "[data-id='zoomControl']",
                 boxClose: '[data-id="box-close"]',
                 noValueToggle: "[data-id='noValueToggle']",
-                relationshipDetails:".relationship-details",
-                noData:".no-data"
+                relationshipDetails: ".relationship-details",
+                noData: ".no-data"
             },
 
             /** ui events hash */

dashboardv3/public/js/views/search/GlobalSearchLayoutView.js

@@ -304,7 +304,7 @@ define(["require",
                                             var span = $("<span>" + getHighlightedTerm(item.itemText) + "</span>").prepend(img);
                                             li = $("<li class='with-icon'>").append(span);
                                         } else {
-                                            li = $("<li>").append("<span>" + getHighlightedTerm(item) + "</span>");
+                                            li = $("<li>").append("<span>" + _.escape(getHighlightedTerm(item)) + "</span>");
                                         }
                                         li.data("ui-autocomplete-item", item);
                                         if (searchItem.category) {

dashboardv3/public/js/views/search/QueryBuilderView.js

@@ -83,15 +83,33 @@ define(['require',
                 }
                 return false;
             },
-            getObjDef: function(attrObj, rules, isGroup, groupType) {
+            getObjDef: function(attrObj, rules, isGroup, groupType, isSystemAttr) {
+                if (attrObj.name === "__classificationsText" || attrObj.name === "__historicalGuids") {
+                    return;
+                }
                 var obj = {
                     id: attrObj.name,
-                    label: _.escape(attrObj.name.capitalize() + " (" + attrObj.typeName + ")"),
+                    label: (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (" + attrObj.typeName + ")",
                     type: _.escape(attrObj.typeName)
                 };
                 if (isGroup) {
                     obj.optgroup = groupType;
                 }
+                if (isSystemAttr && attrObj.name === "__isIncomplete" || isSystemAttr && attrObj.name === "IsIncomplete") {
+                    obj.type = "boolean";
+                    obj.label = (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (boolean)";
+                    obj['input'] = 'select';
+                    obj['values'] = [{ 1: 'true' }, { 0: 'false' }];
+                    obj.operators = ['=', '!=', 'is_null', 'not_null'];
+                    return obj;
+                }
+                if (isSystemAttr && attrObj.name === "Status" || isSystemAttr && attrObj.name === "__state") {
+                    obj.label = (Enums.systemAttributes[attrObj.name] ? Enums.systemAttributes[attrObj.name] : _.escape(attrObj.name.capitalize())) + " (enum)";
+                    obj['input'] = 'select';
+                    obj['values'] = ['ACTIVE', 'DELETED'];
+                    obj.operators = ['=', '!='];
+                    return obj;
+                }
                 if (obj.type === "date") {
                     obj['plugin'] = 'daterangepicker';
                     obj['plugin_config'] = {
@@ -155,18 +173,19 @@ define(['require',
                 }
                 if (this.attrObj.length === 0) {
                     placeHolder = '--Select System Attribute--';
-                    }                if (this.value) {
+                }
+                if (this.value) {
                     var rules_widgets = CommonViewFunction.attributeFilter.extractUrl({ "value": this.searchTableFilters[this.filterType][(this.tag ? this.value.tag : this.value.type)], "formatDate": true });
                 }
                 _.each(this.attrObj, function(obj) {
                     var type = that.tag ? 'Classification' : 'Entity';
-                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select '+ type + ' Attribute');
+                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select ' + type + ' Attribute');
                     if (returnObj) {
                         filters.push(returnObj);
                     }
                 });
                 _.each(this.systemAttrArr, function(obj) {
-                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select System Attribute');
+                    var returnObj = that.getObjDef(obj, rules_widgets, isGroupView, 'Select System Attribute', true);
                     if (returnObj) {
                         filters.push(returnObj);
                     }

dashboardv3/public/js/views/search/SearchDefaultLayoutView.js

@@ -342,8 +342,12 @@ define(["require", "backbone", "utils/Globals", "hbs!tmpl/search/SearchDefaultLa
                 }
             },
             getIdFromRuleObj: function(rule) {
-                var col = []
+                var that = this,
+                    col = [];
                 _.map(rule.rules, function(obj, key) {
+                    if (obj.id === "__state") {
+                        that.options.value.includeDE = (obj.value === "ACTIVE" && obj.operator === "=") || (obj.value === "DELETED" && obj.operator === "!=") ? false : true;
+                    }
                     if (_.has(obj, "condition")) {
                         return this.getIdFromRuleObj(obj);
                     } else {

dashboardv3/public/js/views/search/SearchFilterBrowseLayoutView.js

@@ -23,8 +23,9 @@ define([
     "utils/UrlLinks",
     "utils/CommonViewFunction",
     "collection/VSearchList",
+    'modules/Modal',
     "jstree"
-], function(require, SearchFilterBrowseLayoutViewTmpl, Utils, Globals, UrlLinks, CommonViewFunction, VSearchList) {
+], function(require, SearchFilterBrowseLayoutViewTmpl, Utils, Globals, UrlLinks, CommonViewFunction, VSearchList, Modal) {
     "use strict";
 
     var SearchFilterBrowseLayoutViewNew = Marionette.LayoutView.extend({
@@ -35,12 +36,11 @@ define([
             RGlossaryTreeRender: '[data-id="r_glossaryTreeRender"]',
             RClassificationTreeRender: '[data-id="r_classificationTreeRender"]',
             REntityTreeRender: '[data-id="r_entityTreeRender"]',
-            RCustomFilterTreeRender: '[data-id="r_customFilterTreeRender"]',
+            RCustomFilterTreeRender: '[data-id="r_customFilterTreeRender"]'
         },
         ui: {
             //search
             searchNode: '[data-id="searchNode"]',
-
             sliderBar: '[data-id="sliderBar"]',
             menuItems: ".menu-items"
         },
@@ -212,19 +212,19 @@ define([
         renderEntityTree: function(opt) {
             var that = this;
             require(["views/search/tree/EntityTreeLayoutView"], function(ClassificationTreeLayoutView) {
-                that.REntityTreeRender.show(new ClassificationTreeLayoutView(_.extend({ query: that.query }, that.options, {value: opt})));
+                that.REntityTreeRender.show(new ClassificationTreeLayoutView(_.extend({ query: that.query }, that.options, { value: opt })));
             });
         },
         renderClassificationTree: function(opt) {
             var that = this;
             require(["views/search/tree/ClassificationTreeLayoutView"], function(ClassificationTreeLayoutView) {
-                that.RClassificationTreeRender.show(new ClassificationTreeLayoutView(_.extend({ query: that.query }, that.options, {value: opt})));
+                that.RClassificationTreeRender.show(new ClassificationTreeLayoutView(_.extend({ query: that.query }, that.options, { value: opt })));
             });
         },
         renderGlossaryTree: function(opt) {
             var that = this;
             require(["views/search/tree/GlossaryTreeLayoutView"], function(GlossaryTreeLayoutView) {
-                that.RGlossaryTreeRender.show(new GlossaryTreeLayoutView(_.extend({ query: that.query }, that.options, {value: opt})));
+                that.RGlossaryTreeRender.show(new GlossaryTreeLayoutView(_.extend({ query: that.query }, that.options, { value: opt })));
             });
         },
         renderCustomFilterTree: function() {

dashboardv3/public/js/views/search/SearchQueryView.js

@@ -58,7 +58,7 @@ define(['require',
                     title: 'Attribute Filter',
                     content: this,
                     allowCancel: true,
-                    mainClass : 'modal-lg',
+                    mainClass: 'modal-lg',
                     okCloses: false,
                     buttons: [{
                             text: 'Cancel',

dashboardv3/public/js/views/search/SearchResultLayoutView.js

@@ -547,15 +547,6 @@ define(['require',
                     }
                 }
             },
-            renderSearchQueryView: function() {
-                var that = this;
-                require(['views/search/SearchQueryView'], function(SearchQueryView) {
-                    that.RSearchQuery.show(new SearchQueryView({
-                        value: that.value,
-                        searchVent: that.searchVent
-                    }));
-                });
-            },
             tableRender: function(options) {
                 var that = this,
                     savedColumnOrder = options.order,
@@ -802,18 +793,19 @@ define(['require',
                     }
 
                     if (this.value && this.value.searchType === "basic") {
-                        var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }), systemAttr = [];
+                        var def = this.entityDefCollection.fullCollection.find({ name: this.value.type }),
+                            systemAttr = [];
                         if (def || Globals[this.value.type] || (
-                             this.value.tag
-                             ? Globals[this.value.tag]
-                                 ? Globals[this.value.tag]
-                                 : Globals[Enums.addOnClassification[0]]
-                             : undefined)) {
+                                this.value.tag ?
+                                Globals[this.value.tag] ?
+                                Globals[this.value.tag] :
+                                Globals[Enums.addOnClassification[0]] :
+                                undefined)) {
                             var attrObj = def ? Utils.getNestedSuperTypeObj({ data: def.toJSON(), collection: this.entityDefCollection, attrMerge: true }) : [];
-                             if (this.value.type && ( Globals[this.value.type] || Globals[Enums.addOnEntities[0]])) {
+                            if (this.value.type && (Globals[this.value.type] || Globals[Enums.addOnEntities[0]])) {
                                 systemAttr = (Globals[this.value.type] || Globals[Enums.addOnEntities[0]]).attributeDefs;
                             }
-                             if (this.value.tag && ( Globals[this.value.tag] || Globals[Enums.addOnClassification[0]])) {
+                            if (this.value.tag && (Globals[this.value.tag] || Globals[Enums.addOnClassification[0]])) {
                                 systemAttr = (Globals[this.value.tag] || Globals[Enums.addOnClassification[0]]).attributeDefs;
                             }
                             attrObj = attrObj.concat(systemAttr);
@@ -828,7 +820,7 @@ define(['require',
                                     return;
                                 }
                                 col[obj.name] = {
-                                    label: _.escape(obj.name).capitalize(),
+                                    label: Enums.systemAttributes[obj.name] ? Enums.systemAttributes[obj.name] : _.escape(obj.name).capitalize(),
                                     cell: "Html",
                                     headerCell: Backgrid.HeaderHTMLDecodeCell,
                                     editable: false,

dashboardv3/public/js/views/search/save/SaveSearchItemView.js

@@ -41,7 +41,7 @@ define(['require',
             return events;
         },
         initialize: function(options) {
-            _.extend(this, _.pick(options, 'collection', 'typeHeaders', 'applyValue', 'fetchFavioriteCollection', 'isBasic', 'classificationDefCollection', 'entityDefCollection','searchTypeObj'));
+            _.extend(this, _.pick(options, 'collection', 'typeHeaders', 'applyValue', 'fetchFavioriteCollection', 'isBasic', 'classificationDefCollection', 'entityDefCollection', 'searchTypeObj'));
             this.model.id = this.model.get('guid');
             this.model.idAttribute = 'guid';
         },

dashboardv3/public/js/views/search/save/SaveSearchView.js

@@ -147,7 +147,7 @@ define(['require',
             if (options && options.model) {
                 var searchParameters = options.model.toJSON().searchParameters,
                     params = CommonViewFunction.generateUrlFromSaveSearchObject({
-                        value: {"searchParameters" : searchParameters, "uiParameters": options.model.get('uiParameters')},
+                        value: { "searchParameters": searchParameters, "uiParameters": options.model.get('uiParameters') },
                         classificationDefCollection: this.classificationDefCollection,
                         entityDefCollection: this.entityDefCollection
                     });

dashboardv3/public/js/views/search/tree/ClassificationTreeLayoutView.js

@@ -495,9 +495,9 @@ define([
             });
             var classificationTreeData = that.isEmptyClassification ? listWithEmptyParents : listOfParents;
             var flatViewClassificaton = that.isEmptyClassification ? listWithEmptyParentsFlatView : flatViewList;
-            var classificationData = that.isGroupView
-                ? that.pushRootClassificationToJstree.call(that, classificationTreeData)
-                : that.pushRootClassificationToJstree.call(that, flatViewClassificaton);
+            var classificationData = that.isGroupView ?
+                that.pushRootClassificationToJstree.call(that, classificationTreeData) :
+                that.pushRootClassificationToJstree.call(that, flatViewClassificaton);
             return classificationData;
         },
         pushRootClassificationToJstree: function(data) {

dashboardv3/public/js/views/search/tree/EntityTreeLayoutView.js

@@ -324,10 +324,10 @@ define([
 
                     var serviceTypeData = that.isEmptyServicetype ? serviceTypeWithEmptyEntity : serviceTypeArr;
                     if (that.isGroupView) {
-                        var serviceDataWithRootEntity = pushRootEntityToJstree.call(that,'group',serviceTypeData);
+                        var serviceDataWithRootEntity = pushRootEntityToJstree.call(that, 'group', serviceTypeData);
                         return getParentsData.call(that, serviceDataWithRootEntity);
                     } else {
-                        return pushRootEntityToJstree.call(that, null,serviceTypeData);
+                        return pushRootEntityToJstree.call(that, null, serviceTypeData);
                     }
                 },
                 pushRootEntityToJstree = function(type, data) {
@@ -350,7 +350,7 @@ define([
                     };
                     if (type === 'group') {
                         if (data.other_types === undefined) {
-                            data.other_types = { name : "other_types", children: []};
+                            data.other_types = { name: "other_types", children: [] };
                         }
                         data.other_types.children.push(rootEntityNode);
                     } else {

dashboardv3/public/js/views/site/Favorite.js

@@ -41,10 +41,10 @@ define(['require',
             /** Layout sub regions */
             regions: {
                 RSaveSearchBasic: "[data-id='r_saveSearchBasic']",
-                RSaveSearchAdvance: "[data-id='r_saveSearchAdvance']"},
-            /** ui selector cache */
-            ui: {
+                RSaveSearchAdvance: "[data-id='r_saveSearchAdvance']"
             },
+            /** ui selector cache */
+            ui: {},
             /** ui events hash */
             events: function() {},
             /**

dashboardv3/public/js/views/site/Header.js

@@ -48,7 +48,7 @@ define(['require',
                 $('body').toggleClass("full-screen");
             };
             events['click ' + this.ui.signOut] = function() {
-                Utils.localStorage.setValue("atlas_ui","beta");
+                Utils.localStorage.setValue("atlas_ui", "beta");
                 var path = Utils.getBaseUrl(window.location.pathname);
                 window.location = path + "/logout.html";
             };

dashboardv3/public/js/views/tag/TagLayoutView.js

@@ -214,8 +214,7 @@ define([
                                     .removeClass("hide"); // Don't use toggle
                                 if (this.createTag || !manual) {
                                     if (target.offset()) {
-                                        $("#sidebar-wrapper").animate(
-                                            {
+                                        $("#sidebar-wrapper").animate({
                                                 scrollTop: target.offset().top - 100
                                             },
                                             500
@@ -308,9 +307,9 @@ define([
                             '">' +
                             name +
                             "</a></div>" +
-                            (isTree && hasChild
-                                ? '<ul class="child hide">' + that.generateTree({ data: options.children, isTree: isTree }) + "</ul>"
-                                : "") +
+                            (isTree && hasChild ?
+                                '<ul class="child hide">' + that.generateTree({ data: options.children, isTree: isTree }) + "</ul>" :
+                                "") +
                             "</li>"
                         );
                     };
@@ -468,8 +467,7 @@ define([
                         modal: true,
                         confirm: {
                             confirm: true,
-                            buttons: [
-                                {
+                            buttons: [{
                                     text: "Ok",
                                     addClass: "btn-atlas btn-md",
                                     click: function(notice) {
@@ -496,14 +494,12 @@ define([
                     }
                 }
                 this.json = {
-                    classificationDefs: [
-                        {
+                    classificationDefs: [{
                         name: this.name.trim(),
                         description: this.description.trim(),
                         superTypes: superTypes.length ? superTypes : [],
                         attributeDefs: attributeObj
-                        }
-                    ],
+                    }],
                     entityDefs: [],
                     enumDefs: [],
                     structDefs: []