This is an automated email from the ASF dual-hosted git repository.

riemer pushed a commit to branch STREAMPIPES-145
in repository https://gitbox.apache.org/repos/asf/incubator-streampipes.git


The following commit(s) were added to refs/heads/STREAMPIPES-145 by this push:
     new eaac6e3  [hotfix] Fix bug in data explorer
eaac6e3 is described below

commit eaac6e39ecf8a9b5c1abb5d99f25cf89f3852fd3
Author: Dominik Riemer <[email protected]>
AuthorDate: Thu Aug 6 08:05:31 2020 +0200

    [hotfix] Fix bug in data explorer
---
 .../serializer/JacksonSerializationProvider.java   |   1 -
 .../impl/datalake/DataLakeNoUserResourceV3.java    |  15 ++-
 ...data-explorer-dashboard-overview.component.html | 115 +++++++++++----------
 ...ata-explorer-dashboard-overview.component.scss} |  24 +++++
 .../data-explorer-dashboard-overview.component.ts  |   2 +-
 5 files changed, 89 insertions(+), 68 deletions(-)

diff --git 
a/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/serializer/JacksonSerializationProvider.java
 
b/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/serializer/JacksonSerializationProvider.java
index 4259d8d..5bdd5cd 100644
--- 
a/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/serializer/JacksonSerializationProvider.java
+++ 
b/streampipes-rest-shared/src/main/java/org/apache/streampipes/rest/shared/serializer/JacksonSerializationProvider.java
@@ -17,7 +17,6 @@
  */
 package org.apache.streampipes.rest.shared.serializer;
 
-import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.TypeFactory;
 import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
diff --git 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeNoUserResourceV3.java
 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeNoUserResourceV3.java
index 812147e..f9bf6f8 100644
--- 
a/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeNoUserResourceV3.java
+++ 
b/streampipes-rest/src/main/java/org/apache/streampipes/rest/impl/datalake/DataLakeNoUserResourceV3.java
@@ -20,11 +20,10 @@ package org.apache.streampipes.rest.impl.datalake;
 
 import org.apache.streampipes.model.schema.EventSchema;
 import org.apache.streampipes.rest.impl.AbstractRestInterface;
-import org.apache.streampipes.rest.shared.annotation.GsonWithIds;
+import org.apache.streampipes.rest.shared.annotation.JacksonSerialized;
 
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 
 @Path("/v3/noauth/datalake")
@@ -36,12 +35,10 @@ public class DataLakeNoUserResourceV3 extends 
AbstractRestInterface {
         this.dataLakeManagement = new DataLakeNoUserManagementV3();
     }
 
-    public DataLakeNoUserResourceV3(DataLakeNoUserManagementV3 
dataLakeManagement) {
-        this.dataLakeManagement = dataLakeManagement;
-    }
-
     @POST
