-
-
+
-
-
+
-
-
+
-
-
- {{ 'REFERENCE' | translate }} -
- {{ 'SELECTED' | translate }} -
- {{ 'DOWNLOADS' | translate }} +
- + + {{ 'REFERENCE' | translate }} + +
- + + {{ 'SELECTED' | translate }} + +
- + + {{ 'DOWNLOADS' | translate }} +
- - {{ 'CRITICAL_BASELINE_ABBR' | translate }} + + {{ 'CRITICAL_BASELINE_ABBR' | translate }}
- - {{ 'CRITICAL_BASELINE' | translate }} + + {{ 'CRITICAL_BASELINE' | translate }}
-
+
-
-
+ [class.raised-section]="isSelected(panels.MASTER)"
+ >
+
- {{ 'SCENE' | translate}}
+ {{ 'SCENE' | translate }}
-
+
-
- @if (shouldUseFramesForReference) {
-
-
-
- {{ 'DATA_FILTERS' | translate}}
-
+ [class.raised-section]="isSelected(panels.DATE)"
+ >
+
+
+ {{ 'DATA_FILTERS' | translate }}
+
-
+
+ @if (shouldUseFramesForReference) {
+
- {{ 'EXAMPLE' | translate}}: S1A_IW_SLC__1SSV_20150601T010209_20150601T010236_006173_00808F_20A0
+ {{ 'EXAMPLE' | translate }}:
+ S1A_IW_SLC__1SSV_20150601T010209_20150601T010236_006173_00808F_20A0
-
+ value="S1A_IW_SLC__1SSV_20150601T010209_20150601T010236_006173_00808F_20A0"
+ prompt="{{ 'COPY_NAME' | translate }}"
+ style="margin: 0 3px"
+ class="clipboard-icon"
+ >
+
-
+
-
+
+
-
-
- {{ 'BASELINE_CRITERIA' | translate}}
-
+ [class.raised-section]="isSelected(panels.BASELINE)"
+ >
+
+
+ {{ 'BASELINE_CRITERIA' | translate }}
+
diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.ts b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.ts
index 2f96e7309..2961d40b3 100644
--- a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.ts
+++ b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, inject } from '@angular/core';
import { AppState } from '@store';
import { Store } from '@ngrx/store';
@@ -14,24 +14,26 @@ enum FilterPanel {
MASTER = 'Master',
DATE = 'Date',
BASELINE = 'Baseline',
- SEARCH = 'Search'
+ SEARCH = 'Search',
}
@Component({
selector: 'app-baseline-filters',
templateUrl: './baseline-filters.component.html',
- styleUrls: ['./baseline-filters.component.scss']
+ styleUrls: ['./baseline-filters.component.scss'],
})
export class BaselineFiltersComponent implements OnInit, OnDestroy {
+ private store$ = inject>(Store);
+ private screenSize = inject(ScreenSizeService);
+
public breakpoint$ = this.screenSize.breakpoint$;
public breakpoints = models.Breakpoints;
public areResultsLoaded: boolean;
-
public datasets = [beta];
- public selectedDataset = 'SENTINEL-1 INTERFEROGRAM (BETA)'
+ public selectedDataset = 'SENTINEL-1 INTERFEROGRAM (BETA)';
public masterScene: string;
- public shouldUseFramesForReference: boolean = false;
+ public shouldUseFramesForReference = false;
selectedPanel: FilterPanel | null = null;
panels = FilterPanel;
@@ -42,21 +44,19 @@ export class BaselineFiltersComponent implements OnInit, OnDestroy {
private subs = new SubSink();
- constructor(
- private store$: Store,
- private screenSize: ScreenSizeService
- ) { }
-
ngOnInit() {
this.subs.add(
- this.store$.select(scenesStore.getAreResultsLoaded).subscribe(
- areLoaded => this.areResultsLoaded = areLoaded
- )
+ this.store$
+ .select(scenesStore.getAreResultsLoaded)
+ .subscribe((areLoaded) => (this.areResultsLoaded = areLoaded)),
);
this.subs.add(
- this.store$.select(filtersStore.getShouldUseFramesForReference).subscribe(
- shouldUseFrames => this.shouldUseFramesForReference = shouldUseFrames
- )
+ this.store$
+ .select(filtersStore.getShouldUseFramesForReference)
+ .subscribe(
+ (shouldUseFrames) =>
+ (this.shouldUseFramesForReference = shouldUseFrames),
+ ),
);
}
@@ -64,7 +64,7 @@ export class BaselineFiltersComponent implements OnInit, OnDestroy {
return this.selectedPanel === panel;
}
-public onDatasetChange(dataset: string): void {
+ public onDatasetChange(dataset: string): void {
this.store$.dispatch(new filtersStore.SetSelectedDataset(dataset));
}
public selectPanel(panel: FilterPanel): void {
diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts
index a120b2309..7fe348e22 100644
--- a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts
+++ b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts
@@ -2,7 +2,7 @@ import { NgModule } from '@angular/core';
import { CommonModule } from '@angular/common';
import { MatExpansionModule } from '@angular/material/expansion';
-import {MatSharedModule, SharedModule} from '@shared';
+import { MatSharedModule, SharedModule } from '@shared';
import { SeasonSelectorModule } from '@components/shared/selectors/season-selector';
import { DateSelectorModule } from '@components/shared/selectors/date-selector';
import { BaselineFiltersComponent } from './baseline-filters.component';
@@ -10,28 +10,26 @@ import { MasterSceneSelectorModule } from '@components/shared/selectors/master-s
import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector';
import { BaselineSlidersModule } from './baseline-sliders';
import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard';
-import {DocsModalModule} from '@components/shared/docs-modal';
+import { DocsModalModule } from '@components/shared/docs-modal';
import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle';
import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector';
@NgModule({
declarations: [BaselineFiltersComponent],
- imports: [
- CommonModule,
- MatExpansionModule,
- MatSharedModule,
- SeasonSelectorModule,
- MasterSceneSelectorModule,
- DateSelectorModule,
- SearchTypeSelectorModule,
- BaselineSlidersModule,
- CopyToClipboardModule,
- DocsModalModule,
- SharedModule,
- BaselineFrameReferenceToggleComponent,
- DatasetSelectorModule,
- ],
- exports: [
- BaselineFiltersComponent,
- ]
+ imports: [
+ CommonModule,
+ MatExpansionModule,
+ MatSharedModule,
+ SeasonSelectorModule,
+ MasterSceneSelectorModule,
+ DateSelectorModule,
+ SearchTypeSelectorModule,
+ BaselineSlidersModule,
+ CopyToClipboardModule,
+ DocsModalModule,
+ SharedModule,
+ BaselineFrameReferenceToggleComponent,
+ DatasetSelectorModule,
+ ],
+ exports: [BaselineFiltersComponent],
})
-export class BaselineFiltersModule { }
+export class BaselineFiltersModule {}
diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.html b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.html
index bb44e5c35..9abcfa9b4 100644
--- a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.html
+++ b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.html
@@ -1,6 +1,8 @@
diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.ts b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.ts
index d6e6e31a6..30883b18a 100644
--- a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.ts
+++ b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.component.ts
@@ -1,8 +1,21 @@
-import { Component, OnInit, ViewChild, ElementRef, OnDestroy } from '@angular/core';
+import {
+ Component,
+ OnInit,
+ ViewChild,
+ ElementRef,
+ OnDestroy,
+ inject,
+} from '@angular/core';
import noUiSlider from 'nouislider';
import { Observable, Subject } from 'rxjs';
-import { delay, debounceTime, distinctUntilChanged, take, filter } from 'rxjs/operators';
+import {
+ delay,
+ debounceTime,
+ distinctUntilChanged,
+ take,
+ filter,
+} from 'rxjs/operators';
import { AppState } from '@store';
import { Store } from '@ngrx/store';
import * as filtersStore from '@store/filters';
@@ -19,11 +32,14 @@ export interface BaselineSlider {
@Component({
selector: 'app-baseline-sliders',
templateUrl: './baseline-sliders.component.html',
- styleUrls: ['./baseline-sliders.component.scss']
+ styleUrls: ['./baseline-sliders.component.scss'],
})
export class BaselineSlidersComponent implements OnInit, OnDestroy {
+ private store$ = inject>(Store);
+
@ViewChild('temporalFilter', { static: true }) temporalFilter: ElementRef;
- @ViewChild('perpendicularFilter', { static: true }) perpendicularFilter: ElementRef;
+ @ViewChild('perpendicularFilter', { static: true })
+ perpendicularFilter: ElementRef;
public tempRange: models.Range;
public perpRange: models.Range;
@@ -33,10 +49,6 @@ export class BaselineSlidersComponent implements OnInit, OnDestroy {
private subs = new SubSink();
- constructor(
- private store$: Store,
- ) { }
-
ngOnInit(): void {
// this.store$.dispatch(new filtersStore.ClearPerpendicularRange());
const perpBaselineSlider = this.makeSlider$(this.perpendicularFilter);
@@ -46,16 +58,14 @@ export class BaselineSlidersComponent implements OnInit, OnDestroy {
this.perpSlider = perpSlider;
this.subs.add(
- perpValues$.subscribe(
- ([start, end]) => {
- if (start === this.perpRange.start && end === this.perpRange.end) {
- return;
- }
-
- const action = new filtersStore.SetPerpendicularRange({ start, end });
- this.store$.dispatch(action);
+ perpValues$.subscribe(([start, end]) => {
+ if (start === this.perpRange.start && end === this.perpRange.end) {
+ return;
}
- )
+
+ const action = new filtersStore.SetPerpendicularRange({ start, end });
+ this.store$.dispatch(action);
+ }),
);
const tempBaselineSlider = this.makeSlider$(this.temporalFilter);
@@ -64,83 +74,83 @@ export class BaselineSlidersComponent implements OnInit, OnDestroy {
this.tempSlider = tempSlider;
this.subs.add(
- tempValues$.subscribe(
- ([start, end]) => {
- if (start === this.tempRange.start && end === this.tempRange.end) {
- return;
- }
-
- const action = new filtersStore.SetTemporalRange({ start, end });
- this.store$.dispatch(action);
+ tempValues$.subscribe(([start, end]) => {
+ if (start === this.tempRange.start && end === this.tempRange.end) {
+ return;
}
- )
+
+ const action = new filtersStore.SetTemporalRange({ start, end });
+ this.store$.dispatch(action);
+ }),
);
- this.store$.select(filtersStore.getTemporalRange).pipe(
- take(1),
- filter(range => range.start !== null && range.end !== null),
- ).subscribe(
- temp => {
+ this.store$
+ .select(filtersStore.getTemporalRange)
+ .pipe(
+ take(1),
+ filter((range) => range.start !== null && range.end !== null),
+ )
+ .subscribe((temp) => {
this.setRangeOnSlider(this.tempSlider, temp);
- }
- );
+ });
this.subs.add(
- this.store$.select(scenesStore.getTemporalExtrema).pipe(
- filter(range => range.min !== null && range.max !== null),
- delay(20)
- ).subscribe(
- range => {
+ this.store$
+ .select(scenesStore.getTemporalExtrema)
+ .pipe(
+ filter((range) => range.min !== null && range.max !== null),
+ delay(20),
+ )
+ .subscribe((range) => {
this.tempSlider.updateOptions({ range });
this.tempSlider.set([
this.tempRange.start === null ? range.min : null,
- this.tempRange.end === null ? range.max : null
+ this.tempRange.end === null ? range.max : null,
]);
- }
- )
+ }),
);
this.subs.add(
- this.store$.select(filtersStore.getTemporalRange).subscribe(
- temp => {
- this.tempRange = temp;
- tempSlider.set([temp.start, temp.end]);
- }
- )
+ this.store$.select(filtersStore.getTemporalRange).subscribe((temp) => {
+ this.tempRange = temp;
+ tempSlider.set([temp.start, temp.end]);
+ }),
);
- this.store$.select(filtersStore.getPerpendicularRange).pipe(
- take(1),
- filter(range => range.start !== null && range.end !== null)
- ).subscribe(
- perp => {
+ this.store$
+ .select(filtersStore.getPerpendicularRange)
+ .pipe(
+ take(1),
+ filter((range) => range.start !== null && range.end !== null),
+ )
+ .subscribe((perp) => {
this.setRangeOnSlider(this.perpSlider, perp);
- }
- );
+ });
this.subs.add(
- this.store$.select(scenesStore.getPerpendicularExtrema).pipe(
- filter(range => range.min !== null && range.max !== null),
- delay(20)
- ).subscribe(
- range => {
+ this.store$
+ .select(scenesStore.getPerpendicularExtrema)
+ .pipe(
+ filter((range) => range.min !== null && range.max !== null),
+ delay(20),
+ )
+ .subscribe((range) => {
this.perpSlider.updateOptions({ range });
this.perpSlider.set([
this.perpRange.start === null ? range.min : null,
- this.perpRange.end === null ? range.max : null
+ this.perpRange.end === null ? range.max : null,
]);
- }
- )
+ }),
);
this.subs.add(
- this.store$.select(filtersStore.getPerpendicularRange).subscribe(
- perp => {
+ this.store$
+ .select(filtersStore.getPerpendicularRange)
+ .subscribe((perp) => {
this.perpRange = perp;
perpSlider.set([perp.start, perp.end]);
- }
- )
+ }),
);
}
@@ -151,30 +161,29 @@ export class BaselineSlidersComponent implements OnInit, OnDestroy {
behaviour: 'drag',
connect: true,
range: {
- 'min': -999,
- 'max': 999
- }
+ min: -999,
+ max: 999,
+ },
});
slider.on('update', (values, _) => {
- values$.next(values.map(v => +v));
+ values$.next(values.map((v) => +v));
});
return {
slider,
- values: values$.asObservable().pipe(
- debounceTime(500),
- distinctUntilChanged()
- )
- };
+ values: values$
+ .asObservable()
+ .pipe(debounceTime(500), distinctUntilChanged()),
+ };
}
private setRangeOnSlider(slider, range): void {
slider.updateOptions({
range: {
min: range.start,
- max: range.end
- }
+ max: range.end,
+ },
});
slider.set([range.start, range.end]);
diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts
index 7966f2f32..bb21e7c7c 100644
--- a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts
+++ b/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts
@@ -4,13 +4,9 @@ import { CommonModule } from '@angular/common';
import { BaselineSlidersComponent } from './baseline-sliders.component';
import { SharedModule } from '@shared';
-
@NgModule({
declarations: [BaselineSlidersComponent],
- imports: [
- CommonModule,
- SharedModule
- ],
- exports: [BaselineSlidersComponent]
+ imports: [CommonModule, SharedModule],
+ exports: [BaselineSlidersComponent],
})
-export class BaselineSlidersModule { }
+export class BaselineSlidersModule {}
diff --git a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.html b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.html
index 173abc1fb..0bc40b87f 100644
--- a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.html
+++ b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.html
@@ -1,62 +1,83 @@
-
-
+ [class.raised-section]="isSelected(panels.SEARCH)"
+ >
+
- {{ panels.SEARCH | translate}}
+ {{ panels.SEARCH | translate }}
-
-
+
-
-
+ [class.raised-section]="isSelected(panels.DATE_FILTER)"
+ >
+
{{ 'DATE_FILTERS' | translate }}
-
+
-
+
-
-
+ [class.raised-section]="isSelected(panels.PROJECT_NAME)"
+ >
+
{{ 'JOB_FILTERS' | translate }}
-
- >(Store);
+ private screenSize = inject(ScreenSizeService);
+
public breakpoint$ = this.screenSize.breakpoint$;
public breakpoints = models.Breakpoints;
public areResultsLoaded: boolean;
@@ -35,22 +38,17 @@ export class CustomProductsFiltersComponent implements OnInit, OnDestroy {
private subs = new SubSink();
- constructor(
- private store$: Store,
- private screenSize: ScreenSizeService
- ) { }
-
ngOnInit(): void {
this.subs.add(
- this.store$.select(scenesStore.getAreResultsLoaded).subscribe(
- areLoaded => this.areResultsLoaded = areLoaded
- )
+ this.store$
+ .select(scenesStore.getAreResultsLoaded)
+ .subscribe((areLoaded) => (this.areResultsLoaded = areLoaded)),
);
this.subs.add(
- this.store$.select(hyp3Store.getHyp3JobIds).subscribe(
- jobId => this.hyp3JobIds = jobId
- )
+ this.store$
+ .select(hyp3Store.getHyp3JobIds)
+ .subscribe((jobId) => (this.hyp3JobIds = jobId)),
);
}
diff --git a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts
index 4090d2368..928538b49 100644
--- a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts
+++ b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts
@@ -10,7 +10,7 @@ import { CustomProductsFiltersComponent } from './custom-products-filters.compon
import { JobStatusSelectorModule } from '@components/shared/selectors/job-status-selector';
import { DateSelectorModule } from '@components/shared/selectors/date-selector';
import { JobProductNameSelectorModule } from '@components/shared/selectors/job-product-name-selector';
-import { OnDemandUserSelectorModule} from '@components/shared/selectors/on-demand-user-selector';
+import { OnDemandUserSelectorModule } from '@components/shared/selectors/on-demand-user-selector';
import { JobIdSelectorComponent } from './job-id-selector/job-id-selector.component';
import { SharedModule } from '@shared';
@@ -19,10 +19,7 @@ import { MatInputModule } from '@angular/material/input';
import { FormsModule } from '@angular/forms';
@NgModule({
- declarations: [
- CustomProductsFiltersComponent,
- JobIdSelectorComponent,
- ],
+ declarations: [CustomProductsFiltersComponent, JobIdSelectorComponent],
imports: [
CommonModule,
MatExpansionModule,
@@ -36,10 +33,8 @@ import { FormsModule } from '@angular/forms';
JobStatusSelectorModule,
JobProductNameSelectorModule,
OnDemandUserSelectorModule,
- SharedModule
+ SharedModule,
],
- exports: [
- CustomProductsFiltersComponent
- ]
+ exports: [CustomProductsFiltersComponent],
})
-export class CustomProductsFiltersModule { }
+export class CustomProductsFiltersModule {}
diff --git a/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.html b/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.html
index e9efcfab3..5c1fe0b45 100644
--- a/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.html
+++ b/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.html
@@ -1,14 +1,16 @@
-
diff --git a/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.ts b/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.ts
index 138cc517a..852a572a7 100644
--- a/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.ts
+++ b/src/app/components/filters-dropdown/custom-products-filters/job-id-selector/job-id-selector.component.ts
@@ -1,16 +1,16 @@
-import { Component, EventEmitter, Input, Output } from '@angular/core';
+import { Component, EventEmitter, Input, Output, inject } from '@angular/core';
import { NotificationService } from '@services';
@Component({
selector: 'app-job-id-selector',
templateUrl: './job-id-selector.component.html',
- styleUrl: './job-id-selector.component.scss'
+ styleUrl: './job-id-selector.component.scss',
})
export class JobIdSelectorComponent {
- @Input() jobIds: string[];
- @Output() newJobIds = new EventEmitter;
+ private notification = inject(NotificationService);
- constructor(private notification: NotificationService) {}
+ @Input() jobIds: string[];
+ @Output() newJobIds = new EventEmitter();
onJobIdsChange(event: Event) {
const jobIdsInput = (event.target as HTMLInputElement).value;
@@ -26,7 +26,8 @@ export class JobIdSelectorComponent {
}
private findJobIds(inputStr: string) {
- const jobIdRegex = /[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}/g;
+ const jobIdRegex =
+ /[0-9A-Fa-f]{8}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{4}-[0-9A-Fa-f]{12}/g;
const matches = inputStr.match(jobIdRegex);
return matches;
diff --git a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.html b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.html
index 7c57e41fd..ecf6033ca 100644
--- a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.html
+++ b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.html
@@ -1,103 +1,174 @@
-
-
+ [class.raised-section]="isSelected(panels.SEARCH)"
+ >
+
{{ 'SEARCH_OPTIONS' | translate }}
-
-
-
diff --git a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.ts b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.ts
index 09f35dc13..1a5ca4dd3 100644
--- a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.ts
+++ b/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.component.ts
@@ -1,4 +1,4 @@
-import { Component, OnInit, OnDestroy } from '@angular/core';
+import { Component, OnInit, OnDestroy, inject } from '@angular/core';
import { AppState } from '@store';
import { Store } from '@ngrx/store';
@@ -18,9 +18,12 @@ enum FilterPanel {
@Component({
selector: 'app-custom-products-filters',
templateUrl: './custom-products-filters.component.html',
- styleUrls: ['./custom-products-filters.component.scss']
+ styleUrls: ['./custom-products-filters.component.scss'],
})
export class CustomProductsFiltersComponent implements OnInit, OnDestroy {
+ private store$ = inject
+
-
+
+
-
+
-
-
-
- {{ 'AREA_OF_INTEREST_OPTIONS' | translate }}
-
+ [class.raised-section]="isSelected(panels.AOI)"
+ >
+
+
+ {{ 'AREA_OF_INTEREST_OPTIONS' | translate }}
+
-
-
+
+ [(selected)]="selectedDataset"
+ (selectedChange)="onDatasetChange($event)"
+ [datasets]="datasets"
+ >
+
+
-
-
+
{{ 'DATE_FILTERS' | translate }}
-
+
-
-
+
-
{{ 'CAMPAIGN_SELECTOR' | translate }}
@@ -122,33 +199,45 @@
-
-
- {{ 'SLC_BURST_FILTERS' | translate }}
-
-
-
+
+ {{ 'SLC_BURST_FILTERS' | translate }}
+
+
+
-
-
-
- OPERA S1 Filters
-
-
-
+
+
+ OPERA S1 Filters
+
+
+
diff --git a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.ts b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.ts
index 3b7181b39..fd8f63d86 100644
--- a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.ts
+++ b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.ts
@@ -1,9 +1,9 @@
-import { Component, Input, OnInit, OnDestroy } from '@angular/core';
+import { Component, Input, OnInit, OnDestroy, inject } from '@angular/core';
import { SubSink } from 'subsink';
import { Store } from '@ngrx/store';
-import { AppState } from '@store';
+import { AppState } from '@store/app.reducer';
import * as filtersStore from '@store/filters';
import * as models from '@models';
@@ -12,19 +12,24 @@ import { PropertyService, ScreenSizeService } from '@services';
enum FilterPanel {
DATE = 'Date',
+ PRODUCT = 'Product',
ADDITIONAL = 'Additional',
CAMPAIGN = 'Campaign',
PATH = 'Path',
AOI = 'Aoi',
- SEARCH = 'Search'
+ SEARCH = 'Search',
}
@Component({
selector: 'app-dataset-filters',
templateUrl: './dataset-filters.component.html',
- styleUrls: ['./dataset-filters.component.scss']
+ styleUrls: ['./dataset-filters.component.scss'],
})
export class DatasetFiltersComponent implements OnInit, OnDestroy {
+ prop = inject(PropertyService);
+ private store$ = inject>(Store);
+ private screenSize = inject(ScreenSizeService);
+
@Input() dataset: models.CMRProduct;
@Input() selectedPanel: FilterPanel | null = null;
@@ -41,22 +46,13 @@ export class DatasetFiltersComponent implements OnInit, OnDestroy {
public breakpoint$ = this.screenSize.breakpoint$;
public breakpoints = models.Breakpoints;
-
-
private subs = new SubSink();
- constructor(
- public prop: PropertyService,
- private store$: Store,
- private screenSize: ScreenSizeService,
- // public translate: TranslateService,
- ) {}
-
ngOnInit() {
this.subs.add(
- this.store$.select(filtersStore.getSelectedDatasetId).subscribe(
- selected => this.selectedDataset = selected
- )
+ this.store$
+ .select(filtersStore.getSelectedDatasetId)
+ .subscribe((selected) => (this.selectedDataset = selected)),
);
}
diff --git a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts
index 5c8c537c0..4a3c90f8a 100644
--- a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts
+++ b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts
@@ -19,17 +19,17 @@ import { AoiOptionsModule } from '@components/shared/aoi-options';
import { DocsModalModule } from '@components/shared/docs-modal';
import { BurstSelectorModule } from '@components/shared/selectors/burst-selector';
import { OperaS1SelectorModule } from '@components/shared/selectors/opera-s1-selector';
+import { ObservationPanelSelectorModule } from '@components/shared/selectors/observation-panel-selector';
// import { TranslateModule } from "@ngx-translate/core";
-import { SharedModule } from "@shared";
+import { SharedModule } from '@shared';
+import { ProductScienceSelectorComponent } from '@components/shared/selectors/product-science-selector/product-science-selector.component';
+import { ProductionConfigSelectorComponent } from '@components/shared/selectors/production-config-selector/production-config-selector.component';
@NgModule({
- declarations: [
- DatasetFiltersComponent,
- ],
+ declarations: [DatasetFiltersComponent],
imports: [
CommonModule,
FormsModule,
-
MatSelectModule,
MatExpansionModule,
MatSharedModule,
@@ -46,9 +46,10 @@ import { SharedModule } from "@shared";
OperaS1SelectorModule,
SharedModule,
// TranslateModule
+ ObservationPanelSelectorModule,
+ ProductScienceSelectorComponent,
+ ProductionConfigSelectorComponent,
],
- exports: [
- DatasetFiltersComponent,
- ],
+ exports: [DatasetFiltersComponent],
})
-export class DatasetFiltersModule { }
+export class DatasetFiltersModule {}
diff --git a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component-original.html b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component-original.html
index 92dae1128..583992305 100644
--- a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component-original.html
+++ b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component-original.html
@@ -1,28 +1,42 @@
+
+
+
+ {{ 'PRODUCT_FILTERS' | translate }}
+
+
+
+
+
+
+ }
-
+
-
-
- {{ 'ADDITIONAL_FILTERS' | translate }}
-
-
+
+ @if (selectedDataset !== 'NISAR') {
+ {{ 'ADDITIONAL_FILTERS' | translate }}
+
+
+ } @else {
+ {{ 'OBSERVATIONAL_FILTERS' | translate }}
+
+
+ }
-
+
-
-
+
@if (selectedDataset === 'SENTINEL-1 INTERFEROGRAM (BETA)') {
{{ 'TRACK' | translate }} {{ 'FILTERS' | translate }}
- } @else {
+ } @else if (selectedDataset !== 'NISAR') {
{{ 'PATH_AND_FRAME_FILTERS' | translate }}
+ } @else {
+ {{ 'TRACK_AND_FRAME_FILTERS' | translate }}
}
-
-
+
@@ -107,12 +178,18 @@
+
+
-
-
+ *ngIf="selectedDataset === 'SENTINEL-1 BURSTS'"
+ [expanded]="defaultPanelOpenState"
+ [disabled]="panelIsDisabled"
+ class="raised-section"
+ (click)="selectPanel(panels.CAMPAIGN)"
+ [class.raised-section]="isSelected(panels.CAMPAIGN)"
+ >
+
+
-
+ *ngIf="selectedDataset === 'OPERA-S1'"
+ [expanded]="defaultPanelOpenState"
+ [disabled]="panelIsDisabled"
+ class="raised-section"
+ (click)="selectPanel(panels.CAMPAIGN)"
+ [class.raised-section]="isSelected(panels.CAMPAIGN)"
+ >
+
+
-
- {{ dataset.name }}
-
-
-
- ![]()
-
-
-
+ {{ dataset.name }}
+
+
+
+
+
+
+
diff --git a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component.html b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component.html
index 1ea28e4e4..45fbea906 100644
--- a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component.html
+++ b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.component.html
@@ -1,19 +1,31 @@
- {{ dataset.info }}
-
+ {{ dataset.description | translate}}
-
+ ![]()
+
-
-
-
-
+
+
+
-
-
+ {{ dataset.info }}
+
{{ dataset.description | translate }}
+
video_library
{{ dataset.name }}
-
diff --git a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts
index 8dba2f275..b43da7c6b 100644
--- a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts
+++ b/src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts
@@ -9,18 +9,14 @@ import { DerivedDatasetsComponent } from './derived-datasets.component';
import { SharedModule } from '@shared';
@NgModule({
- declarations: [
- DerivedDatasetsComponent
- ],
+ declarations: [DerivedDatasetsComponent],
imports: [
CommonModule,
MatSharedModule,
MatExpansionModule,
MatMenuModule,
- SharedModule
+ SharedModule,
],
- exports: [
- DerivedDatasetsComponent
- ]
+ exports: [DerivedDatasetsComponent],
})
-export class DerivedDatasetsModule { }
+export class DerivedDatasetsModule {}
diff --git a/src/app/components/filters-dropdown/filters-dropdown.component.html b/src/app/components/filters-dropdown/filters-dropdown.component.html
index 04a24e4c0..d8776fae6 100644
--- a/src/app/components/filters-dropdown/filters-dropdown.component.html
+++ b/src/app/components/filters-dropdown/filters-dropdown.component.html
@@ -1,10 +1,13 @@
-
+
-
+
-
-
+
+
-
+
- ![]()
+ ![]()
+
-
+
+ >
@@ -23,31 +26,38 @@
{{ 'SBAS_SEARCH' | translate }}
-
+
{{ 'ON_DEMAND_SEARCH' | translate }}
-
+
-
+
{{ 'EVENT_SEARCH' | translate }}
- @if(selectedSearchType === searchTypes.DISPLACEMENT) {
+ @if (selectedSearchType === searchTypes.DISPLACEMENT) {
{{ 'DISPLACEMENT_SEARCH' | translate }}
}
-
+
- @if(frameSelectionEnabled$ | async) {
+ @if (frameSelectionEnabled$ | async) {
+ } @else {
+
}
@@ -72,21 +82,26 @@