fixed searching pipelines and loading flows; fix #SNRGY-3012, #SNRGY-…

…2998
SENERGY-Platform · Dec 1, 2023 · 3d40ab3 · 3d40ab3
1 parent ddff1a0
commit 3d40ab3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/app/modules/data/flow-repo/flow-repo.component.html b/src/app/modules/data/flow-repo/flow-repo.component.html
@@ -62,7 +62,7 @@
                                     </mat-icon>
                                 </div>
                                 <div class="truncate footer-item-subtitle" fxLayout="column">
-                                    <div *ngIf="costService.userMayGetFlowCostEstimations()">
+                                    <div *ngIf="costService.userMayGetFlowCostEstimations() && flowEstimations.length>0">
                                         <div *ngIf=" flowEstimations[i].max > 0" matTooltipClass="multiline-tooltip" matTooltip="Median: {{flowEstimations[i].median | currency:'EUR'}}; Mean: {{flowEstimations[i].mean | currency:'EUR'}}">
                                             {{flowEstimations[i].min | currency:'EUR'}} - {{flowEstimations[i].max |
                                             currency:'EUR'}}

diff --git a/src/app/modules/data/pipeline-registry/pipeline-registry.component.ts b/src/app/modules/data/pipeline-registry/pipeline-registry.component.ts
@@ -75,7 +75,8 @@ export class PipelineRegistryComponent implements OnInit, AfterViewInit {
 
     initSearch() {
         this.searchSub = this.searchbarService.currentSearchText.subscribe((searchText: string) => {
-            this.pipelineRegistryService.getPipelines('createdat:desc').subscribe((resp: PipelineModel[]) => {
+            var order = this.sortBy + ':' + this.sortDirection
+            this.pipelineRegistryService.getPipelines(order).subscribe((resp: PipelineModel[]) => {
                 if(searchText != ""){
                     resp = resp.filter(pipeline => (pipeline.name.search(searchText) != -1))
                 }