[incubator-streampipes] branch dev updated: [hotfix] Sort visualizable pipeline by pipeline name

[riemer]

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

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


The following commit(s) were added to refs/heads/dev by this push:
     new 2a8a74c  [hotfix] Sort visualizable pipeline by pipeline name
2a8a74c is described below

commit 2a8a74c1bb399a97dd530ba37b001c4f4ecb0884
Author: Dominik Riemer <rie...@fzi.de>
AuthorDate: Tue May 25 18:23:29 2021 +0200

    [hotfix] Sort visualizable pipeline by pipeline name
---
 .../add-visualization-dialog.component.ts          | 36 ++++++++++------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git 
a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts 
b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
index 23b4241..a42d819 100644
--- 
a/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
+++ 
b/ui/src/app/dashboard/dialogs/add-widget/add-visualization-dialog.component.ts
@@ -16,17 +16,18 @@
  *
  */
 
-import {AfterViewInit, ChangeDetectorRef, Component, Inject, Input, OnInit} 
from '@angular/core';
-import { ElementIconText } from 
'../../../services/get-element-icon-text.service';
-import { Dashboard } from '../../models/dashboard.model';
-import { WidgetConfigBuilder } from '../../registry/widget-config-builder';
-import { WidgetRegistry } from '../../registry/widget-registry';
-import { MappingPropertyGenerator } from 
'../../sdk/matching/mapping-property-generator';
-import { DashboardService } from '../../services/dashboard.service';
+import {AfterViewInit, ChangeDetectorRef, Component, Input, OnInit} from 
'@angular/core';
+import {ElementIconText} from 
'../../../services/get-element-icon-text.service';
+import {Dashboard} from '../../models/dashboard.model';
+import {WidgetConfigBuilder} from '../../registry/widget-config-builder';
+import {WidgetRegistry} from '../../registry/widget-registry';
+import {MappingPropertyGenerator} from 
'../../sdk/matching/mapping-property-generator';
+import {DashboardService} from '../../services/dashboard.service';
 import {
     DashboardWidgetModel,
     DashboardWidgetSettings,
-    EventPropertyUnion, EventSchema,
+    EventPropertyUnion,
+    EventSchema,
     FreeTextStaticProperty,
     MappingPropertyNary,
     MappingPropertyUnary,
@@ -121,20 +122,17 @@ export class AddVisualizationDialogComponent implements 
OnInit, AfterViewInit {
 
     loadVisualizablePipelines() {
         
this.dashboardService.getVisualizablePipelines().subscribe(visualizations => {
-            this.visualizablePipelines = [];
-            visualizations.forEach(vis => {
-                
this.pipelineService.getPipelineById(vis.pipelineId).subscribe(pipeline => {
-                    vis.pipelineName = pipeline.name;
-                    this.visualizablePipelines.push(vis);
-                    this.sortPipeline();
-                });
-            });
+            this.visualizablePipelines = this.sortPipeline(visualizations);
         });
     }
 
-    sortPipeline() {
-        this.visualizablePipelines.sort((a, b) => {
-            return a.pipelineName < b.pipelineName ? -1 : 1;
+    sortPipeline(visualizations: Array<VisualizablePipeline>): 
Array<VisualizablePipeline> {
+        return visualizations.sort((a, b) => {
+            if (a.pipelineName === b.pipelineName) {
+                return a.visualizationName.toLowerCase() < 
b.visualizationName.toLowerCase() ? -1 : 1;
+            } else {
+                return a.pipelineName.toLowerCase() < 
b.pipelineName.toLowerCase() ? -1 : 1;
+            }
         });
     }