finish release 1.3.2

kanton-bern · Dec 2, 2024 · 38debc0 · 38debc0
2 parents 2be6ec9 + df8a45a
commit 38debc0
Show file tree

Hide file tree

Showing 10 changed files with 557 additions and 420 deletions.
diff --git a/...data-portal-api/src/main/java/ch/bedag/dap/hellodata/portal/user/service/UserService.java b/...data-portal-api/src/main/java/ch/bedag/dap/hellodata/portal/user/service/UserService.java
@@ -399,7 +399,11 @@ public List<AdUserDto> searchUser(String email) {
         if (email == null || email.length() < 3) {
             return new ArrayList<>();
         }
-        return userLookupProviderManager.searchUserByEmail(email);
+        return userLookupProviderManager.searchUserByEmail(email)
+                .stream()
+                .collect(Collectors.toCollection(LinkedHashSet::new))
+                .stream()
+                .collect(Collectors.toList());
     }
 
     @Transactional(readOnly = true)

diff --git a/...tal/hello-data-portal-ui/src/app/pages/admin/users-overview/users-overview.component.html b/...tal/hello-data-portal-ui/src/app/pages/admin/users-overview/users-overview.component.html
@@ -14,13 +14,13 @@ <h2 class="content-block">{{ '@Users overview' | transloco }}</h2>
             <p-button (onClick)="reload()" [disabled]="(dataLoading$ | async) ?? false"
                       icon="pi pi-replay"
                       label="{{ '@Reload' | transloco }}"
-                      styleClass="p-button-rounded p-button-success"/>
+                      styleClass="p-button-success"/>
           </div>
           <div class="ml-1" style="text-align: left">
             <p-button (onClick)="clearCache()" [disabled]="(dataLoading$ | async) ?? false"
                       icon="pi pi-times-circle"
                       label="{{ '@Clear cache' | transloco }}"
-                      styleClass="p-button-rounded p-button-help"/>
+                      styleClass="p-button-help"/>
           </div>
         </div>
       </ng-template>
@@ -46,7 +46,8 @@ <h2 class="content-block">{{ '@Users overview' | transloco }}</h2>
           <td *ngFor="let col of columns">
             <ng-container
               *ngIf="shouldShowTag(row[col.field], row[col.field + NO_TAG]); else singleValue">
-              <p-tag *ngFor="let value of row[col.field].split(',')" [severity]="getTagSeverity(value)" [value]="value.trim()"
+              <p-tag *ngFor="let value of row[col.field].split(',')" [severity]="getTagSeverity(value)"
+                     [value]="value.trim()"
                      class="m-1"></p-tag>
             </ng-container>
             <ng-template #singleValue>

diff --git a/...data-portal/hello-data-portal-ui/src/app/shared/components/summary/summary.component.html b/...data-portal/hello-data-portal-ui/src/app/shared/components/summary/summary.component.html
@@ -8,37 +8,39 @@
         <p-accordion>
           <p-accordionTab header="Data pipelines">
             <p-dataView [value]="(pipelines$ | async)!" emptyMessage="{{ '@No data found' | transloco }}">
-              <ng-template let-pipeline pTemplate="listItem">
-                <div class="col-8">
-                  <!--                  <button (click)="navigateToDetails(pipeline)" class="p-button-link"-->
-                  <!--                          label="{{ pipeline.id | truncate: 30}}" placeholder="Left"-->
-                  <!--                          pButton tooltipPosition="left"-->
-                  <!--                          pTooltip="{{ pipeline.description ? pipeline.description : pipeline.id }}"-->
-                  <!--                          type="button">-->
-                  <!--                  </button>-->
-                  <label pTooltip="{{ pipeline.description ? pipeline.description : pipeline.id }}" placeholder="Left"
-                         style="font-size: 0.9rem; font-weight: 400"
-                         tooltipPosition="left">{{ pipeline.id | truncate: 20 }}</label>
-                </div>
-                <div class="col-3" style="font-size: 0.6rem; margin-top: 0.4rem">
+              <ng-template let-pipelines pTemplate="list">
+                <div *ngFor="let pipeline of pipelines; let first = first" class="p-grid grid">
+                  <div class="col-8">
+                    <!--                  <button (click)="navigateToDetails(pipeline)" class="p-button-link"-->
+                    <!--                          label="{{ pipeline.id | truncate: 30}}" placeholder="Left"-->
+                    <!--                          pButton tooltipPosition="left"-->
+                    <!--                          pTooltip="{{ pipeline.description ? pipeline.description : pipeline.id }}"-->
+                    <!--                          type="button">-->
+                    <!--                  </button>-->
+                    <label pTooltip="{{ pipeline.description ? pipeline.description : pipeline.id }}" placeholder="Left"
+                           style="font-size: 0.9rem; font-weight: 400"
+                           tooltipPosition="left">{{ pipeline.id | truncate: 20 }}</label>
+                  </div>
+                  <div class="col-3" style="font-size: 0.6rem; margin-top: 0.4rem">
                   <span