-    @GsonWithIds
+    @JacksonSerialized
+    @Produces(MediaType.APPLICATION_JSON)
+    @Consumes(MediaType.APPLICATION_JSON)
     @Path("/{measure}")
     public Response addDataLake(@PathParam("measure") String measure, 
EventSchema eventSchema) {
         if (this.dataLakeManagement.addDataLake(measure, eventSchema)) {
diff --git 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
index 37c380f..fe9bf8b 100644
--- 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
+++ 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.html
@@ -31,69 +31,70 @@
             </div>
         </div>
         <div fxFlex="100" fxLayout="column" fxLayoutAlign="start start" 
class="sp-blue-border">
+            <div fxFlex="100" fxLayout="column" class="w-100 p-2">
+                <table mat-table [dataSource]="dataSource" 
multiTemplateDataRows>
 
-            <table fxFlex="95" mat-table [dataSource]="dataSource" 
multiTemplateDataRows>
+                    <ng-container matColumnDef="name">
+                        <th fxFlex="60" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Dashboard</th>
+                        <td fxFlex="60" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
+                            {{element.name}}<br/>
+                            {{element.description}}
+                        </td>
+                    </ng-container>
 
-                <ng-container matColumnDef="name">
-                    <th fxFlex="60" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Dashboard</th>
-                    <td fxFlex="60" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
-                        {{element.name}}<br/>
-                        {{element.description}}
-                    </td>
-                </ng-container>
+                    <ng-container matColumnDef="open">
+                        <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Show</th>
+                        <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
+                            <div fxLayout="row">
+                                <button mat-button mat-icon-button 
color="primary"
+                                        (click)="showDashboard(element)">
+                                    <i class="material-icons">visibility</i>
+                                </button>
+                            </div>
+                        </td>
+                    </ng-container>
 
-                <ng-container matColumnDef="open">
-                    <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Show</th>
-                    <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
-                        <div fxLayout="row">
-                            <button mat-button mat-icon-button color="primary"
-                                    (click)="showDashboard(element)">
-                                <i class="material-icons">visibility</i>
-                            </button>
-                        </div>
-                    </td>
-                </ng-container>
+                    <ng-container matColumnDef="openWindow">
+                        <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Window</th>
+                        <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
+                            <div fxLayout="row">
+                                <button mat-button mat-icon-button 
color="primary"
+                                        
(click)="openExternalDashboard(element)">
+                                    <i class="material-icons">open_in_new</i>
+                                </button>
+                            </div>
+                        </td>
+                    </ng-container>
 
-                <ng-container matColumnDef="openWindow">
-                    <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Window</th>
-                    <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
-                        <div fxLayout="row">
-                            <button mat-button mat-icon-button color="primary"
-                                    (click)="openExternalDashboard(element)">
-                                <i class="material-icons">open_in_new</i>
-                            </button>
-                        </div>
-                    </td>
-                </ng-container>
+                    <ng-container matColumnDef="edit">
+                        <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Edit</th>
+                        <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
+                            <div fxLayout="row">
+                                <button mat-button mat-icon-button 
color="primary"
+                                        
(click)="openEditDashboardDialog(element)">
+                                    <i class="material-icons">edit</i>
+                                </button>
+                            </div>
+                        </td>
+                    </ng-container>
 
-                <ng-container matColumnDef="edit">
-                    <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Edit</th>
-                    <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
-                        <div fxLayout="row">
-                            <button mat-button mat-icon-button color="primary"
-                                    (click)="openEditDashboardDialog(element)">
-                                <i class="material-icons">edit</i>
-                            </button>
-                        </div>
-                    </td>
-                </ng-container>
+                    <ng-container matColumnDef="delete">
+                        <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Delete</th>
+                        <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
+                            <div fxLayout="row">
+                                <button mat-button mat-icon-button 
color="primary"
+                                        
(click)="openDeleteDashboardDialog(element)">
+                                    <i class="material-icons">delete</i>
+                                </button>
+                            </div>
+                        </td>
+                    </ng-container>
 
-                <ng-container matColumnDef="delete">
-                    <th fxFlex="10" fxLayoutAlign="start center" 
mat-header-cell *matHeaderCellDef> Delete</th>
-                    <td fxFlex="10" fxLayoutAlign="start center" mat-cell 
*matCellDef="let element">
-                        <div fxLayout="row">
-                            <button mat-button mat-icon-button color="primary"
-                                    
(click)="openDeleteDashboardDialog(element)">
-                                <i class="material-icons">delete</i>
-                            </button>
-                        </div>
-                    </td>
-                </ng-container>
-
-                <tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
-                <tr mat-row *matRowDef="let element; columns: 
displayedColumns;">
-                </tr>
-            </table>
+                    <tr mat-header-row 
*matHeaderRowDef="displayedColumns"></tr>
+                    <tr mat-row *matRowDef="let element; columns: 
displayedColumns;">
+                    </tr>
+                </table>
+            </div>
         </div>
     </div>
 </div>
\ No newline at end of file
diff --git 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.css
 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.scss
similarity index 73%
rename from 
ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.css
rename to 
ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.scss
index dc9cc49..33f12d5 100644
--- 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.css
+++ 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.scss
@@ -20,6 +20,30 @@ table {
     width:100%;
 }
 
+.mat-table {
+    background: #FAFAFA;
+}
+
+.mat-paginator {
+    border-top: 1px solid rgba(0,0,0,.12);
+    background: #FAFAFA;
+}
+
+.mat-row:nth-child(even) {
+    background-color: #FAFAFA;
+}
+.mat-row:nth-child(odd) {
+    background-color:#ffffff;
+}
+
+.w-100 {
+    width: 100%;
+}
+
+.p-2 {
+    padding: 2px;
+}
+
 .m-20 {
     margin: 20px;
 }
\ No newline at end of file
diff --git 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
index d560197..b236212 100644
--- 
a/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
+++ 
b/ui/src/app/data-explorer/components/overview/data-explorer-dashboard-overview.component.ts
@@ -26,7 +26,7 @@ import { DataViewDataExplorerService } from 
'../../services/data-view-data-explo
 @Component({
     selector: 'sp-data-explorer-dashboard-overview',
     templateUrl: './data-explorer-dashboard-overview.component.html',
-    styleUrls: ['./data-explorer-dashboard-overview.component.css']
+    styleUrls: ['./data-explorer-dashboard-overview.component.scss']
 })
 export class DataExplorerDashboardOverviewComponent implements OnInit {
 

Reply via email to