From c184b21a3cf6244a4b9b561946f8fe13ffda8397 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Mon, 1 Apr 2024 11:10:49 -0400 Subject: [PATCH 01/12] fix: remove selected scene when filtered out --- .../baseline-chart/baseline-chart.component.ts | 2 ++ .../scenes-list/scenes-list.component.ts | 15 +++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/src/app/components/baseline-chart/baseline-chart.component.ts b/src/app/components/baseline-chart/baseline-chart.component.ts index 59748098d..9da87869d 100644 --- a/src/app/components/baseline-chart/baseline-chart.component.ts +++ b/src/app/components/baseline-chart/baseline-chart.component.ts @@ -104,6 +104,8 @@ export class BaselineChartComponent implements OnInit, OnDestroy { if (selected) { const selectedPoint = this.productToPoint(selected); this.setDataset(ChartDatasets.SELECTED, [selectedPoint]); + } else { + this.setDataset(ChartDatasets.SELECTED, []) } this.setDataset(ChartDatasets.PRODUCTS, points); diff --git a/src/app/components/results-menu/scenes-list/scenes-list.component.ts b/src/app/components/results-menu/scenes-list/scenes-list.component.ts index 7f5229156..499dea38f 100644 --- a/src/app/components/results-menu/scenes-list/scenes-list.component.ts +++ b/src/app/components/results-menu/scenes-list/scenes-list.component.ts @@ -361,6 +361,21 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit ) ); + this.subs.add( + combineLatest([ + this.scenesService.scenes$, + this.store$.select(scenesStore.getSelectedScene) + ]).subscribe(([scenes, selectedScene]: any) => { + if(scenes) { + if(scenes.slice(0, this.numberProductsInList).findIndex((value) => { + return value.id === selectedScene.id; + }) === -1) { + this.selectedFromList = false; + this.store$.dispatch(new scenesStore.SetSelectedScene(null)) + } + } + }) + ) } ngAfterContentInit() { From 2275906c2d2d7d31aa59af650ca5c790613629e3 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Mon, 1 Apr 2024 11:43:58 -0400 Subject: [PATCH 02/12] fix: sbas clear selected on filtered out --- .../scenes-list/scenes-list.component.ts | 25 +++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/src/app/components/results-menu/scenes-list/scenes-list.component.ts b/src/app/components/results-menu/scenes-list/scenes-list.component.ts index 499dea38f..73d2c6b00 100644 --- a/src/app/components/results-menu/scenes-list/scenes-list.component.ts +++ b/src/app/components/results-menu/scenes-list/scenes-list.component.ts @@ -365,8 +365,10 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit combineLatest([ this.scenesService.scenes$, this.store$.select(scenesStore.getSelectedScene) - ]).subscribe(([scenes, selectedScene]: any) => { - if(scenes) { + ]).pipe( + debounceTime(50), + ).subscribe(([scenes, selectedScene]: any) => { + if(scenes && selectedScene) { if(scenes.slice(0, this.numberProductsInList).findIndex((value) => { return value.id === selectedScene.id; }) === -1) { @@ -376,6 +378,25 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit } }) ) + + this.subs.add( + combineLatest([ + this.pairService.pairs$, + this.store$.select(scenesStore.getSelectedPair) + ]).pipe( + debounceTime(50) + ).subscribe(([pairs, selectedPair]: any) => { + if(!selectedPair){ + return + } + if([...pairs.pairs, ...pairs.custom].findIndex((value) => { + return value[0].id === selectedPair[0].id && value[1].id === selectedPair[1].id + }) === -1) { + this.selectedFromList = false; + this.store$.dispatch(new scenesStore.SetSelectedPair(null)) + } + }) + ) } ngAfterContentInit() { From 7fb0431f724b84d7ac3fa4705cd67f8fe9b89083 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Thu, 25 Apr 2024 14:35:56 -0400 Subject: [PATCH 03/12] fix: scene memoize function no longer checks order --- src/app/store/scenes/scenes.reducer.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/store/scenes/scenes.reducer.ts b/src/app/store/scenes/scenes.reducer.ts index 8926b8726..a93f65724 100644 --- a/src/app/store/scenes/scenes.reducer.ts +++ b/src/app/store/scenes/scenes.reducer.ts @@ -426,12 +426,14 @@ function arrayEquals(a, b) { return Array.isArray(a) && Array.isArray(b) && a.length === b.length && - a.toString() === b.toString() && a.every((value, index) => { if(Array.isArray(value) && Array.isArray(b[index])) { return arrayEquals(value, b[index]) } else { - value.id === b[index].id + return b.findIndex((b_value) => + { + return b_value?.id === value?.id + }) >= 0 } } ) From 37eb7271dac5ddeae981d837d08e6bb3ce506d86 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Mon, 29 Apr 2024 10:51:47 -0400 Subject: [PATCH 04/12] fix: sbas RTC job use pair's products --- src/app/services/possible-hyp3-jobs.service.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/services/possible-hyp3-jobs.service.ts b/src/app/services/possible-hyp3-jobs.service.ts index 07b592cd3..8c5c2c1f0 100644 --- a/src/app/services/possible-hyp3-jobs.service.ts +++ b/src/app/services/possible-hyp3-jobs.service.ts @@ -40,7 +40,9 @@ export class PossibleHyp3JobsService { )); private hyp3ableJobsSBAS$ = combineLatest([ - this.possibleProductJobs$, + this.pairService.productsFromPairs$.pipe(map( + products => products.map(p => [p]) + )), this.pairs$, ]).pipe( map(([possibleJobs, {pairs, custom}]) => { From 635185418d98b0c3287710cbef3eca98d68d1527 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Tue, 30 Apr 2024 14:59:54 -0700 Subject: [PATCH 05/12] DS5349 - Menu issue in the drawing toolbar for AOI on SMALL desktop --- README.md | 1 + src/app/components/header/header.component.scss | 4 ++-- .../aoi-options/draw-selector/draw-selector.component.html | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3d1e7877b..558afe185 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ Add the following line via the methods below to set up local.asf.alaska.edu to p | Windows | Modify c:\windows\system32\drivers\etc\hosts as Administrator | ``` ng serve --port 4444 --host local.asf.alaska.edu +ng serve --port 4445 --ssl true --host local.asf.alaska.edu ``` ### Setting up HTTPS diff --git a/src/app/components/header/header.component.scss b/src/app/components/header/header.component.scss index fe1527d4d..3ff683f81 100644 --- a/src/app/components/header/header.component.scss +++ b/src/app/components/header/header.component.scss @@ -48,9 +48,9 @@ $config: mat.define-legacy-typography-config(); height: auto; position: fixed; top: 100px; - z-index: 1; + z-index: 2; margin: 0; - padding: 3px 16px 16px; + padding: 3px 16px 25px; } .breadcrumb { diff --git a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html index 8070717ca..9dd3bc86a 100644 --- a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html +++ b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html @@ -72,6 +72,7 @@