-                    *ngIf="pipeline.lastInstance.startDate">{{ pipeline.lastInstance.startDate * 1000 | date: 'dd.MM.yyyy HH:mm:ss' }}</span>
-                </div>
-                <div [ngSwitch]="pipeline.lastInstance.state" class="col-1">
+                    *ngIf="pipeline?.lastInstance?.startDate">{{ pipeline.lastInstance.startDate * 1000 | date: 'dd.MM.yyyy HH:mm:ss' }}</span>
+                  </div>
+                  <div *ngIf="pipeline?.lastInstance" [ngSwitch]="pipeline.lastInstance.state" class="col-1">
                   <span *ngSwitchCase="'queued'" [pTooltip]="pipeline.lastInstance.state"
                         class="align-items-end pi pi-hourglass"
                         style="color: gray"></span>
-                  <span *ngSwitchCase="'running'" [pTooltip]="pipeline.lastInstance.state"
-                        class="align-items-end pi pi-spin pi-cog"
-                        style="color: green"></span>
-                  <span *ngSwitchCase="'success'" [pTooltip]="pipeline.lastInstance.state"
-                        class="align-items-end pi pi-check-circle"
-                        style="color: green"></span>
-                  <span *ngSwitchCase="'failed'" [pTooltip]="pipeline.lastInstance.state"
-                        class="align-items-end pi pi-exclamation-circle"
-                        style="color: red"></span>
-                  <span *ngSwitchDefault [pTooltip]="'unknown'" class="align-items-end pi pi-question-circle"
-                        style="color: gray"></span>
+                    <span *ngSwitchCase="'running'" [pTooltip]="pipeline.lastInstance.state"
+                          class="align-items-end pi pi-spin pi-cog"
+                          style="color: green"></span>
+                    <span *ngSwitchCase="'success'" [pTooltip]="pipeline.lastInstance.state"
+                          class="align-items-end pi pi-check-circle"
+                          style="color: green"></span>
+                    <span *ngSwitchCase="'failed'" [pTooltip]="pipeline.lastInstance.state"
+                          class="align-items-end pi pi-exclamation-circle"
+                          style="color: red"></span>
+                    <span *ngSwitchDefault [pTooltip]="'unknown'" class="align-items-end pi pi-question-circle"
+                          style="color: gray"></span>
+                  </div>
                 </div>
               </ng-template>
             </p-dataView>

diff --git a/hello-data-portal/hello-data-portal-ui/src/app/shared/pipes/truncate.pipe.ts b/hello-data-portal/hello-data-portal-ui/src/app/shared/pipes/truncate.pipe.ts
@@ -32,9 +32,13 @@ import {Pipe, PipeTransform} from '@angular/core';
 })
 export class TruncatePipe implements PipeTransform {
   transform(value: string, limit = 25, completeWords = false, ellipsis = '...') {
+    if (!value) {
+      return '';
+    }
     if (completeWords) {
       limit = value.substr(0, limit).lastIndexOf(' ');
     }
+    console.log('inside truncate pipe', value)
     return value.length > limit ? value.substr(0, limit) + ellipsis : value;
   }
 }