Added known types pages for search

dashboard/v2/public/css/common.css

@@ -67,9 +67,7 @@ header.navbar-top {
 
 .search {
     padding-top: 20px;
-    background-color: #eeeded;
     padding-bottom: 10px;
-    border-bottom: solid 1px #d9d9d8;
 }
 
 header .container {

dashboard/v2/public/js/app.js

@@ -24,7 +24,8 @@ angular.module('dgc', ['ngCookies',
     'ui.router',
     'dgc.system',
     'dgc.home',
-    'dgc.search'
+    'dgc.search',
+    'dgc.navigation'
 ]);
 
 angular.module('dgc.system', ['dgc.system.notification']);

dashboard/v2/public/modules/details/detailsController.js

@@ -25,20 +25,10 @@ angular.module('dgc.details').controller('DetailsController', ['$scope', '$state
             id: $stateParams.id
         });
        
-
-
-
         $scope.isString = angular.isString;
 
-
-        //schema
         $scope.schemas = DetailsResource.get({
             id: $stateParams.id
         });
-
-
-
-
     }
-
 ]);

dashboard/v2/public/modules/details/detailsResource.js

@@ -24,7 +24,7 @@ angular.module('dgc.details').factory('DetailsResource', ['$resource', function(
             method: 'GET',
             transformResponse: function(data) {
                 if (data) {
-                    return angular.fromJson(data.results);
+                    return angular.fromJson(data.definition);
                 }
             },
             responseType: 'json'

dashboard/v2/public/modules/details/views/details.html

@@ -18,8 +18,8 @@
 
 <div class="container details" data-ng-controller="DetailsController">
     <div class="col-lg-12">
-        <h4>Name : {{details.name}}</h4>
-        <h5>Description : {{details.description}}</h5>
+        <h4>{{details.name}}</h4>
+        <h5>{{details.description}}</h5>
 
         <tabset>
             <tab heading="Details">

dashboard/v2/public/modules/details/views/schema.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
 <div>
     <table class="table table-bordered">
         <thead>

dashboard/v2/public/modules/home/views/header.html

@@ -24,7 +24,7 @@
             <span class="icon-bar"></span>
             <span class="icon-bar"></span>
         </button>
-        <a data-ui-sref="home" data-ui-sref-active="active"><img src="modules/home/img/logo-sm.png"/></a>
+        <a data-ui-sref="home" data-ui-sref-active="active"><h1>DGI</h1></a>
     </div>
     <nav class="collapse navbar-collapse" data-collapse="isCollapsed" data-role="navigation">
         <ul class="navbar-nav nav" data-ng-if="isLoggedIn()">

dashboard/v2/public/modules/navigation/navigationController.js

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+angular.module('dgc.navigation').controller('NavigationController', ['$scope', 'NavigationResource',
+    function($scope, NavigationResource) {
+
+        $scope.leftnav= NavigationResource.get();
+        $scope.updateVar = function(event) {
+            $scope.$$prevSibling.query = angular.element(event.target).text();
+
+        };
+
+    }
+]);
\ No newline at end of file

dashboard/v2/public/modules/navigation/navigationModule.js

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+angular.module('dgc.navigation',[]);
\ No newline at end of file

dashboard/v2/public/modules/navigation/navigationResource.js

+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+'use strict';
+
+angular.module('dgc.navigation').factory('NavigationResource', ['$resource', function($resource) {
+    return $resource('api/metadata/types', {}, {
+        get: {
+            'method': 'GET',
+            'responseType': 'json',
+            'isArray': true,
+            'transformResponse': function(data) {
+                var results = [];
+                angular.forEach(data && data.results, function(val) {
+                    results.push(val);
+                });
+                return results;
+            }
+        }
+    });
+}]);

dashboard/v2/public/modules/navigation/views/navigation.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<div data-ng-controller="NavigationController">
+    <div class="col-lg-3">
+        <h4>Tags</h4>
+        <div class="list-group">
+            <a ng-repeat="nav in leftnav" ui-sref="search.results({ query: nav })" class="list-group-item">{{nav}} </a>
+        </div>
+
+    </div>
+</div>
\ No newline at end of file

dashboard/v2/public/modules/search/searchController.js

@@ -21,18 +21,20 @@
 angular.module('dgc.search').controller('SearchController', ['$scope', '$location', '$http', '$state', '$stateParams', 'SearchResource', 'NotificationService',
     function($scope, $location, $http, $state, $stateParams, SearchResource, NotificationService) {
 
-        $scope.types = [];
+        $scope.types = ['table','column','db','view','loadprocess','storagedesc'];
         $scope.results = [];
+        $scope.resultCount=0;
         $scope.search = function(query) {
             $scope.results = [];
             NotificationService.reset();
-            SearchResource.search($location.search(query).search(), function searchSuccess(response) {
-                $scope.results = response;
+            SearchResource.search({query:query}, function searchSuccess(response) {
+                $scope.results = response.results;
+                $scope.resultCount=response.count;
                 if ($scope.results.length < 1) {
                     NotificationService.error('No Result found', false);
                 }
-                $state.go('search.results', {}, {
-                    location: false
+                $state.go('search.results', {query:query}, {
+                    location: 'replace'
                 });
             }, function searchError(err) {
                 NotificationService.error('Error occurred during executing search query, error status code = ' + err.status + ', status text = ' + err.statusText, false);
@@ -40,11 +42,10 @@ angular.module('dgc.search').controller('SearchController', ['$scope', '$locatio
         };
 
         $scope.typeAvailable = function() {
-            return ['hive_table'].indexOf(this.result.type && this.result.type.toLowerCase()) > -1;
+            return $scope.types.indexOf(this.results.dataType.typeName && this.results.dataType.typeName.toLowerCase()) > -1;
         };
 
-        var urlParts = $location.url().split('?');
-        $scope.query = urlParts.length > 1 ? urlParts[1] : null;
+        $scope.query=$stateParams.query;
         if ($scope.query) {
             $scope.search($scope.query);
         }

dashboard/v2/public/modules/search/searchResource.js

@@ -19,18 +19,14 @@
 'use strict';
 
 angular.module('dgc.search').factory('SearchResource', ['$resource', function($resource) {
-    return $resource('/api/metadata/discovery/search/fulltext', {}, {
+    return $resource('/api/metadata/discovery/search/', {}, {
         search: {
             'method': 'GET',
             'responseType': 'json',
-            'isArray': true,
             'transformResponse': function(data) {
-                var results = [];
-                angular.forEach(data && data.vertices, function(val) {
-                    results.push(val);
-                });
-                return results;
+                return data;
             }
         }
     });
+
 }]);

dashboard/v2/public/modules/search/searchRoutes.js

@@ -25,10 +25,12 @@ angular.module('dgc.search').config(['$stateProvider',
         // states for my app
         $stateProvider.state('search', {
             url: '/search',
-            templateUrl: '/modules/search/views/search.html'
+            templateUrl: '/modules/search/views/search.html',
+            controller:'SearchController'
         }).state('search.results', {
-            url: '/?',
-            templateUrl: '/modules/search/views/searchResult.html'
+            url: '/:query',
+            templateUrl: '/modules/search/views/searchResult.html',
+            controller:'SearchController'
         });
     }
 ]);

dashboard/v2/public/modules/search/views/search.html

@@ -19,7 +19,7 @@
 <div data-ng-controller="SearchController">
     <div class="search">
         <form name="form" novalidate class="container">
-            <div class="col-lg-7">
+            <div class="col-lg-7 col-lg-offset-3">
                 <div class="row input-group">
                     <input type="text" class="form-control" placeholder="Search" data-ng-model="query" data-typeahead="type for type in types" required/>
                     <span class="input-group-btn">
@@ -29,18 +29,17 @@
                     </span>
                 </div>
                 <div class="row">
-                    <small class="small-txt">Examples : property=HiveLineage.executionEngine&text=tez</small>
-                    <br/>
-                    <small class="small-txt">property=type&text=HiveLineage</small>
-                    <br/>
-                    <small class="small-txt">property=type&text=hive_table</small>
+                    <small class="small-txt">search: Table, DB, Column</small>
                 </div>
             </div>
         </form>
     </div>
     <div class="container">
         <div class="row">
-            <div class="col-lg-11" data-ui-view=""></div>
+
+                <div data-ng-include="'/modules/navigation/views/navigation.html'"></div>
+
+            <div class="col-lg-9" data-ui-view=""></div>
         </div>
     </div>
 </div>

dashboard/v2/public/modules/search/views/searchResult.html

@@ -16,10 +16,10 @@
   ~ limitations under the License.
   -->
 
-<h4>{{results.length}} results matching your search query "{{query}}" were found</h4>
+<h4>{{resultCount}} results matching your search query "{{query}}" were found</h4>
 <ul class="list-unstyled">
-    <li ng-repeat="result in results">
-        <div data-ng-if="typeAvailable()" data-ng-include="'/modules/search/views/types/'+result.type.toLowerCase()+'.html'"></div>
+    <li ng-repeat="result in results.rows">
+        <div data-ng-if="typeAvailable()" data-ng-include="'/modules/search/views/types/'+results.dataType.typeName.toLowerCase()+'.html'"></div>
         <div data-ng-if="!typeAvailable()" data-ng-include="'/modules/search/views/types/guid.html'"></div>
     </li>
 </ul>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/column.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+<p><b>Comment:</b> {{result.comment}}, <b>DataType:</b> {{result.dataType}},<b>Table:</b> {{result.table}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/db.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+<p>{{result.description}}</p>
+<p><b>locationUri:</b> {{result.locationUri}}, <b>Owner: </b>{{result.owner}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/guid.html

@@ -16,4 +16,6 @@
   ~ limitations under the License.
   -->
 
-<a data-ui-sref="details({id:result.guid})">{{result.guid}}</a>
+<h4><a data-ui-sref="details({id:result.instanceInfo.guid})">{{result.instanceInfo.guid}}</a></h4>
\ No newline at end of file
+<p><b>TypeName: </b>{{result.instanceInfo.typeName}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/loadprocess.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+<p>{{result.description}}</p>
+<p><b>inputTables: </b>{{result.inputTables['id']}},<b>queryText: </b>{{result.queryText}},<b>startTime: </b>{{result.startTime | date:'medium'}},<b>endTime: </b> {{result.endTime | date:'medium'}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/storagedesc.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+<p><b>compressed: </b>{{result.compressed}},<b>outputFormat: </b>{{result.outputFormat}},<b>location: </b>{{result.location}}, <b>inputFormat: </b>{{result.inputFormat}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/public/modules/search/views/types/table.html

+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  -->
+
+<h4><a data-ui-sref="details({id:result['$id$'].id})">{{result.name}}</a></h4>
+<p>{{result.description}}</p>
+<p><b>owner: </b>{{result.owner}}, <b>createTime: </b>{{result.createTime}}</p>
+<h5>Tags :  <a ng-repeat="(key, value) in result['$traits$']" data-ui-sref="search.results({query: key})">{{key}}</a> </h5>
\ No newline at end of file

dashboard/v2/server/config/config.js

@@ -28,7 +28,7 @@ var path = require('path'),
     config = require('rc')(packageJson.name, {
         app: {
             name: packageJson.name,
-            title: 'DGI | aetna'
+            title: 'DGI'
         },
         nodeEnv: 'local',
         root: rootPath,
@@ -38,7 +38,7 @@ var path = require('path'),
             verbose: true,
             hosts: [{
                 routes: {
-                    '/api': 'http://162.249.6.76:21000/api'
+                    '/api': 'http://162.249.6.39:21000/api'
                 }
             }]
         }