diff --git a/.gitignore b/.gitignore index 1dc9b1154..bbb61b064 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,5 @@ local-serve.sh # Claude Code .claude/ CLAUDE.md +TRANSLATIONS_SCRATCH.md +docs/ diff --git a/package.json b/package.json index 680ddfcf9..c97019f09 100644 --- a/package.json +++ b/package.json @@ -123,4 +123,4 @@ "ts-node": "^8.10.2", "typescript-eslint": "8.40.0" } -} +} \ No newline at end of file diff --git a/src/app/app.component.ts b/src/app/app.component.ts index d5c12b7a4..58b587072 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -8,7 +8,11 @@ import { inject, } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; -import { MatSidenav } from '@angular/material/sidenav'; +import { + MatSidenav, + MatSidenavContainer, + MatSidenavContent, +} from '@angular/material/sidenav'; import { MatIconRegistry } from '@angular/material/icon'; import { DomSanitizer, Title } from '@angular/platform-browser'; import { MatDialog } from '@angular/material/dialog'; @@ -57,6 +61,11 @@ import { NativeDateAdapter, } from '@angular/material/core'; import { MAT_MOMENT_DATE_FORMATS } from '@angular/material-moment-adapter'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { SidebarComponent } from './components/sidebar/sidebar.component'; +import { HeaderComponent } from './components/header/header.component'; +import { MapComponent } from './components/map/map.component'; +import { ResultsMenuComponent } from './components/results-menu/results-menu.component'; @Component({ selector: 'app-root', @@ -70,7 +79,17 @@ import { MAT_MOMENT_DATE_FORMATS } from '@angular/material-moment-adapter'; { provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS }, { provide: MAT_DATE_LOCALE, useValue: 'en' }, ], - standalone: false, + imports: [ + MatSidenavContainer, + MatSidenav, + NgClass, + SidebarComponent, + MatSidenavContent, + HeaderComponent, + MapComponent, + ResultsMenuComponent, + AsyncPipe, + ], }) export class AppComponent implements OnInit, OnDestroy, AfterViewInit { private store$ = inject>(Store); diff --git a/src/app/app.module.ts b/src/app/app.module.ts index 7137d3a24..7078a0df8 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -1,89 +1,8 @@ -import { NgModule } from '@angular/core'; -import { RouterModule } from '@angular/router'; - -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { BrowserModule } from '@angular/platform-browser'; - -import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; -import { MatSidenavModule } from '@angular/material/sidenav'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatIconModule } from '@angular/material/icon'; -import { MatTableModule } from '@angular/material/table'; -import { MatSortModule } from '@angular/material/sort'; - -import { StoreModule } from '@ngrx/store'; -import { EffectsModule } from '@ngrx/effects'; -import { ToastrModule } from 'ngx-toastr'; - -import * as store from './store'; - -import { MatSharedModule } from '@shared'; -import { SidebarModule } from '@components/sidebar'; -import { HeaderModule } from '@components/header'; -import { MapModule } from '@components/map'; -import { CodeExportModule } from '@components/shared/code-export'; -import { ResultsMenuModule } from '@components/results-menu'; -import { BaselineChartModule } from '@components/baseline-chart'; -import { HelpModule } from '@components/help'; import { AppComponent } from './app.component'; -import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; import { TranslateHttpLoader } from '@ngx-translate/http-loader'; import { HttpClient } from '@angular/common/http'; -import * as services from '@services'; - -import { - NgcCookieConsentModule, - NgcCookieConsentConfig, -} from 'ngx-cookieconsent'; -import { getSaver, SAVER } from '@services/saver.provider'; -import { - DateAdapter, - MAT_DATE_FORMATS, - MAT_DATE_LOCALE, -} from '@angular/material/core'; -import { - MAT_MOMENT_DATE_ADAPTER_OPTIONS, - MAT_MOMENT_DATE_FORMATS, - MomentDateAdapter, -} from '@angular/material-moment-adapter'; -import { TimeseriesResultsMenuModule } from '@components/results-menu/timeseries-results-menu/timeseries-results-menu.module'; - -// info about cookie consent module: https://tinesoft.github.io/ngx-cookieconsent/home -const cookieConfig: NgcCookieConsentConfig = { - autoOpen: false, - cookie: { - domain: window.location.hostname, - }, - position: 'bottom', - theme: 'edgeless', - palette: { - popup: { - background: '#000000', - text: '#ffffff', - link: '#ffffff', - }, - button: { - background: '#236192', - text: '#ffffff', - border: 'transparent', - }, - }, - type: 'info', - content: { - message: - 'This website uses cookies to ensure you get the best experience on our website.', - dismiss: 'Dismiss', - deny: 'Refuse cookies', - link: 'Learn more', - href: 'https://cookiesandyou.com', - policy: 'Cookie Policy', - }, -}; - // AoT requires an exported function for factories export function HttpLoaderFactory(http: HttpClient) { return new TranslateHttpLoader(http); @@ -92,85 +11,3 @@ export function HttpLoaderFactory(http: HttpClient) { export const routes = [ { path: '**', name: 'AppComponent', component: AppComponent }, ]; - -@NgModule({ - declarations: [AppComponent], - imports: [ - BrowserModule, - TranslateModule.forRoot({ - loader: { - provide: TranslateLoader, - useFactory: HttpLoaderFactory, - deps: [HttpClient], - }, - }), - BrowserAnimationsModule, - NgcCookieConsentModule.forRoot(cookieConfig), - MatBottomSheetModule, - MatSharedModule, - RouterModule.forRoot(routes, { useHash: true }), - StoreModule.forRoot(store.reducers, { metaReducers: store.metaReducers }), - EffectsModule.forRoot(store.appEffects), - MatSidenavModule, - MatTableModule, - MatSortModule, - SidebarModule, - MapModule, - ResultsMenuModule, - HeaderModule, - MatMenuModule, - MatFormFieldModule, - MatIconModule, - MatDialogModule, - BaselineChartModule, - HelpModule, - ToastrModule.forRoot({ positionClass: 'inline', preventDuplicates: true }), - CodeExportModule, - TimeseriesResultsMenuModule, - ], - providers: [ - services.AsfApiService, - services.AsfLanguageService, - services.UrlStateService, - services.MapService, - services.DrawService, - services.WktService, - services.LayerService, - services.ProductService, - services.BulkDownloadService, - services.SearchParamsService, - services.RangeService, - services.PolygonValidationService, - services.DateExtremaService, - services.EnvironmentService, - services.PropertyService, - services.LegacyAreaFormatService, - services.BannerApiService, - services.ScreenSizeService, - services.KeyboardService, - services.UserDataService, - services.SavedSearchService, - services.UnzipApiService, - services.ScenesService, - services.SearchService, - services.Hyp3ApiService, - services.Hyp3JobStatusService, - services.Hyp3JobService, - services.PossibleHyp3JobsService, - services.OnDemandService, - services.Hyp3JobPollingService, - services.PairService, - services.SceneSelectService, - { provide: SAVER, useFactory: getSaver }, - { - provide: DateAdapter, - useClass: MomentDateAdapter, - deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS], - }, - { provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS }, - // { provide: Window, useValue: window }, - ], - bootstrap: [AppComponent], - exports: [MatTableModule], -}) -export class AppModule {} diff --git a/src/app/components/baseline-chart/baseline-chart.component.html b/src/app/components/baseline-chart/baseline-chart.component.html index 2165e3c73..704fd6973 100644 --- a/src/app/components/baseline-chart/baseline-chart.component.html +++ b/src/app/components/baseline-chart/baseline-chart.component.html @@ -1,25 +1,31 @@ -
- -
+@if (breakpoint$ | async; as breakpoint) { +
+ +
+}
diff --git a/src/app/components/baseline-chart/baseline-chart.component.ts b/src/app/components/baseline-chart/baseline-chart.component.ts index a08178bb7..004c6082c 100644 --- a/src/app/components/baseline-chart/baseline-chart.component.ts +++ b/src/app/components/baseline-chart/baseline-chart.component.ts @@ -10,7 +10,7 @@ import { import { combineLatest } from 'rxjs'; import { map, tap, filter } from 'rxjs/operators'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; @@ -23,6 +23,8 @@ import { criticalBaselineFor, CMRProduct } from '@models'; import * as d3 from 'd3'; import * as models from '@models'; import * as services from '@services'; +import { AsyncPipe } from '@angular/common'; +import { ResizedDirective } from '../../directives/resized.directive'; export enum ChartDatasets { MASTER = 0, SELECTED = 1, @@ -41,7 +43,7 @@ interface Point { selector: 'app-baseline-chart', templateUrl: './baseline-chart.component.html', styleUrls: ['./baseline-chart.component.scss'], - standalone: false, + imports: [ResizedDirective, AsyncPipe, TranslateModule], }) export class BaselineChartComponent implements OnInit, OnDestroy { translate = inject(TranslateService); diff --git a/src/app/components/baseline-chart/baseline-chart.module.ts b/src/app/components/baseline-chart/baseline-chart.module.ts deleted file mode 100644 index eae3a4506..000000000 --- a/src/app/components/baseline-chart/baseline-chart.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; - -import { BaselineChartComponent } from './baseline-chart.component'; -import { ResizedEventModule } from '@directives/resized.directive'; -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - declarations: [BaselineChartComponent], - imports: [CommonModule, MatSharedModule, ResizedEventModule, TranslateModule], - exports: [BaselineChartComponent], -}) -export class BaselineChartModule {} diff --git a/src/app/components/baseline-chart/index.ts b/src/app/components/baseline-chart/index.ts index 5184f1775..b57127b6f 100644 --- a/src/app/components/baseline-chart/index.ts +++ b/src/app/components/baseline-chart/index.ts @@ -1,2 +1 @@ export * from './baseline-chart.component'; -export * from './baseline-chart.module'; diff --git a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.html b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.html index bd0ef3c89..24da2fb12 100644 --- a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.html +++ b/src/app/components/filters-dropdown/baseline-filters/baseline-filters.component.html @@ -1,126 +1,126 @@ - - - - {{ 'SEARCH_OPTIONS' | translate }} - - - -
- - -
- - - - - - {{ 'SCENE' | translate }} - - - -
- -
- @if (shouldUseFramesForReference) { - - } - -
-
-
- {{ 'EXAMPLE' | translate }}: - S1A_IW_SLC__1SSV_20150601T010209_20150601T010236_006173_00808F_20A0 - - -
-
- - -
- + + {{ 'SEARCH_OPTIONS' | translate }} + + +
+ + +
+ + } - - - - {{ 'DATA_FILTERS' | translate }} + + + {{ 'SCENE' | translate }} + + +
+ +
+ @if (shouldUseFramesForReference) { + + } + +
+
+
+ {{ 'EXAMPLE' | translate }}: + S1A_IW_SLC__1SSV_20150601T010209_20150601T010236_006173_00808F_20A0 + + +
+
- - - -
- -
-
- -
- +
+ + } - - - - {{ 'BASELINE_CRITERIA' | translate }} - - - - + + + {{ 'DATA_FILTERS' | translate }} + + + + +
+ +
+
+ +
+ + } - - + @if (areResultsLoaded) { + + + + {{ '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 b39d18408..1d7415c53 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 @@ -9,6 +9,23 @@ import { SubSink } from 'subsink'; import * as models from '@models'; import { ScreenSizeService } from '@services'; import { beta } from '@models/datasets'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { MasterSceneSelectorComponent } from '@components/shared/selectors/master-scene-selector/master-scene-selector.component'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { SeasonSelectorComponent } from '@components/shared/selectors/season-selector/season-selector.component'; +import { BaselineSlidersComponent } from './baseline-sliders/baseline-sliders.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { MASTER = 'Master', @@ -21,7 +38,24 @@ enum FilterPanel { selector: 'app-baseline-filters', templateUrl: './baseline-filters.component.html', styleUrls: ['./baseline-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + BaselineFrameReferenceToggleComponent, + DatasetSelectorComponent, + MasterSceneSelectorComponent, + CopyToClipboardComponent, + DocsModalComponent, + DateSelectorComponent, + SeasonSelectorComponent, + BaselineSlidersComponent, + AsyncPipe, + TranslateModule, + ], }) export class BaselineFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); 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 deleted file mode 100644 index 7fe348e22..000000000 --- a/src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatExpansionModule } from '@angular/material/expansion'; - -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'; -import { MasterSceneSelectorModule } from '@components/shared/selectors/master-scene-selector'; -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 { 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], -}) -export class BaselineFiltersModule {} 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 4d85ceb8c..35bfa3c0e 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 @@ -23,6 +23,7 @@ import * as scenesStore from '@store/scenes'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { TranslateModule } from '@ngx-translate/core'; export interface BaselineSlider { slider: any; @@ -33,7 +34,7 @@ export interface BaselineSlider { selector: 'app-baseline-sliders', templateUrl: './baseline-sliders.component.html', styleUrls: ['./baseline-sliders.component.scss'], - standalone: false, + imports: [TranslateModule], }) export class BaselineSlidersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); 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 deleted file mode 100644 index bb21e7c7c..000000000 --- a/src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { BaselineSlidersComponent } from './baseline-sliders.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [BaselineSlidersComponent], - imports: [CommonModule, SharedModule], - exports: [BaselineSlidersComponent], -}) -export class BaselineSlidersModule {} 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 08ddc7ca8..8fdd45c4f 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 @@ -8,6 +8,20 @@ import * as hyp3Store from '@store/hyp3'; import { SubSink } from 'subsink'; import * as models from '@models'; import { ScreenSizeService } from '@services'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { OnDemandUserSelectorComponent } from '@components/shared/selectors/on-demand-user-selector/on-demand-user-selector.component'; +import { JobIdSelectorComponent } from './job-id-selector/job-id-selector.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { ProjectNameSelectorComponent } from '@components/shared/selectors/project-name-selector/project-name-selector.component'; +import { JobStatusSelectorComponent } from '@components/shared/selectors/job-status-selector/job-status-selector.component'; +import { JobProductNameSelectorComponent } from '@components/shared/selectors/job-product-name-selector/job-product-name-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { SEARCH = 'SEARCH_OPTIONS', @@ -19,7 +33,20 @@ enum FilterPanel { selector: 'app-custom-products-filters', templateUrl: './custom-products-filters.component.html', styleUrls: ['./custom-products-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + OnDemandUserSelectorComponent, + JobIdSelectorComponent, + DateSelectorComponent, + ProjectNameSelectorComponent, + JobStatusSelectorComponent, + JobProductNameSelectorComponent, + TranslateModule, + ], }) export class CustomProductsFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); 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 deleted file mode 100644 index 928538b49..000000000 --- a/src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatSharedModule } from '@shared'; - -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; -import { ProjectNameSelectorModule } from '@components/shared/selectors/project-name-selector'; -import { CustomProductsFiltersComponent } from './custom-products-filters.component'; -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 { JobIdSelectorComponent } from './job-id-selector/job-id-selector.component'; - -import { SharedModule } from '@shared'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { FormsModule } from '@angular/forms'; - -@NgModule({ - declarations: [CustomProductsFiltersComponent, JobIdSelectorComponent], - imports: [ - CommonModule, - MatExpansionModule, - MatSharedModule, - MatFormFieldModule, - MatInputModule, - FormsModule, - DateSelectorModule, - SearchTypeSelectorModule, - ProjectNameSelectorModule, - JobStatusSelectorModule, - JobProductNameSelectorModule, - OnDemandUserSelectorModule, - SharedModule, - ], - exports: [CustomProductsFiltersComponent], -}) -export class CustomProductsFiltersModule {} 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 aa296c0e8..670960e90 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,11 +1,21 @@ import { Component, EventEmitter, Input, Output, inject } from '@angular/core'; import { NotificationService } from '@services'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { CdkTextareaAutosize } from '@angular/cdk/text-field'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-job-id-selector', templateUrl: './job-id-selector.component.html', styleUrl: './job-id-selector.component.scss', - standalone: false, + imports: [ + MatFormField, + MatInput, + CdkTextareaAutosize, + FormsModule, + TranslateModule, + ], }) export class JobIdSelectorComponent { private notification = inject(NotificationService); 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 ecf6033ca..bc7c7c4dc 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,243 +1,241 @@ - - - - - {{ 'SEARCH_OPTIONS' | translate }} - - - -
- - - - + @if (breakpoint === breakpoints.MOBILE) { + - -
- - - - - - {{ 'AREA_OF_INTEREST_OPTIONS' | translate }} - - - - - -
- -
- - - - - - {{ 'DATE_FILTERS' | translate }} - - - - - -
- -
-
- -
- - @if (selectedDataset === 'NISAR') { + + {{ 'SEARCH_OPTIONS' | translate }} + + +
+ + + + +
+ + } - - {{ 'PRODUCT_FILTERS' | translate }} + + {{ 'AREA_OF_INTEREST_OPTIONS' | translate }} -
- - +
- } - - - - - @if (selectedDataset !== 'NISAR') { - {{ 'ADDITIONAL_FILTERS' | translate }} - - - } @else { - {{ 'OBSERVATIONAL_FILTERS' | translate }} + + + {{ 'DATE_FILTERS' | translate }} - } - - - -
- @if (selectedDataset !== 'NISAR') { - - } @else { - - } -
- - - - + +
+ +
+
+ +
+ + @if (selectedDataset === 'NISAR') { + + + + {{ 'PRODUCT_FILTERS' | translate }} + + + + +
+ + +
+ + } + - - @if (selectedDataset === 'SENTINEL-1 INTERFEROGRAM (BETA)') { - {{ 'TRACK' | translate }} {{ 'FILTERS' | translate }} - } @else if (selectedDataset !== 'NISAR') { - {{ 'PATH_AND_FRAME_FILTERS' | translate }} + + + @if (selectedDataset !== 'NISAR') { + {{ 'ADDITIONAL_FILTERS' | translate }} + + + } @else { + {{ 'OBSERVATIONAL_FILTERS' | translate }} + + + } + + +
+ @if (selectedDataset !== 'NISAR') { + } @else { - {{ 'TRACK_AND_FRAME_FILTERS' | translate }} + } - + + @if (prop.isRelevant(p.PATH) || prop.isRelevant(p.FRAME)) { + + - - - - -
- {{ 'TO' | translate }} -
- - - - - - {{ 'CAMPAIGN_SELECTOR' | translate }} - - - - - - - - - - {{ 'SLC_BURST_FILTERS' | translate }} - - -
- -
- - - - - - - OPERA S1 Filters - - -
- -
- - + + @if (selectedDataset === 'SENTINEL-1 INTERFEROGRAM (BETA)') { + {{ 'TRACK' | translate }} {{ 'FILTERS' | translate }} + } @else if (selectedDataset !== 'NISAR') { + {{ 'PATH_AND_FRAME_FILTERS' | translate }} + } @else { + {{ 'TRACK_AND_FRAME_FILTERS' | translate }} + } + + + + +
+ {{ 'TO' | translate }} +
+ + } + @if (prop.isRelevant(p.MISSION_NAME)) { + + + + {{ 'CAMPAIGN_SELECTOR' | translate }} + + + + + } + @if (selectedDataset === 'SENTINEL-1 BURSTS') { + + + + {{ 'SLC_BURST_FILTERS' | translate }} + + +
+ +
+ + } + @if (selectedDataset === 'OPERA-S1') { + + + + + OPERA S1 Filters + + +
+ +
+ + } + +} diff --git a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss index 42874ce74..f862ca5fa 100644 --- a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss +++ b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss @@ -9,14 +9,22 @@ .selector-card-spacing { margin-top: 20px; } +.panel-title { + align-items: center; + justify-content: space-between; +} + -.info-icon { - margin-left: 10px; - margin-top: 4px; +.info-text { + flex: none; + font-size: small; + font-style: italic; + font-weight: 400; } + .header { @include themify($themes) { background-color: themed('primary-light'); } -} \ No newline at end of file +} 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 b7f361620..15bec2de9 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 @@ -8,6 +8,28 @@ import * as filtersStore from '@store/filters'; import * as models from '@models'; import { PropertyService, ScreenSizeService } from '@services'; +import { AsyncPipe } from '@angular/common'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { AoiOptionsComponent } from '@components/shared/aoi-options/aoi-options.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { SeasonSelectorComponent } from '@components/shared/selectors/season-selector/season-selector.component'; +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'; +import { OtherSelectorComponent } from '@components/shared/selectors/other-selector/other-selector.component'; +import { ObservationPanelSelectorComponent } from '@components/shared/selectors/observation-panel-selector/observation-panel-selector.component'; +import { PathSelectorComponent } from '@components/shared/selectors/path-selector/path-selector.component'; +import { MissionSelectorComponent } from '@components/shared/selectors/mission-selector/mission-selector.component'; +import { BurstSelectorComponent } from '@components/shared/selectors/burst-selector/burst-selector.component'; +import { OperaS1SelectorComponent } from '@components/shared/selectors/opera-s1-selector/opera-s1-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; // import { TranslateService } from "@ngx-translate/core"; enum FilterPanel { @@ -24,7 +46,28 @@ enum FilterPanel { selector: 'app-dataset-filters', templateUrl: './dataset-filters.component.html', styleUrls: ['./dataset-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + DatasetSelectorComponent, + DocsModalComponent, + AoiOptionsComponent, + DateSelectorComponent, + SeasonSelectorComponent, + ProductScienceSelectorComponent, + ProductionConfigSelectorComponent, + OtherSelectorComponent, + ObservationPanelSelectorComponent, + PathSelectorComponent, + MissionSelectorComponent, + BurstSelectorComponent, + OperaS1SelectorComponent, + AsyncPipe, + TranslateModule, + ], }) export class DatasetFiltersComponent implements OnInit, OnDestroy { prop = inject(PropertyService); 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 deleted file mode 100644 index 4a3c90f8a..000000000 --- a/src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts +++ /dev/null @@ -1,55 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { CommonModule } from '@angular/common'; - -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; - -import { PathSelectorModule } from '@components/shared/selectors/path-selector'; -import { OtherSelectorModule } from '@components/shared/selectors/other-selector'; -import { SeasonSelectorModule } from '@components/shared/selectors/season-selector'; -import { MissionSelectorModule } from '@components/shared/selectors/mission-selector'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; - -import { DatasetFiltersComponent } from './dataset-filters.component'; -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector'; -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 { 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], - imports: [ - CommonModule, - FormsModule, - MatSelectModule, - MatExpansionModule, - MatSharedModule, - DocsModalModule, - MissionSelectorModule, - PathSelectorModule, - OtherSelectorModule, - SeasonSelectorModule, - DateSelectorModule, - DatasetSelectorModule, - AoiOptionsModule, - SearchTypeSelectorModule, - BurstSelectorModule, - OperaS1SelectorModule, - SharedModule, - // TranslateModule - ObservationPanelSelectorModule, - ProductScienceSelectorComponent, - ProductionConfigSelectorComponent, - ], - exports: [DatasetFiltersComponent], -}) -export class DatasetFiltersModule {} diff --git a/src/app/components/filters-dropdown/dataset-filters/index.ts b/src/app/components/filters-dropdown/dataset-filters/index.ts index 82d2e4e53..061339887 100644 --- a/src/app/components/filters-dropdown/dataset-filters/index.ts +++ b/src/app/components/filters-dropdown/dataset-filters/index.ts @@ -1,2 +1 @@ -export * from './dataset-filters.module'; export * from './dataset-filters.component'; 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 deleted file mode 100644 index b43da7c6b..000000000 --- a/src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatMenuModule } from '@angular/material/menu'; - -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatSharedModule } from '@shared'; - -import { DerivedDatasetsComponent } from './derived-datasets.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DerivedDatasetsComponent], - imports: [ - CommonModule, - MatSharedModule, - MatExpansionModule, - MatMenuModule, - SharedModule, - ], - exports: [DerivedDatasetsComponent], -}) -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 d8776fae6..07192e567 100644 --- a/src/app/components/filters-dropdown/filters-dropdown.component.html +++ b/src/app/components/filters-dropdown/filters-dropdown.component.html @@ -1,111 +1,95 @@ -
+@if (searchType$ | async; as selectedSearchType) {
-
-
- - {{ 'SEARCH_FILTERS' | translate }} - - - - {{ 'LIST_SEARCH' | translate }} - - - - {{ 'BASELINE_SEARCH' | translate }} - - - - {{ 'SBAS_SEARCH' | translate }} - - - - {{ 'ON_DEMAND_SEARCH' | translate }} - - - - - - {{ 'EVENT_SEARCH' | translate }} - - - @if (selectedSearchType === searchTypes.DISPLACEMENT) { - {{ 'DISPLACEMENT_SEARCH' | translate }} - } -
-
-
- - @if (frameSelectionEnabled$ | async) { - - } @else { - - +
+
+ @if (selectedSearchType === searchTypes.DATASET) { + {{ 'SEARCH_FILTERS' | translate }} + } + @if (selectedSearchType === searchTypes.LIST) { + {{ 'LIST_SEARCH' | translate }} + } + @if (selectedSearchType === searchTypes.BASELINE) { + {{ 'BASELINE_SEARCH' | translate }} + } + @if (selectedSearchType === searchTypes.SBAS) { + {{ 'SBAS_SEARCH' | translate }} + } + @if (selectedSearchType === searchTypes.CUSTOM_PRODUCTS) { + {{ 'ON_DEMAND_SEARCH' | translate }} + + + } + @if (selectedSearchType === searchTypes.SARVIEWS_EVENTS) { + {{ 'EVENT_SEARCH' | translate }} + } + @if (selectedSearchType === searchTypes.DISPLACEMENT) { + {{ 'DISPLACEMENT_SEARCH' | translate }} + } +
+
+
+ @if (selectedSearchType === searchTypes.DATASET) { + @if (frameSelectionEnabled$ | async) { + + } @else { + + + } } - - - - - - - - - - - - - - - - - - - - - - - @if ( - selectedSearchType === searchTypes.DISPLACEMENT && - breakpoint !== breakpoints.FULL - ) { - - } -
- -
- - + + @if ( selectedSearchType !== searchTypes.BASELINE && selectedSearchType !== searchTypes.SBAS && selectedSearchType !== searchTypes.CUSTOM_PRODUCTS && selectedSearchType !== searchTypes.SARVIEWS_EVENTS - " - style="margin-right: 10px; align-self: center" - > - - - - + ) { + + + } + + + +
-
+} diff --git a/src/app/components/filters-dropdown/filters-dropdown.component.ts b/src/app/components/filters-dropdown/filters-dropdown.component.ts index f7e8ed66e..e4cff006b 100644 --- a/src/app/components/filters-dropdown/filters-dropdown.component.ts +++ b/src/app/components/filters-dropdown/filters-dropdown.component.ts @@ -25,6 +25,20 @@ import * as models from '@models'; import { Observable } from 'rxjs'; import { areFiltersChanged } from '@store/filters'; import { SBASOverlap } from '@models'; +import { AsyncPipe } from '@angular/common'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { FrameOrderFiltersComponent } from './frame-order-filters/frame-order-filters.component'; +import { DatasetFiltersComponent } from './dataset-filters/dataset-filters.component'; +import { ListFiltersComponent } from './list-filters/list-filters.component'; +import { BaselineFiltersComponent } from './baseline-filters/baseline-filters.component'; +import { SbasFiltersComponent } from './sbas-filters/sbas-filters.component'; +import { CustomProductsFiltersComponent } from './custom-products-filters/custom-products-filters.component'; +import { SarviewsFiltersComponent } from './sarviews-filters/sarviews-filters.component'; +import { TimeseriesFiltersComponent } from './timeseries-filters/timeseries-filters.component'; +import { MaxResultsSelectorComponent } from '@components/shared/max-results-selector/max-results-selector.component'; +import { CancelFilterChangesComponent } from '@components/shared/cancel-filter-changes/cancel-filter-changes.component'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-filters-dropdown', @@ -38,7 +52,22 @@ import { SBASOverlap } from '@models'; transition('false => true', animate('50ms ease-in')), ]), ], - standalone: false, + imports: [ + DocsModalComponent, + FrameOrderFiltersComponent, + DatasetFiltersComponent, + ListFiltersComponent, + BaselineFiltersComponent, + SbasFiltersComponent, + CustomProductsFiltersComponent, + SarviewsFiltersComponent, + TimeseriesFiltersComponent, + MaxResultsSelectorComponent, + CancelFilterChangesComponent, + SearchButtonComponent, + AsyncPipe, + TranslateModule, + ], }) export class FiltersDropdownComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/filters-dropdown/filters-dropdown.module.ts b/src/app/components/filters-dropdown/filters-dropdown.module.ts deleted file mode 100644 index 62c445265..000000000 --- a/src/app/components/filters-dropdown/filters-dropdown.module.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { RouterModule } from '@angular/router'; - -import { MatTabsModule } from '@angular/material/tabs'; -import { MatSharedModule } from '@shared'; - -import { SearchButtonModule } from '@components/shared/search-button'; -import { CancelFilterChangesModule } from '@components/shared/cancel-filter-changes'; -import { ClearButtonModule } from '@components/shared/clear-button'; -import { MaxResultsSelectorModule } from '@components/shared/max-results-selector'; - -import { FiltersDropdownComponent } from './filters-dropdown.component'; - -import { ListFiltersModule } from './list-filters'; -import { DatasetFiltersModule } from './dataset-filters'; -import { TimeseriesFiltersModule } from './timeseries-filters'; -import { BaselineFiltersModule } from './baseline-filters'; -import { SbasFiltersModule } from './sbas-filters'; -import { CustomProductsFiltersModule } from './custom-products-filters'; -import { SarviewsFiltersModule } from './sarviews-filters'; -import { SearchSelectorModule } from '@components/shared/selectors/search-selector'; - -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; -import { FrameOrderFiltersComponent } from './frame-order-filters'; - -@NgModule({ - imports: [ - CommonModule, - RouterModule, - - MatTabsModule, - MatSharedModule, - - ListFiltersModule, - DatasetFiltersModule, - BaselineFiltersModule, - SbasFiltersModule, - CustomProductsFiltersModule, - SarviewsFiltersModule, - TimeseriesFiltersModule, - SearchButtonModule, - CancelFilterChangesModule, - ClearButtonModule, - MaxResultsSelectorModule, - SharedModule, - - SearchSelectorModule, - DocsModalModule, - FrameOrderFiltersComponent, - ], - declarations: [FiltersDropdownComponent], - exports: [FiltersDropdownComponent], -}) -export class FiltersDropdownModule {} diff --git a/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.html b/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.html index af7e0758b..7a02d3213 100644 --- a/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.html +++ b/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.html @@ -1,29 +1,28 @@ - - - - {{ 'FRAME_ORDER_FILTERS' | translate }} - - - - - -
- {{ 'TO' | translate }} -
- - - + + + {{ 'FRAME_ORDER_FILTERS' | translate }} + + + + +
+ {{ 'TO' | translate }} +
+ + +} diff --git a/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.ts b/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.ts index 8d4cce28e..349f44cfc 100644 --- a/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.ts +++ b/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.ts @@ -1,26 +1,9 @@ import { Component, Input, OnInit, OnDestroy, inject } from '@angular/core'; import { FormsModule } from '@angular/forms'; -import { CommonModule } from '@angular/common'; import { MatExpansionModule } from '@angular/material/expansion'; import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; - -import { PathSelectorModule } from '@components/shared/selectors/path-selector'; -import { OtherSelectorModule } from '@components/shared/selectors/other-selector'; -import { SeasonSelectorModule } from '@components/shared/selectors/season-selector'; -import { MissionSelectorModule } from '@components/shared/selectors/mission-selector'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; - -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector'; -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 { SharedModule } from '@shared'; import { SubSink } from 'subsink'; @@ -32,6 +15,9 @@ import * as filtersStore from '@store/filters'; import * as models from '@models'; import { PropertyService, ScreenSizeService } from '@services'; import { FlightDirectionSelectorComponent } from '@components/shared/selectors/flight-direction-selector/flight-direction-selector.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { PathSelectorComponent } from '@components/shared/selectors/path-selector'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { DATE = 'Date', @@ -45,24 +31,13 @@ enum FilterPanel { @Component({ selector: 'app-frame-order-filters', imports: [ - CommonModule, FormsModule, FlightDirectionSelectorComponent, MatSelectModule, MatExpansionModule, - MatSharedModule, - DocsModalModule, - MissionSelectorModule, - PathSelectorModule, - OtherSelectorModule, - SeasonSelectorModule, - DateSelectorModule, - DatasetSelectorModule, - AoiOptionsModule, - SearchTypeSelectorModule, - BurstSelectorModule, - OperaS1SelectorModule, - SharedModule, + DocsModalComponent, + PathSelectorComponent, + TranslateModule, ], templateUrl: './frame-order-filters.component.html', styleUrl: './frame-order-filters.component.scss', diff --git a/src/app/components/filters-dropdown/list-filters/list-filters.component.html b/src/app/components/filters-dropdown/list-filters/list-filters.component.html index 648d7eba6..6efc96228 100644 --- a/src/app/components/filters-dropdown/list-filters/list-filters.component.html +++ b/src/app/components/filters-dropdown/list-filters/list-filters.component.html @@ -1,151 +1,155 @@
- - - - - - {{ 'SEARCH_OPTIONS' | translate }} - - - -
- - -
- - - - - {{ 'SEARCH_LIST_INPUT' | translate }} -
- - -
- - - -
-
-
+ @if (breakpoint === breakpoints.MOBILE) { + + -
-

- {{ 'LIST_TYPE' | translate }} -

-
-
- - - {{ 'SCENE' | translate }} - - - - {{ 'FILE' | translate }} - - -
+ + {{ 'SEARCH_OPTIONS' | translate }} + + +
+ +
-
- - - + +
+ + +
+
-
-
{{ 'DRAG_AND_DROP' | translate }}
-
-
{{ 'FILES_HERE' | translate }}
-
- (csv, geojson, metalink, kml) +
+

+ {{ 'LIST_TYPE' | translate }} +

+
+
+ + + {{ 'SCENE' | translate }} + + + {{ 'FILE' | translate }} + + +
+
+
+ + + +
+
+
+ {{ 'DRAG_AND_DROP' | translate }}
-
- (csv, geojson) +
+
{{ 'FILES_HERE' | translate }}
+ @if (mode === types.SCENE) { +
+ (csv, geojson, metalink, kml) +
+ } + @if (mode !== types.SCENE) { +
(csv, geojson)
+ }
-
-
-
- - {{ 'EXAMPLE' | translate }} {{ listExamples[mode] }} - -
- - -
+
- {{ 'FILE_IMPORT_SUPPORTED' | translate }} (csv, geojson{{ - mode === types.SCENE ? ', metalink, kml' : '' - }}) + {{ 'EXAMPLE' | translate }} {{ listExamples[mode] }} +
+ + +
+
+ + {{ 'FILE_IMPORT_SUPPORTED' | translate }} (csv, geojson{{ + mode === types.SCENE ? ', metalink, kml' : '' + }}) + +
-
- - - + + + } + }
diff --git a/src/app/components/filters-dropdown/list-filters/list-filters.component.ts b/src/app/components/filters-dropdown/list-filters/list-filters.component.ts index 957a7de80..2d3c6de4e 100644 --- a/src/app/components/filters-dropdown/list-filters/list-filters.component.ts +++ b/src/app/components/filters-dropdown/list-filters/list-filters.component.ts @@ -24,6 +24,24 @@ import * as searchStore from '@store/search'; import * as models from '@models'; import * as services from '@services'; import { ofType } from '@ngrx/effects'; +import { AsyncPipe } from '@angular/common'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { TranslateModule } from '@ngx-translate/core'; enum ListPanel { SEARCH = 'search', @@ -39,7 +57,23 @@ enum FileErrors { selector: 'app-list-filters', templateUrl: './list-filters.component.html', styleUrls: ['./list-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + DocsModalComponent, + MatButtonToggleGroup, + MatButtonToggle, + MatTooltip, + MatFormField, + MatInput, + FormsModule, + CopyToClipboardComponent, + AsyncPipe, + TranslateModule, + ], }) export class ListFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/filters-dropdown/list-filters/list-filters.module.ts b/src/app/components/filters-dropdown/list-filters/list-filters.module.ts deleted file mode 100644 index 1edbe707b..000000000 --- a/src/app/components/filters-dropdown/list-filters/list-filters.module.ts +++ /dev/null @@ -1,38 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; - -import { MatSharedModule } from '@shared'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { NgxCsvParserModule } from 'ngx-csv-parser'; - -import { ListFiltersComponent } from './list-filters.component'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ListFiltersComponent], - imports: [ - CommonModule, - MatExpansionModule, - SearchTypeSelectorModule, - - FormsModule, - CopyToClipboardModule, - NgxCsvParserModule, - MatFormFieldModule, - MatInputModule, - MatButtonToggleModule, - MatSharedModule, - DocsModalModule, - SharedModule, - ], - exports: [ListFiltersComponent], -}) -export class ListFiltersModule {} diff --git a/src/app/components/filters-dropdown/sarviews-filters/index.ts b/src/app/components/filters-dropdown/sarviews-filters/index.ts index 3f79c21f7..54b3b5da6 100644 --- a/src/app/components/filters-dropdown/sarviews-filters/index.ts +++ b/src/app/components/filters-dropdown/sarviews-filters/index.ts @@ -1,2 +1 @@ export { SarviewsFiltersComponent } from './sarviews-filters.component'; -export { SarviewsFiltersModule } from './sarviews-filters.module'; diff --git a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.html b/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.html index 3f3fe7ded..cfb72e0ec 100644 --- a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.html +++ b/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.html @@ -1,113 +1,109 @@ - - - - - {{ panels.SEARCH }} - - - -
- - -
- - - - - - {{ 'EVENT_FILTERS' | translate }} - + @if (breakpoint === breakpoints.MOBILE) { + + - - - - -
- -
-
- -
-
- -
-
- -
- - - - + {{ panels.SEARCH }} + + +
+ + +
+ + } + - - {{ 'DATE_FILTERS' | translate }} - - - - - -
- -
- - - - + + {{ 'EVENT_FILTERS' | translate }} + + + + +
+ +
+
+ +
+
+ +
+
+ +
+ + - - {{ 'PRODUCT_FILTERS' | translate }} - - - - - - -
- -
-
- -
- - + + + {{ 'DATE_FILTERS' | translate }} + + + + +
+ +
+ + + + + {{ 'PRODUCT_FILTERS' | translate }} + + + + + +
+ +
+
+ +
+ + +} diff --git a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.ts b/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.ts index a7ac673ab..06362a9e3 100644 --- a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.ts +++ b/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.component.ts @@ -7,6 +7,23 @@ import * as models from '@models'; import * as scenesStore from '@store/scenes'; import { SubSink } from 'subsink'; +import { AsyncPipe } from '@angular/common'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { SarviewsEventActiveSelectorComponent } from '@components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.component'; +import { SarviewsEventSearchSelectorComponent } from '@components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component'; +import { SarviewsEventTypeSelectorComponent } from '@components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component'; +import { SarviewsEventMagnitudeSelectorComponent } from '@components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { PathSelectorComponent } from '@components/shared/selectors/path-selector/path-selector.component'; +import { Hyp3JobTypeSelectorComponent } from '@components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { SEARCH = 'Search Options', @@ -19,7 +36,23 @@ enum FilterPanel { selector: 'app-sarviews-filters', templateUrl: './sarviews-filters.component.html', styleUrls: ['./sarviews-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + DocsModalComponent, + SarviewsEventActiveSelectorComponent, + SarviewsEventSearchSelectorComponent, + SarviewsEventTypeSelectorComponent, + SarviewsEventMagnitudeSelectorComponent, + DateSelectorComponent, + PathSelectorComponent, + Hyp3JobTypeSelectorComponent, + AsyncPipe, + TranslateModule, + ], }) export class SarviewsFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.module.ts b/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.module.ts deleted file mode 100644 index 426b733fe..000000000 --- a/src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SarviewsFiltersComponent } from './sarviews-filters.component'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { SarviewsEventSearchSelectorModule } from '@components/shared/selectors/sarviews-event-search-selector'; -import { SarviewsEventTypeSelectorModule } from '@components/shared/selectors/sarviews-event-type-selector'; -import { SarviewsEventActiveSelectorModule } from '@components/shared/selectors/sarviews-event-active-selector'; -import { SarviewsEventMagnitudeSelectorModule } from '@components/shared/selectors/sarviews-event-magnitude-selector'; -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { MatIconModule } from '@angular/material/icon'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; -import { PathSelectorModule } from '@components/shared/selectors/path-selector'; -import { Hyp3JobTypeSelectorModule } from '@components/shared/selectors/hyp3-job-type-selector'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SarviewsFiltersComponent], - imports: [ - CommonModule, - MatExpansionModule, - SarviewsEventSearchSelectorModule, - SarviewsEventTypeSelectorModule, - SarviewsEventActiveSelectorModule, - SarviewsEventMagnitudeSelectorModule, - DateSelectorModule, - MatIconModule, - SearchTypeSelectorModule, - PathSelectorModule, - Hyp3JobTypeSelectorModule, - DocsModalModule, - SharedModule, - ], - exports: [SarviewsFiltersComponent], -}) -export class SarviewsFiltersModule {} diff --git a/src/app/components/filters-dropdown/sbas-filters/index.ts b/src/app/components/filters-dropdown/sbas-filters/index.ts index d1b2606cd..71c80d126 100644 --- a/src/app/components/filters-dropdown/sbas-filters/index.ts +++ b/src/app/components/filters-dropdown/sbas-filters/index.ts @@ -1,2 +1 @@ -export * from './sbas-filters.module'; export * from './sbas-filters.component'; diff --git a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.html b/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.html index b3cde0cdb..77e230e86 100644 --- a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.html +++ b/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.html @@ -1,107 +1,107 @@ - - - - {{ 'SEARCH_OPTIONS' | translate }} - - - -
- - -
- - - - - - {{ panels.MASTER | uppercase | translate }} - - + + + {{ 'SEARCH_OPTIONS' | translate }} + + +
+ + +
+ + } -
- -
- @if (shouldUseFramesForReference) { -
- -
- } -
- -
-
- {{ 'EXAMPLE' | translate }}: - S1B_IW_SLC__1SDV_20210704T135937_20210704T140004_027645_034CB0_4B2C - - -
-
- + {{ panels.MASTER | uppercase | translate }} + + +
- -
- - - - - - {{ 'DATE_FILTERS' | translate }} + +
+ @if (shouldUseFramesForReference) { +
+ +
+ } +
+ +
+
+ {{ 'EXAMPLE' | translate }}: + S1B_IW_SLC__1SDV_20210704T135937_20210704T140004_027645_034CB0_4B2C + + +
+
- - +
+ + } -
- - -
- + @if (areResultsLoaded) { + + + + {{ 'DATE_FILTERS' | translate }} + + + + +
+ + +
+ + } @@ -118,28 +118,29 @@ - - - - {{ 'LATITUDINAL_OVERLAP_FILTER' | translate }} - - - - -
- -
- + + + {{ 'LATITUDINAL_OVERLAP_FILTER' | translate }} + + + + +
+ +
+ + } diff --git a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.ts b/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.ts index 3e42f4596..fe07edd56 100644 --- a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.ts +++ b/src/app/components/filters-dropdown/sbas-filters/sbas-filters.component.ts @@ -8,6 +8,23 @@ import * as filtersStore from '@store/filters'; import { SubSink } from 'subsink'; import * as models from '@models'; import { ScreenSizeService } from '@services'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { AsyncPipe, UpperCasePipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { MasterSceneSelectorComponent } from '@components/shared/selectors/master-scene-selector/master-scene-selector.component'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { SeasonSelectorComponent } from '@components/shared/selectors/season-selector/season-selector.component'; +import { SbasOverlapSelectorComponent } from '@components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { SEARCH = 'Search Options', @@ -23,7 +40,25 @@ enum FilterPanel { selector: 'app-sbas-filters', templateUrl: './sbas-filters.component.html', styleUrls: ['./sbas-filters.component.scss'], - standalone: false, + imports: [ + MatAccordion, + + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + BaselineFrameReferenceToggleComponent, + DatasetSelectorComponent, + MasterSceneSelectorComponent, + CopyToClipboardComponent, + DocsModalComponent, + DateSelectorComponent, + SeasonSelectorComponent, + SbasOverlapSelectorComponent, + AsyncPipe, + UpperCasePipe, + TranslateModule, + ], }) export class SbasFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.module.ts b/src/app/components/filters-dropdown/sbas-filters/sbas-filters.module.ts deleted file mode 100644 index fd637efc2..000000000 --- a/src/app/components/filters-dropdown/sbas-filters/sbas-filters.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatExpansionModule } from '@angular/material/expansion'; - -import { MatSharedModule } from '@shared'; -import { SeasonSelectorModule } from '@components/shared/selectors/season-selector'; -import { SbasOverlapSelectorModule } from '@components/shared/selectors/sbas-overlap-selector'; -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { SbasFiltersComponent } from './sbas-filters.component'; -import { MasterSceneSelectorModule } from '@components/shared/selectors/master-scene-selector'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; -import { ResultsMenuModule } from '@components/results-menu'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; -import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle'; -import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector'; - -@NgModule({ - declarations: [SbasFiltersComponent], - imports: [ - CommonModule, - MatExpansionModule, - MatSharedModule, - SeasonSelectorModule, - SbasOverlapSelectorModule, - DateSelectorModule, - MasterSceneSelectorModule, - SearchTypeSelectorModule, - ResultsMenuModule, - CopyToClipboardModule, - DocsModalModule, - SharedModule, - DatasetSelectorModule, - BaselineFrameReferenceToggleComponent, - ], - exports: [SbasFiltersComponent], -}) -export class SbasFiltersModule {} diff --git a/src/app/components/filters-dropdown/timeseries-filters/index.ts b/src/app/components/filters-dropdown/timeseries-filters/index.ts index 04cb5dc2d..3377ef63f 100644 --- a/src/app/components/filters-dropdown/timeseries-filters/index.ts +++ b/src/app/components/filters-dropdown/timeseries-filters/index.ts @@ -1,2 +1 @@ -export * from './timeseries-filters.module'; export * from './timeseries-filters.component'; diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html index a18b93ed7..9cc0ce01b 100644 --- a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html +++ b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.html @@ -1,23 +1,23 @@ - - - - {{ 'SEARCH_OPTIONS' | translate }} - - - -
- - -
- + + + {{ 'SEARCH_OPTIONS' | translate }} + + +
+ + +
+ + } diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts index 57cd22a4d..60a6fae96 100644 --- a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts +++ b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.component.ts @@ -7,6 +7,15 @@ import * as scenesStore from '@store/scenes'; import { SubSink } from 'subsink'; import * as models from '@models'; import { ScreenSizeService } from '@services'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FilterPanel { SEARCH = 'Search Options', @@ -21,7 +30,16 @@ enum FilterPanel { selector: 'app-timeseries-filters', templateUrl: './timeseries-filters.component.html', styleUrl: './timeseries-filters.component.scss', - standalone: false, + imports: [ + MatAccordion, + + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + SearchTypeSelectorComponent, + AsyncPipe, + TranslateModule, + ], }) export class TimeseriesFiltersComponent implements OnDestroy, OnInit { private store$ = inject>(Store); diff --git a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts b/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts deleted file mode 100644 index 6c3c8e1d9..000000000 --- a/src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatExpansionModule } from '@angular/material/expansion'; - -import { MatSharedModule } from '@shared'; -import { SeasonSelectorModule } from '@components/shared/selectors/season-selector'; -import { SbasOverlapSelectorModule } from '@components/shared/selectors/sbas-overlap-selector'; -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { MasterSceneSelectorModule } from '@components/shared/selectors/master-scene-selector'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; -import { ResultsMenuModule } from '@components/results-menu'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; -import { TimeseriesFiltersComponent } from './timeseries-filters.component'; - -@NgModule({ - declarations: [TimeseriesFiltersComponent], - imports: [ - CommonModule, - MatExpansionModule, - MatSharedModule, - SeasonSelectorModule, - SbasOverlapSelectorModule, - DateSelectorModule, - MasterSceneSelectorModule, - SearchTypeSelectorModule, - ResultsMenuModule, - CopyToClipboardModule, - DocsModalModule, - SharedModule, - ], - exports: [TimeseriesFiltersComponent], -}) -export class TimeseriesFiltersModule {} diff --git a/src/app/components/header/baseline-header/baseline-header.component.html b/src/app/components/header/baseline-header/baseline-header.component.html index 9a452ed16..d79d5263d 100644 --- a/src/app/components/header/baseline-header/baseline-header.component.html +++ b/src/app/components/header/baseline-header/baseline-header.component.html @@ -1,71 +1,76 @@ - - -
-
- - -
- -
- @if (shouldUseFramesForReference) { -
- +@if (breakpoint$ | async; as breakpoint) { + @if (searchType$ | async; as selectedSearchType) { + @if (breakpoint > breakpoints.MOBILE) { +
+
+ + +
+ +
+ @if (shouldUseFramesForReference) { +
+ +
+ } +
+ +
+
+ +
+
+
- } -
- -
- -
- -
- -
-
-
- -
-
- - -
- + } + @if (breakpoint === breakpoints.MOBILE) { +
+
+ +
+ +
-
- - + } + } +} diff --git a/src/app/components/header/baseline-header/baseline-header.component.ts b/src/app/components/header/baseline-header/baseline-header.component.ts index 9c135e9c7..8b0aaa533 100644 --- a/src/app/components/header/baseline-header/baseline-header.component.ts +++ b/src/app/components/header/baseline-header/baseline-header.component.ts @@ -11,12 +11,33 @@ import { Breakpoints } from '@models'; import { SubSink } from 'subsink'; import * as searchStore from '@store/search'; import * as models from '@models'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { MasterSceneSelectorComponent } from '@components/shared/selectors/master-scene-selector/master-scene-selector.component'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-baseline-header', templateUrl: './baseline-header.component.html', styleUrls: ['./baseline-header.component.css', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + BaselineFrameReferenceToggleComponent, + DatasetSelectorComponent, + MasterSceneSelectorComponent, + SearchButtonComponent, + HeaderButtonsComponent, + MatButton, + MatIcon, + AsyncPipe, + TranslateModule, + ], }) export class BaselineHeaderComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/header/baseline-header/baseline-header.module.ts b/src/app/components/header/baseline-header/baseline-header.module.ts deleted file mode 100644 index 86b0662f6..000000000 --- a/src/app/components/header/baseline-header/baseline-header.module.ts +++ /dev/null @@ -1,17 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { BaselineHeaderComponent } from './baseline-header.component'; -import { MatSharedModule, SharedModule } from '../../../shared'; -// import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle'; -@NgModule({ - declarations: [BaselineHeaderComponent], - imports: [ - CommonModule, - SharedModule, - MatSharedModule, - // BaselineFrameReferenceToggleComponent - ], - exports: [BaselineHeaderComponent], -}) -export class BaselineHeaderModule {} diff --git a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.html b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.html index 8881fc133..593cbb314 100644 --- a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.html +++ b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.html @@ -13,16 +13,17 @@ name="searchPolygon" matInput /> - - file_copy - + @if (!!polygon) { + + file_copy + + } - - - +@if (isAOIOptionsOpen) { + + + +} diff --git a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts index 770b74962..763e8813c 100644 --- a/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts +++ b/src/app/components/header/dataset-header/aoi-filter/aoi-filter.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild, OnDestroy, inject } from '@angular/core'; -import { NgForm } from '@angular/forms'; +import { NgForm, FormsModule } from '@angular/forms'; import { ClipboardService } from 'ngx-clipboard'; import { SubSink } from 'subsink'; @@ -16,13 +16,36 @@ import { menuAnimation, MapInteractionModeType, SearchType } from '@models'; import * as services from '@services'; import { DrawNewPolygon } from '@store/map'; import { SetGeocode } from '@store/filters'; +import { + MatFormField, + MatLabel, + MatInput, + MatSuffix, +} from '@angular/material/input'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatCard } from '@angular/material/card'; +import { AoiOptionsComponent } from '@components/shared/aoi-options/aoi-options.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-aoi-filter', templateUrl: './aoi-filter.component.html', styleUrls: ['./aoi-filter.component.scss', '../../header.component.scss'], animations: menuAnimation, - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatInput, + FormsModule, + + MatIcon, + MatSuffix, + MatTooltip, + MatCard, + AoiOptionsComponent, + TranslateModule, + ], }) export class AoiFilterComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/header/dataset-header/dataset-header.component.html b/src/app/components/header/dataset-header/dataset-header.component.html index edeac586b..270166d35 100644 --- a/src/app/components/header/dataset-header/dataset-header.component.html +++ b/src/app/components/header/dataset-header/dataset-header.component.html @@ -1,99 +1,98 @@ -
- -
- - - -
- + @if (breakpoint !== breakpoints.MOBILE) { +
+ - - @if (prop.isRelevant(p.FRAME_ORDERING)) { -
- - On Demand - +
+ + + @if (prop.isRelevant(p.FRAME_ORDERING)) { +
+ - - -
+ + + @if (frameSelectionEnabled$ | async) { +
+ + download + +
+ } +
+ } +
+ + +
+
+
+ @if (breakpoint === breakpoints.FULL) { +
+ +
+ } +
+ +
+
+ +
+
- } -
- - - -
- -
-
-
-
- -
- +
+
- -
- -
- -
-
-
- -
-
-
- - - -
- - -
- + } + @if (breakpoint === breakpoints.MOBILE) { +
+ +
+ +
-
- -
+ } +
+} diff --git a/src/app/components/header/dataset-header/dataset-header.component.ts b/src/app/components/header/dataset-header/dataset-header.component.ts index 949e8b87b..2effea702 100644 --- a/src/app/components/header/dataset-header/dataset-header.component.ts +++ b/src/app/components/header/dataset-header/dataset-header.component.ts @@ -9,12 +9,42 @@ import * as filterStore from '@store/filters'; import * as models from '@models'; import * as services from '@services'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { MatSlideToggle } from '@angular/material/slide-toggle'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { AoiFilterComponent } from './aoi-filter/aoi-filter.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { MatButton } from '@angular/material/button'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { MaxResultsSelectorComponent } from '@components/shared/max-results-selector/max-results-selector.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-dataset-header', templateUrl: './dataset-header.component.html', styleUrls: ['./dataset-header.component.scss', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + DatasetSelectorComponent, + MatSlideToggle, + DocsModalComponent, + MatTooltip, + MatIcon, + AoiFilterComponent, + NgClass, + DateSelectorComponent, + MatButton, + SearchButtonComponent, + MaxResultsSelectorComponent, + HeaderButtonsComponent, + AsyncPipe, + TranslateModule, + ], }) export class DatasetHeaderComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/header/header-buttons/customize-env/customize-env.component.ts b/src/app/components/header/header-buttons/customize-env/customize-env.component.ts index 3f1304afa..988f6c88b 100644 --- a/src/app/components/header/header-buttons/customize-env/customize-env.component.ts +++ b/src/app/components/header/header-buttons/customize-env/customize-env.component.ts @@ -1,6 +1,17 @@ import { Component, OnInit, inject } from '@angular/core'; import { EnvironmentService, NotificationService } from '@services'; +import { + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { CdkTextareaAutosize } from '@angular/cdk/text-field'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-customize-env', @@ -9,7 +20,19 @@ import { EnvironmentService, NotificationService } from '@services'; './customize-env.component.scss', '../preferences/preferences.component.scss', ], - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + FormsModule, + MatFormField, + MatLabel, + MatInput, + CdkTextareaAutosize, + MatDialogActions, + MatButton, + TranslateModule, + ], }) export class CustomizeEnvComponent implements OnInit { private env = inject(EnvironmentService); diff --git a/src/app/components/header/header-buttons/header-buttons.component.html b/src/app/components/header/header-buttons/header-buttons.component.html index 33c13af5d..e6057bf99 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.html +++ b/src/app/components/header/header-buttons/header-buttons.component.html @@ -1,222 +1,225 @@ -
- - - - - - - - + + + + + - - + - + } - - - - - - - - - - - - - - - + } + @if (isLoggedIn) { + + } + } + } + @if (breakpoint === breakpoints.MOBILE) { + - account_circle -
{{ this.userAuth.id }}
- - - - - - - - - - - - + + + + - {{ 'SUBMITTED_PRODUCTS' | translate }} - - - - - - - shopping_cart - - - - help_outline - - - - translate - - - - account_circle - - - - account_circle - - -
+ shopping_cart + + + help_outline + + + translate + + @if (!isLoggedIn) { + + account_circle + + } + @if (isLoggedIn) { + + account_circle + + } + } +
+}
- + @if ((breakpoint$ | async) === breakpoints.MOBILE) {
- -
- - © {{ anio }} ASF© {{ 'OPEN_STREET_MAP_CONTRIBUTORS' | translate }} - + } @@ -441,16 +464,18 @@ {{ 'BUILD_COMMIT' | translate }} - - link - {{ 'WEBSITE_LINKS' | translate }} - + @if (!env.isProd) { + + link + {{ 'WEBSITE_LINKS' | translate }} + + } - + @for (lang of language.translate.getLangs(); track lang) { - + } diff --git a/src/app/components/header/header-buttons/header-buttons.component.scss b/src/app/components/header/header-buttons/header-buttons.component.scss index 6b52904a7..77904a960 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.scss +++ b/src/app/components/header/header-buttons/header-buttons.component.scss @@ -20,5 +20,17 @@ display: flex; flex-direction: column; height: 100%; +} + +.external-link-icon { + font-size: 12px; + width: 12px; + height: 12px; + vertical-align: middle; + margin-left: 2px; +} +.storymap-icon { + width: 30px; + height: 30px; } diff --git a/src/app/components/header/header-buttons/header-buttons.component.ts b/src/app/components/header/header-buttons/header-buttons.component.ts index 6e33c56c4..1b6c47fd0 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.ts +++ b/src/app/components/header/header-buttons/header-buttons.component.ts @@ -33,6 +33,16 @@ import { } from '@models'; import { ThemePalette } from '@angular/material/core'; +import { AsyncPipe, TitleCasePipe } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatBadge } from '@angular/material/badge'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { MatSuffix } from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; // Declare GTM dataLayer array. declare global { @@ -46,7 +56,21 @@ declare global { templateUrl: './header-buttons.component.html', styleUrls: ['./header-buttons.component.scss'], animations: [], - standalone: false, + imports: [ + MatButton, + MatMenuTrigger, + MatTooltip, + MatIcon, + MatBadge, + MatMenu, + MatMenuItem, + SearchButtonComponent, + DocsModalComponent, + MatSuffix, + AsyncPipe, + TitleCasePipe, + TranslateModule, + ], }) export class HeaderButtonsComponent implements OnInit, OnDestroy { authService = inject(AuthService); @@ -212,6 +236,17 @@ export class HeaderButtonsComponent implements OnInit, OnDestroy { this.openNewWindow(url, analyticsEvent); } + public onOpenStoryMap(): void { + const url = + 'https://storymaps.arcgis.com/collections/c52e34d6f5a34538a45a9c9c4dfbc3dc'; + const analyticsEvent = { + name: 'open-storymap', + value: url, + }; + + this.openNewWindow(url, analyticsEvent); + } + public onOpenOnDemandDocs(): void { const url = 'https://hyp3-docs.asf.alaska.edu/'; const analyticsEvent = { diff --git a/src/app/components/header/header-buttons/header-buttons.module.ts b/src/app/components/header/header-buttons/header-buttons.module.ts deleted file mode 100644 index d3826068e..000000000 --- a/src/app/components/header/header-buttons/header-buttons.module.ts +++ /dev/null @@ -1,52 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatBadgeModule } from '@angular/material/badge'; -import { MatInputModule } from '@angular/material/input'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector'; - -import { HeaderButtonsComponent } from './header-buttons.component'; -import { PreferencesComponent } from './preferences/preferences.component'; -import { CustomizeEnvComponent } from './customize-env/customize-env.component'; -import { OnlynumberDirective } from '@directives/onlynumber.directive'; -import { SharedModule } from '@shared'; -import { Hyp3UrlSelectorComponent } from './preferences/hyp3-url-selector/hyp3-url-selector.component'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { LanguageSelectorModule } from '@components/shared/selectors/language-selector/language-selector.module'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SearchButtonModule } from '@components/shared/search-button'; - -@NgModule({ - declarations: [ - HeaderButtonsComponent, - PreferencesComponent, - CustomizeEnvComponent, - OnlynumberDirective, - Hyp3UrlSelectorComponent, - ], - imports: [ - CommonModule, - FormsModule, - MatBadgeModule, - MatMenuModule, - MatInputModule, - MatDialogModule, - MatSharedModule, - MatSelectModule, - DatasetSelectorModule, - MatFormFieldModule, - SharedModule, - LanguageSelectorModule, - DocsModalModule, - SearchButtonModule, - MatAutocompleteModule, - ], - exports: [HeaderButtonsComponent], -}) -export class HeaderButtonsModule {} diff --git a/src/app/components/header/header-buttons/preferences/hyp3-url-selector/hyp3-url-selector.component.ts b/src/app/components/header/header-buttons/preferences/hyp3-url-selector/hyp3-url-selector.component.ts index 7e562c337..6cf57104c 100644 --- a/src/app/components/header/header-buttons/preferences/hyp3-url-selector/hyp3-url-selector.component.ts +++ b/src/app/components/header/header-buttons/preferences/hyp3-url-selector/hyp3-url-selector.component.ts @@ -1,5 +1,20 @@ import { Component, EventEmitter, Output, Input, inject } from '@angular/core'; import { Hyp3ApiService } from '@services'; +import { + MatFormField, + MatLabel, + MatInput, + MatSuffix, +} from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; +import { + MatAutocompleteTrigger, + MatAutocomplete, +} from '@angular/material/autocomplete'; +import { MatOption } from '@angular/material/select'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-hyp3-url-selector', @@ -8,7 +23,20 @@ import { Hyp3ApiService } from '@services'; './hyp3-url-selector.component.scss', '../preferences.component.scss', ], - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatInput, + FormsModule, + MatAutocompleteTrigger, + MatAutocomplete, + MatOption, + MatIconButton, + MatSuffix, + MatIcon, + MatButton, + TranslateModule, + ], }) export class Hyp3UrlSelectorComponent { private hyp3 = inject(Hyp3ApiService); diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.html b/src/app/components/header/header-buttons/preferences/preferences.component.html index bd3de69d3..e3193a416 100644 --- a/src/app/components/header/header-buttons/preferences/preferences.component.html +++ b/src/app/components/header/header-buttons/preferences/preferences.component.html @@ -30,12 +30,11 @@ (selectionChange)="onChangeDefaultLanguage($event.value)" name="preset" > - - {{ language.getName(lang) | titlecase }} - + @for (lang of translate.getLangs(); track lang) { + + {{ language.getName(lang) | titlecase }} + + } @@ -46,9 +45,11 @@ (selectionChange)="onChangeDefaultTheme($event.value)" name="preset" > - - {{ theme | titlecase | uppercase | translate }} - + @for (theme of themeOptions; track theme) { + + {{ theme | titlecase | uppercase | translate }} + + }
@@ -79,12 +80,11 @@ (selectionChange)="onChangeMaxResultsDefault($event.value)" name="maxResult" > - - {{ resultAmount }} {{ 'FILES' | translate }} - + @for (resultAmount of maxResults; track resultAmount) { + + {{ resultAmount }} {{ 'FILES' | translate }} + + } @@ -114,26 +114,29 @@ > {{ 'DEFAULT_SEARCH_FILTERS_PRESETS' | translate }}
- - {{ - type === 'DATASET' ? ('GEOGRAPHIC' | translate) : (type | translate) - }} - - + {{ + type === 'DATASET' + ? ('GEOGRAPHIC' | translate) + : (type | translate) + }} + - {{ preset.name | uppercase | translate }} - - - + @for ( + preset of userFiltersBySearchType[searchType[type]]; + track preset + ) { + + {{ preset.name | uppercase | translate }} + + } + + + }
diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.ts b/src/app/components/header/header-buttons/preferences/preferences.component.ts index 0f01e5257..abd697a3f 100644 --- a/src/app/components/header/header-buttons/preferences/preferences.component.ts +++ b/src/app/components/header/header-buttons/preferences/preferences.component.ts @@ -11,7 +11,12 @@ import { AppState } from '@store'; import * as userStore from '@store/user'; import * as hyp3Store from '@store/hyp3'; -import { MatDialogRef } from '@angular/material/dialog'; +import { + MatDialogRef, + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; import { MapLayerTypes, UserAuth, @@ -25,16 +30,43 @@ import { import { Hyp3ApiService, ThemingService } from '@services'; import { SubSink } from 'subsink'; import { take } from 'rxjs'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { AsfLanguageService } from '@services/asf-language.service'; import * as models from '@models'; import * as services from '@services'; +import { MatIcon } from '@angular/material/icon'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatLabel } from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { UpperCasePipe, TitleCasePipe } from '@angular/common'; +import { DatasetSelectorComponent } from '@components/shared/selectors/dataset-selector/dataset-selector.component'; +import { Hyp3UrlSelectorComponent } from './hyp3-url-selector/hyp3-url-selector.component'; +import { MatButton } from '@angular/material/button'; @Component({ selector: 'app-preferences', templateUrl: './preferences.component.html', styleUrls: ['./preferences.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + MatIcon, + CdkScrollable, + MatDialogContent, + FormsModule, + MatFormField, + MatLabel, + MatSelect, + + MatOption, + DatasetSelectorComponent, + Hyp3UrlSelectorComponent, + MatDialogActions, + MatButton, + UpperCasePipe, + TitleCasePipe, + TranslateModule, + ], }) export class PreferencesComponent implements OnInit, OnDestroy { private dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/header/header.component.html b/src/app/components/header/header.component.html index f42ef12ea..ca6f398be 100644 --- a/src/app/components/header/header.component.html +++ b/src/app/components/header/header.component.html @@ -1,45 +1,48 @@ -
-
-
-
- -
-
- +@if (breakpoint$ | async; as breakpoint) { +
- - - - - - - - - - - - - - - - - - - - - - +
+
+ +
+
+ @if (searchType$ | async; as searchType) { +
+ @if (searchType === searchTypes.DATASET) { + + } + @if (searchType === searchTypes.DISPLACEMENT) { + + } + @if (searchType === searchTypes.LIST) { + + } + @if (searchType === searchTypes.BASELINE) { + + } + @if (searchType === searchTypes.SBAS) { + + } + @if (searchType === searchTypes.SARVIEWS_EVENTS) { + + } + @if (searchType === searchTypes.CUSTOM_PRODUCTS) { + + } + @if (breakpoint !== breakpoints.MOBILE) { + + } +
+ }
+ @if (isLoading) { + + }
- -
+} diff --git a/src/app/components/header/header.component.ts b/src/app/components/header/header.component.ts index fc916cae9..6e269fade 100644 --- a/src/app/components/header/header.component.ts +++ b/src/app/components/header/header.component.ts @@ -9,12 +9,33 @@ import * as searchStore from '@store/search'; import * as models from '@models/index'; import * as services from '@services'; import { TranslateService } from '@ngx-translate/core'; +import { AsyncPipe } from '@angular/common'; +import { LogoComponent } from './logo/logo.component'; +import { DatasetHeaderComponent } from './dataset-header/dataset-header.component'; +import { TimeseriesHeaderComponent } from './timeseries-header/timeseries-header.component'; +import { ListHeaderComponent } from './list-header/list-header.component'; +import { BaselineHeaderComponent } from './baseline-header/baseline-header.component'; +import { SarviewsHeaderComponent } from './sarviews-header/sarviews-header.component'; +import { Hyp3HeaderComponent } from './hyp3-header/hyp3-header.component'; +import { InfoBarComponent } from './info-bar/info-bar.component'; +import { MatProgressBar } from '@angular/material/progress-bar'; @Component({ selector: 'app-header', templateUrl: './header.component.html', styleUrls: ['./header.component.scss'], - standalone: false, + imports: [ + LogoComponent, + DatasetHeaderComponent, + TimeseriesHeaderComponent, + ListHeaderComponent, + BaselineHeaderComponent, + SarviewsHeaderComponent, + Hyp3HeaderComponent, + InfoBarComponent, + MatProgressBar, + AsyncPipe, + ], }) export class HeaderComponent { private store$ = inject>(Store); diff --git a/src/app/components/header/header.module.ts b/src/app/components/header/header.module.ts deleted file mode 100644 index a0790c9f7..000000000 --- a/src/app/components/header/header.module.ts +++ /dev/null @@ -1,124 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule, NgOptimizedImage } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { - provideHttpClient, - withInterceptorsFromDi, -} from '@angular/common/http'; - -import { MatBadgeModule } from '@angular/material/badge'; -import { MatInputModule } from '@angular/material/input'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatToolbarModule } from '@angular/material/toolbar'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; - -import { MatSharedModule } from '@shared'; - -import { QueueModule } from './queue'; -import { ProcessingQueueModule } from './processing-queue'; -import { HeaderButtonsModule } from './header-buttons'; - -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatSelectModule } from '@angular/material/select'; - -import { DatasetSelectorModule } from '@components/shared/selectors/dataset-selector'; -import { DateSelectorModule } from '@components/shared/selectors/date-selector'; -import { AoiOptionsModule } from '@components/shared/aoi-options'; -import { MaxResultsSelectorModule } from '@components/shared/max-results-selector'; -import { SearchButtonModule } from '@components/shared/search-button'; -import { ClearButtonModule } from '@components/shared/clear-button'; -import { PipesModule } from '@pipes'; -import { SearchTypeSelectorModule } from '@components/shared/selectors/search-type-selector'; -import { ProjectNameSelectorModule } from '@components/shared/selectors/project-name-selector'; -import { JobStatusSelectorModule } from '@components/shared/selectors/job-status-selector'; -import { JobProductNameSelectorModule } from '@components/shared/selectors/job-product-name-selector'; -import { SarviewsEventSearchSelectorModule } from '@components/shared/selectors/sarviews-event-search-selector'; -import { OnDemandUserSelectorModule } from '@components/shared/selectors/on-demand-user-selector'; -import { LogoModule } from '@components/header/logo/logo.module'; - -import { HeaderComponent } from './header.component'; -import { InfoBarComponent } from './info-bar/info-bar.component'; -import { DatasetHeaderComponent } from './dataset-header/dataset-header.component'; -import { TimeseriesHeaderComponent } from './timeseries-header/timeseries-header.component'; -import { ListHeaderComponent } from './list-header/list-header.component'; -import { BaselineHeaderComponent } from './baseline-header/baseline-header.component'; -import { SarviewsHeaderComponent } from './sarviews-header/sarviews-header.component'; -import { Hyp3HeaderComponent } from './hyp3-header/hyp3-header.component'; -import { AoiFilterComponent } from './dataset-header/aoi-filter/aoi-filter.component'; - -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MasterSceneSelectorModule } from '@components/shared/selectors/master-scene-selector'; -import { CiSearchModule } from './info-bar/ci-search/ci-search.module'; -import { SarviewsEventTypeSelectorModule } from '@components/shared/selectors/sarviews-event-type-selector'; -import { Hyp3UrlModule } from '@components/shared/hyp3-url/hyp3-url.module'; -import { SharedModule } from '@shared'; -import { LanguageSelectorModule } from '@components/shared/selectors/language-selector/language-selector.module'; -import { BurstSelectorModule } from '@components/shared/selectors/burst-selector'; -import { TimeseriesChartFlightDirectionToggleComponent } from '@components/timeseries-chart/timeseries-chart-flight-direction-toggle'; -import { MatSlideToggle } from '@angular/material/slide-toggle'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { MatTooltipModule } from '@angular/material/tooltip'; - -import { BaselineFrameReferenceToggleComponent } from '@components/shared/selectors/baseline-frame-reference-toggle'; -@NgModule({ - declarations: [ - HeaderComponent, - InfoBarComponent, - DatasetHeaderComponent, - ListHeaderComponent, - AoiFilterComponent, - BaselineHeaderComponent, - Hyp3HeaderComponent, - SarviewsHeaderComponent, - TimeseriesHeaderComponent, - ], - imports: [ - CommonModule, - FormsModule, - MatButtonToggleModule, - MatToolbarModule, - MatProgressBarModule, - MatBadgeModule, - MatMenuModule, - MatInputModule, - MatSelectModule, - MatDatepickerModule, - MatSharedModule, - MatAutocompleteModule, - PipesModule, - QueueModule, - ProcessingQueueModule, - SearchTypeSelectorModule, - DatasetSelectorModule, - DateSelectorModule, - AoiOptionsModule, - MaxResultsSelectorModule, - SearchButtonModule, - ClearButtonModule, - HeaderButtonsModule, - MasterSceneSelectorModule, - LogoModule, - ProjectNameSelectorModule, - JobStatusSelectorModule, - JobProductNameSelectorModule, - CiSearchModule, - SarviewsEventSearchSelectorModule, - SarviewsEventTypeSelectorModule, - Hyp3UrlModule, - SharedModule, - LanguageSelectorModule, - OnDemandUserSelectorModule, - BurstSelectorModule, - TimeseriesChartFlightDirectionToggleComponent, - NgOptimizedImage, - MatSlideToggle, - DocsModalModule, - BaselineFrameReferenceToggleComponent, - NgOptimizedImage, - MatTooltipModule, - ], - providers: [provideHttpClient(withInterceptorsFromDi())], - exports: [HeaderComponent], -}) -export class HeaderModule {} diff --git a/src/app/components/header/hyp3-header/hyp3-header.component.html b/src/app/components/header/hyp3-header/hyp3-header.component.html index 210f48560..ed495332e 100644 --- a/src/app/components/header/hyp3-header/hyp3-header.component.html +++ b/src/app/components/header/hyp3-header/hyp3-header.component.html @@ -1,60 +1,55 @@ -
- -
- - - - - - -
- +@if (breakpoint$ | async; as breakpoint) { +
+ @if (breakpoint !== breakpoints.MOBILE) { +
+ + + + + @if (breakpoint > breakpoints.SMALL) { +
+ +
+ } + @if (breakpoint === breakpoints.FULL) { + + } +
+ +
+
+
+ +
+
+
+ +
- - - -
+ } + @if (breakpoint === breakpoints.MOBILE) { +
-
- -
-
- +
+
- -
- -
-
- - - -
- - -
- -
-
- -
+ } +
+} diff --git a/src/app/components/header/hyp3-header/hyp3-header.component.ts b/src/app/components/header/hyp3-header/hyp3-header.component.ts index 8c64ddcd5..21bc8519a 100644 --- a/src/app/components/header/hyp3-header/hyp3-header.component.ts +++ b/src/app/components/header/hyp3-header/hyp3-header.component.ts @@ -7,12 +7,33 @@ import * as hyp3Store from '@store/hyp3'; import * as models from '@models'; import * as services from '@services'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { ProjectNameSelectorComponent } from '@components/shared/selectors/project-name-selector/project-name-selector.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { JobStatusSelectorComponent } from '@components/shared/selectors/job-status-selector/job-status-selector.component'; +import { MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-hyp3-header', templateUrl: './hyp3-header.component.html', styleUrls: ['./hyp3-header.component.scss', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + ProjectNameSelectorComponent, + DateSelectorComponent, + JobStatusSelectorComponent, + MatButton, + MatIcon, + SearchButtonComponent, + HeaderButtonsComponent, + AsyncPipe, + TranslateModule, + ], }) export class Hyp3HeaderComponent { private store$ = inject>(Store); diff --git a/src/app/components/header/index.ts b/src/app/components/header/index.ts deleted file mode 100644 index b9af6ea04..000000000 --- a/src/app/components/header/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './header.module'; diff --git a/src/app/components/header/info-bar/ci-search/ci-search.component.ts b/src/app/components/header/info-bar/ci-search/ci-search.component.ts index 33df8524b..6e5e5ec38 100644 --- a/src/app/components/header/info-bar/ci-search/ci-search.component.ts +++ b/src/app/components/header/info-bar/ci-search/ci-search.component.ts @@ -1,10 +1,11 @@ -import { Component } from '@angular/core'; +import { Component, CUSTOM_ELEMENTS_SCHEMA } from '@angular/core'; @Component({ selector: 'app-ci-search', templateUrl: './ci-search.component.html', + schemas: [CUSTOM_ELEMENTS_SCHEMA], styleUrls: ['./ci-search.component.scss'], - standalone: false, + standalone: true, }) export class CiSearchComponent { constructor() { diff --git a/src/app/components/header/info-bar/ci-search/ci-search.module.ts b/src/app/components/header/info-bar/ci-search/ci-search.module.ts deleted file mode 100644 index 1d9fc2201..000000000 --- a/src/app/components/header/info-bar/ci-search/ci-search.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CiSearchComponent } from './ci-search.component'; - -@NgModule({ - declarations: [CiSearchComponent], - imports: [CommonModule], - exports: [CiSearchComponent], - schemas: [CUSTOM_ELEMENTS_SCHEMA], -}) -export class CiSearchModule {} diff --git a/src/app/components/header/info-bar/info-bar.component.html b/src/app/components/header/info-bar/info-bar.component.html index 9a16b0d85..8d0c2b851 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -1,159 +1,221 @@ -
-
- - - - - {{ 'USER_ID_INFO_BAR' | translate }}: {{ userID }} - - - - {{ 'HYP3_JOB_IDS_INFO_BAR' | translate }}: {{ jobIds.length }} +@if (breakpoint$ | async; as breakpoint) { +
+
+ @if ((searchType$ | async) === searchTypes.CUSTOM_PRODUCTS) { + + + + @if (!!userID) { + + {{ 'USER_ID_INFO_BAR' | translate }}: {{ userID }} + + } + @if (jobIds?.length) { + + {{ 'HYP3_JOB_IDS_INFO_BAR' | translate }}: + {{ jobIds.length }} + + } + - - - - - {{ 'PRODUCT_TYPES' | translate }}: {{ eventProductTypes }} - - - - {{ 'START' | translate }}: {{ startDate | shortDate }} - - - {{ 'END' | translate }}: {{ endDate | shortDate }} - - - - @if (selectedDatasetIsNISARFormat) { - {{ 'TRACK' | translate }} - } @else { - {{ 'PATH' | translate }} + ) { + + {{ 'PRODUCT_TYPES' | translate }}: {{ eventProductTypes }} + + } + @if (breakpoint > breakpoints.SMALL && !!startDate) { + + {{ 'START' | translate }}: {{ startDate | shortDate }} + + } + @if (breakpoint > breakpoints.SMALL && !!endDate) { + + {{ 'END' | translate }}: {{ endDate | shortDate }} + + } + @if (pathRange.start || pathRange.end) { + + + @if (selectedDatasetIsNISARFormat) { + {{ 'TRACK' | translate }} + } @else { + {{ 'PATH' | translate }} + } + : + {{ pathRange.start }} - {{ pathRange.end }} + + } + @if (frameRange.start || frameRange.end) { + + {{ 'FRAME' | translate }}: {{ frameRange.start }} - + {{ frameRange.end }} + + } + @if (season.start || season.end) { + + {{ 'SEASON' | translate }}: {{ season.start }} - + {{ season.end }} + + } + @if (shouldOmitSearchPolygon) { + + {{ 'OMIT_GEO' | translate }}: + {{ shouldOmitSearchPolygon ? 'Yes' : 'No' }} + + } + @if (productTypes) { + + {{ 'FILE_TYPES' | translate }}: {{ productTypes }} + + } + @if (beamModes.length) { + + {{ 'BEAM_MODES' | translate | titlecase }}: {{ beamModes }} + + } + @if (polarizations.length) { + + + @if (dataset !== 'NISAR') { + {{ 'POLARIZATIONS' | translate }} + } @else { + {{ 'MAIN_POLARIZATIONS' | translate }} + } + : + {{ polarizations | join: ', ' }} + + } + @if (sidePolarizations.length) { + + {{ 'SIDE_POLARIZATIONS' | translate }}: + {{ sidePolarizations | join: ', ' }} + + } + @if (instruments.length) { + + {{ 'INSTRUMENTS' | translate }}: {{ instruments }} + + } + @if (frameCoverage.length) { + + {{ 'FRAME_COVERAGE' | translate }}: {{ frameCoverage }} + + } + @if (rangeBandwidth.length) { + + {{ 'RANGE_BANDWIDTH' | translate }}: {{ rangeBandwidth }} + + } + @if (jointObservation) { + + {{ 'DATA_TYPE' | translate }}: + {{ 'JOINT_OBSERVATION_ONLY' | translate }} + + } + @if (dataset === 'NISAR') { + @if (scienceProducts.length) { + + {{ 'SCIENCE_PRODUCT' | translate }}: + {{ scienceProducts | join: ', ' }} + } - : - {{ pathRange.start }} - {{ pathRange.end }} - - - {{ 'FRAME' | translate }}: {{ frameRange.start }} - - {{ frameRange.end }} - - - {{ 'SEASON' | translate }}: {{ season.start }} - {{ season.end }} - - - {{ 'OMIT_GEO' | translate }}: - {{ shouldOmitSearchPolygon ? 'Yes' : 'No' }} - - - {{ 'FILE_TYPES' | translate }}: {{ productTypes }} - - - {{ 'BEAM_MODES' | translate | titlecase }}: {{ beamModes }} - - - - @if (dataset !== 'NISAR') { - {{ 'POLARIZATIONS' | translate }} - } @else { - {{ 'MAIN_POLARIZATIONS' | translate }} + @if (productionConfig.length) { + + {{ 'PRODUCTION_CONFIGURATION' | translate }}: + {{ productionConfig }} + + } + } + @if (flightDirections.length) { + + {{ 'FLIGHT_DIR' | translate }}: {{ flightDirections }} + + } + @if (subtypes) { + + {{ 'DATASET' | translate }}: {{ subtypes }} + + } + @if (mission) { + + {{ 'CAMPAIGN' | translate }}: {{ mission }} + + } + @if ((searchType$ | async) !== searchTypes.DISPLACEMENT) { + + @if (tempRange.start || tempRange.end) { + + {{ 'TEMPORAL' | translate }}: {{ tempRange.start }} + @if (!!tempRange.end) { + {{ 'TO' | translate }} {{ tempRange.end }} + } + + } + + } + @if (perpRange.start || perpRange.end) { + + {{ 'PERPENDICULAR' | translate }}: {{ perpRange.start }} + @if (!!perpRange.end) { + {{ 'TO' | translate }} {{ perpRange.end }} + } + + } + + @if (fullBurstIDs?.length > 0) { + + {{ 'FULL_BURST_ID' | translate }}: + {{ + fullBurstIDs.length <= 4 + ? fullBurstIDs.join(', ') + : fullBurstIDs.length + ' IDs' + }} + } - : - {{ polarizations | join: ', ' }} - - - {{ 'SIDE_POLARIZATIONS' | translate }}: - {{ sidePolarizations | join: ', ' }} - - - {{ 'INSTRUMENTS' | translate }}: {{ instruments }} - - - {{ 'FRAME_COVERAGE' | translate }}: {{ frameCoverage }} - - - {{ 'RANGE_BANDWIDTH' | translate }}: {{ rangeBandwidth }} - - - {{ 'DATA_TYPE' | translate }}: - {{ 'JOINT_OBSERVATION_ONLY' | translate }} - - @if (dataset === 'NISAR') { - - {{ 'SCIENCE_PRODUCT' | translate }}: - {{ scienceProducts | join: ', ' }} - - - {{ 'PRODUCTION_CONFIGURATION' | translate }}: - {{ productionConfig }} - - } - - {{ 'FLIGHT_DIR' | translate }}: {{ flightDirections }} - - - {{ 'DATASET' | translate }}: {{ subtypes }} - - - {{ 'CAMPAIGN' | translate }}: {{ mission }} - - - - {{ 'TEMPORAL' | translate }}: {{ tempRange.start }} - - {{ 'TO' | translate }} {{ tempRange.end }} - - - - {{ 'PERPENDICULAR' | translate }}: {{ perpRange.start }} - - {{ 'TO' | translate }} {{ perpRange.end }} - - - - - {{ 'FULL_BURST_ID' | translate }}: - {{ - fullBurstIDs.length <= 4 - ? fullBurstIDs.join(', ') - : fullBurstIDs.length + ' IDs' - }} - - - - {{ 'OPERA_BURST_ID' | translate }}: - {{ - operaBurstIDs.length <= 4 - ? operaBurstIDs.join(', ') - : operaBurstIDs.length + ' IDs' - }} + + @if (operaBurstIDs?.length > 0) { + + {{ 'OPERA_BURST_ID' | translate }}: + {{ + operaBurstIDs.length <= 4 + ? operaBurstIDs.join(', ') + : operaBurstIDs.length + ' IDs' + }} + + } - - - - {{ 'DATA_TYPE' | translate }}: {{ 'CALIBRATION' | translate }} + + @if (useCalibrationData) { + + {{ 'DATA_TYPE' | translate }}: + {{ 'CALIBRATION' | translate }} + + } - - - - {{ 'GROUP_ID_INFO_BAR' | translate }}: {{ groupID }} + + @if (!!groupID) { + + {{ 'GROUP_ID_INFO_BAR' | translate }}: {{ groupID }} + + } - - - - {{ 'SHORT_NAMES' | translate }}: {{ shortNames }} + + @if (!!shortNames) { + + {{ 'SHORT_NAMES' | translate }}: {{ shortNames }} + + } - -
-
- +
+
+ +
-
+} diff --git a/src/app/components/header/info-bar/info-bar.component.ts b/src/app/components/header/info-bar/info-bar.component.ts index 68514eddb..450963238 100644 --- a/src/app/components/header/info-bar/info-bar.component.ts +++ b/src/app/components/header/info-bar/info-bar.component.ts @@ -11,6 +11,12 @@ import * as searchStore from '@store/search'; import * as services from '@services'; import * as models from '@models'; import * as userStore from '@store/user'; +import { AsyncPipe, TitleCasePipe } from '@angular/common'; +import { Hyp3UrlComponent } from '@components/shared/hyp3-url/hyp3-url.component'; +import { CiSearchComponent } from './ci-search/ci-search.component'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { JoinPipe } from '@pipes/join.pipe'; +import { TranslateModule } from '@ngx-translate/core'; // Declare GTM dataLayer array. declare global { @@ -23,13 +29,20 @@ declare global { selector: 'app-info-bar', templateUrl: './info-bar.component.html', styleUrls: ['./info-bar.component.scss'], - standalone: false, + imports: [ + Hyp3UrlComponent, + CiSearchComponent, + AsyncPipe, + TitleCasePipe, + ShortDatePipe, + JoinPipe, + TranslateModule, + ], }) export class InfoBarComponent implements OnInit, OnDestroy { private store$ = inject>(Store); private screenSize = inject(services.ScreenSizeService); private hyp3 = inject(services.Hyp3ApiService); - public searchType: models.SearchType = models.SearchType.DATASET; public searchTypes = models.SearchType; public searchType$ = this.store$.select(searchStore.getSearchType); diff --git a/src/app/components/header/list-header/list-header.component.html b/src/app/components/header/list-header/list-header.component.html index 7172d2d69..5e4f7dca0 100644 --- a/src/app/components/header/list-header/list-header.component.html +++ b/src/app/components/header/list-header/list-header.component.html @@ -1,43 +1,43 @@ - -
-
- - -
+@if (breakpoint$ | async; as breakpoint) { + @if (breakpoint > breakpoints.MOBILE) { +
+
+ + +
+ +
+
+ +
+
+ +
+
+
+ } + @if (breakpoint === breakpoints.MOBILE) { +
+
-
- -
- -
- -
- -
-
-
- -
-
- - -
- +
+ +
-
- + } +} diff --git a/src/app/components/header/list-header/list-header.component.ts b/src/app/components/header/list-header/list-header.component.ts index 6c4868b3d..d73787922 100644 --- a/src/app/components/header/list-header/list-header.component.ts +++ b/src/app/components/header/list-header/list-header.component.ts @@ -6,12 +6,27 @@ import * as uiStore from '@store/ui'; import { ScreenSizeService } from '@services'; import { Breakpoints } from '@models'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-list-header', templateUrl: './list-header.component.html', styleUrls: ['./list-header.component.css', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + MatButton, + MatIcon, + SearchButtonComponent, + HeaderButtonsComponent, + AsyncPipe, + TranslateModule, + ], }) export class ListHeaderComponent { private store$ = inject>(Store); diff --git a/src/app/components/header/logo/logo.component.html b/src/app/components/header/logo/logo.component.html index ebfd8441f..2f1a4802b 100644 --- a/src/app/components/header/logo/logo.component.html +++ b/src/app/components/header/logo/logo.component.html @@ -1,24 +1,19 @@ - -
- -
- -
- -
- -
- -
- +@if (breakpoint$ | async; as breakpoint) { + @if (breakpoint !== breakpoints.MOBILE) { +
+ +
+ +
+ +
+ } + @if (breakpoint === breakpoints.MOBILE) { +
+ +
+ } +} diff --git a/src/app/components/header/logo/logo.component.ts b/src/app/components/header/logo/logo.component.ts index c55e0381e..a9d600b3d 100644 --- a/src/app/components/header/logo/logo.component.ts +++ b/src/app/components/header/logo/logo.component.ts @@ -2,12 +2,14 @@ import { Component, inject } from '@angular/core'; import { ScreenSizeService } from '@services'; import { Breakpoints } from '@models'; +import { AsyncPipe } from '@angular/common'; +import { MatCard } from '@angular/material/card'; @Component({ selector: 'app-logo', templateUrl: './logo.component.html', styleUrls: ['./logo.component.scss'], - standalone: false, + imports: [MatCard, AsyncPipe], }) export class LogoComponent { private screenSize = inject(ScreenSizeService); diff --git a/src/app/components/header/logo/logo.module.ts b/src/app/components/header/logo/logo.module.ts deleted file mode 100644 index b5f002547..000000000 --- a/src/app/components/header/logo/logo.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatRippleModule } from '@angular/material/core'; - -import { MatSharedModule } from '@shared'; -import { LogoComponent } from './logo.component'; - -@NgModule({ - declarations: [LogoComponent], - imports: [CommonModule, MatRippleModule, MatSharedModule], - exports: [LogoComponent], -}) -export class LogoModule {} diff --git a/src/app/components/header/processing-queue/confirmation/confirmation.component.html b/src/app/components/header/processing-queue/confirmation/confirmation.component.html index 702976ad5..5ace323dc 100644 --- a/src/app/components/header/processing-queue/confirmation/confirmation.component.html +++ b/src/app/components/header/processing-queue/confirmation/confirmation.component.html @@ -6,39 +6,41 @@

{{ 'REVIEW_SUBMISSION' | translate }}

-
- - -
- {{ tabQueue.jobType.name }} -
-
- {{ tabQueue.jobs.length }} - - {{ - 'JOB' | titlecase | translate - }} - {{ - 'JOBS' | titlecase | translate - }} : {{ tabQueue.creditTotal }} - - {{ - 'CREDIT' | translate - }} - {{ - 'CREDITS' | translate - }} - -
- - -

-
+ @for (tabQueue of jobTypesWithQueued; track tabQueue) { +
+ + +
+ {{ tabQueue.jobType.name }} +
+
+ {{ tabQueue.jobs.length }} + + {{ + 'JOB' | titlecase | translate + }} + {{ + 'JOBS' | titlecase | translate + }} : {{ tabQueue.creditTotal }} + + {{ + 'CREDIT' | translate + }} + {{ + 'CREDITS' | translate + }} + +
+ + +

+
+ } {{ 'WHAT_ARE_CREDITS' | translate }} @@ -58,10 +60,11 @@

{{ 'REVIEW_SUBMISSION' | translate }}

> {{ 'SUBMIT' | translate }} {{ amountSelected(jobTypesWithQueued) }} - {{ 'JOB' | translate | titlecase - }}s ({{ - creditsSelected(jobTypesWithQueued) - }} + {{ 'JOB' | translate | titlecase }} + @if (amountSelected(jobTypesWithQueued) > 1) { + s + } + ({{ creditsSelected(jobTypesWithQueued) }} {{ 'CREDIT' | translate }} {{ diff --git a/src/app/components/header/processing-queue/confirmation/confirmation.component.ts b/src/app/components/header/processing-queue/confirmation/confirmation.component.ts index 3e6626638..9be576159 100644 --- a/src/app/components/header/processing-queue/confirmation/confirmation.component.ts +++ b/src/app/components/header/processing-queue/confirmation/confirmation.component.ts @@ -1,5 +1,11 @@ import { Component, OnInit, inject } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { + MatDialogRef, + MAT_DIALOG_DATA, + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; @@ -12,12 +18,40 @@ import * as searchStore from '@store/search'; import * as models from '@models'; import * as services from '@services'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { ProjectNameSelectorComponent } from '@components/shared/selectors/project-name-selector/project-name-selector.component'; +import { NgPlural, NgPluralCase, TitleCasePipe } from '@angular/common'; +import { + MatSelectionList, + MatListOption, + MatListItemTitle, + MatListItemLine, +} from '@angular/material/list'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-confirmation', templateUrl: './confirmation.component.html', styleUrls: ['./confirmation.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + ProjectNameSelectorComponent, + + MatSelectionList, + MatListOption, + MatListItemTitle, + MatListItemLine, + NgPlural, + NgPluralCase, + MatDialogActions, + MatButton, + + TitleCasePipe, + TranslateModule, + ], }) export class ConfirmationComponent implements OnInit { dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/header/processing-queue/index.ts b/src/app/components/header/processing-queue/index.ts index e92e42592..0fe4de5c7 100644 --- a/src/app/components/header/processing-queue/index.ts +++ b/src/app/components/header/processing-queue/index.ts @@ -1,2 +1 @@ export { ProcessingQueueComponent } from './processing-queue.component'; -export { ProcessingQueueModule } from './processing-queue.module'; diff --git a/src/app/components/header/processing-queue/processing-options/checkbox-option/checkbox-option.component.ts b/src/app/components/header/processing-queue/processing-options/checkbox-option/checkbox-option.component.ts index 1f710368b..676631fc0 100644 --- a/src/app/components/header/processing-queue/processing-options/checkbox-option/checkbox-option.component.ts +++ b/src/app/components/header/processing-queue/processing-options/checkbox-option/checkbox-option.component.ts @@ -1,10 +1,13 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { FormsModule } from '@angular/forms'; +import { MatTooltip } from '@angular/material/tooltip'; @Component({ selector: 'app-checkbox-option', templateUrl: './checkbox-option.component.html', styleUrls: ['./checkbox-option.component.scss'], - standalone: false, + imports: [MatCheckbox, FormsModule, MatTooltip], }) export class CheckboxOptionComponent { @Input() value: boolean; diff --git a/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.html b/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.html index 90ef0b662..06e4f7947 100644 --- a/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.html +++ b/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.html @@ -1,19 +1,21 @@ {{ optionName }} - - {{ option.name | uppercase | translate }} - - ({{ costsTable[option.apiValue] }} - - {{ - 'CREDIT' | translate - }} - {{ - 'CREDITS' | translate - }} ) - - + @for (option of options; track option) { + + {{ option.name | uppercase | translate }} + @if (!!costsTable) { + ({{ costsTable[option.apiValue] }} + + {{ + 'CREDIT' | translate + }} + {{ + 'CREDITS' | translate + }} ) + } + + } diff --git a/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.ts b/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.ts index b0c03e11a..bd4aa6eb8 100644 --- a/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.ts +++ b/src/app/components/header/processing-queue/processing-options/dropdown-option/dropdown-option.component.ts @@ -1,10 +1,27 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { MatFormField, MatLabel } from '@angular/material/input'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { NgPlural, NgPluralCase, UpperCasePipe } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-dropdown-option', templateUrl: './dropdown-option.component.html', styleUrls: ['./dropdown-option.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatTooltip, + MatLabel, + MatSelect, + + MatOption, + + NgPlural, + NgPluralCase, + UpperCasePipe, + TranslateModule, + ], }) export class DropdownOptionComponent { @Input() value: string; diff --git a/src/app/components/header/processing-queue/processing-options/processing-options.component.html b/src/app/components/header/processing-queue/processing-options/processing-options.component.html index 62a659cfe..519bd662f 100644 --- a/src/app/components/header/processing-queue/processing-options/processing-options.component.html +++ b/src/app/components/header/processing-queue/processing-options/processing-options.component.html @@ -1,98 +1,107 @@
- - - + @if (selectedJobType) { + @for (jobType of JobTypesList; track jobType) { + @if (selectedJobType.id === jobType.id) { @if (jobType.options.length === 0) {
-

No processing options for {{ jobType.name }}

+

+ {{ 'NO_PROCESSING_OPTIONS_FOR' | translate }} {{ jobType.name }} +

} @else {
-
- {{ 'PROCESSING_OPTIONS' | translate }} -
+ @if (jobType.id !== 'AUTORIFT') { +
+ {{ 'PROCESSING_OPTIONS' | translate }} +
+ }
-
- - - - -
+ @for (option of jobType.options; track option) { +
+ @if (option.type === 'DROPDOWN') { + + + } + @if (option.type === 'RANGE') { + + + } +
+ }
-
-
- {{ 'APPLY' | translate }} -
-
- - -
+ @if (jobType.id !== 'AUTORIFT') { +
+ {{ 'APPLY' | translate }} +
+ } + @for (option of jobType.options; track option) { +
+ @if (option.type === 'TOGGLE') { + + + } +
+ }
-
- {{ 'INCLUDE' | translate }} -
-
- - - - -
+ @if (jobType.id !== 'AUTORIFT') { +
+ {{ 'INCLUDE' | translate }} +
+ } + @for (option of jobType.options; track option) { +
+ @if (option.type === 'CHECKBOX') { + + + } + @if (option.type === 'SUBSET') { + + + } +
+ }
} - - - + } + } + }
diff --git a/src/app/components/header/processing-queue/processing-options/processing-options.component.ts b/src/app/components/header/processing-queue/processing-options/processing-options.component.ts index 5fed637cd..d725efcd1 100644 --- a/src/app/components/header/processing-queue/processing-options/processing-options.component.ts +++ b/src/app/components/header/processing-queue/processing-options/processing-options.component.ts @@ -6,12 +6,25 @@ import * as hyp3Store from '@store/hyp3'; import * as queueStore from '@store/queue'; import * as models from '@models'; +import { UpperCasePipe } from '@angular/common'; +import { DropdownOptionComponent } from './dropdown-option/dropdown-option.component'; +import { RangeOptionComponent } from './range-option/range-option.component'; +import { CheckboxOptionComponent } from './checkbox-option/checkbox-option.component'; +import { SubsetOptionComponent } from './subset-option/subset-option.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-processing-options', templateUrl: './processing-options.component.html', styleUrls: ['./processing-options.component.scss'], - standalone: false, + imports: [ + DropdownOptionComponent, + RangeOptionComponent, + CheckboxOptionComponent, + SubsetOptionComponent, + UpperCasePipe, + TranslateModule, + ], }) export class ProcessingOptionsComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/header/processing-queue/processing-options/processing-options.module.ts b/src/app/components/header/processing-queue/processing-options/processing-options.module.ts deleted file mode 100644 index 14f18203e..000000000 --- a/src/app/components/header/processing-queue/processing-options/processing-options.module.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatSharedModule } from '@shared'; - -import { ProjectNameSelectorModule } from '@components/shared/selectors/project-name-selector'; -import { ProcessingOptionsComponent } from './processing-options.component'; -import { ToggleOptionComponent } from './toggle-option/toggle-option.component'; -import { DropdownOptionComponent } from './dropdown-option/dropdown-option.component'; -import { CheckboxOptionComponent } from './checkbox-option/checkbox-option.component'; -import { SubsetOptionComponent } from './subset-option/subset-option.component'; -import { SharedModule } from '@shared'; -import { RangeOptionComponent } from './range-option/range-option.component'; - -@NgModule({ - declarations: [ - ProcessingOptionsComponent, - ToggleOptionComponent, - DropdownOptionComponent, - CheckboxOptionComponent, - SubsetOptionComponent, - RangeOptionComponent, - ], - imports: [ - CommonModule, - FormsModule, - MatInputModule, - MatSelectModule, - MatCheckboxModule, - MatSharedModule, - MatSlideToggleModule, - ProjectNameSelectorModule, - SharedModule, - ], - exports: [ProcessingOptionsComponent], -}) -export class ProcessingOptionsModule {} diff --git a/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.html b/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.html index d3ebdd57c..f766e1ed1 100644 --- a/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.html +++ b/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.html @@ -11,11 +11,13 @@ pattern="\-?[0-9]*\.?[0-9]*" step="0.01" /> - {{ - (optionName | lowercase) + - ' must be between ' + - range.start + - ' and ' + - range.end - }} + @if (value < range.start || value > range.start) { + {{ + (optionName | lowercase) + + ' must be between ' + + range.start + + ' and ' + + range.end + }} + } diff --git a/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.ts b/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.ts index f4be68907..4962a9bd5 100644 --- a/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.ts +++ b/src/app/components/header/processing-queue/processing-options/range-option/range-option.component.ts @@ -1,11 +1,29 @@ import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { Range } from '@models'; +import { + MatFormField, + MatLabel, + MatInput, + MatError, +} from '@angular/material/input'; +import { MatTooltip } from '@angular/material/tooltip'; +import { FormsModule } from '@angular/forms'; +import { LowerCasePipe } from '@angular/common'; @Component({ selector: 'app-range-option', templateUrl: './range-option.component.html', styleUrls: ['./range-option.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatTooltip, + MatLabel, + MatInput, + FormsModule, + + MatError, + LowerCasePipe, + ], }) export class RangeOptionComponent implements OnInit { @Input() value: number; diff --git a/src/app/components/header/processing-queue/processing-options/subset-option/subset-option.component.ts b/src/app/components/header/processing-queue/processing-options/subset-option/subset-option.component.ts index 14dd8f10e..448595d81 100644 --- a/src/app/components/header/processing-queue/processing-options/subset-option/subset-option.component.ts +++ b/src/app/components/header/processing-queue/processing-options/subset-option/subset-option.component.ts @@ -1,10 +1,12 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; @Component({ selector: 'app-subset-option', templateUrl: './subset-option.component.html', styleUrls: ['./subset-option.component.scss'], - standalone: false, + imports: [MatButton, MatTooltip], }) export class SubsetOptionComponent { @Input() optionName: string; diff --git a/src/app/components/header/processing-queue/processing-options/toggle-option/toggle-option.component.ts b/src/app/components/header/processing-queue/processing-options/toggle-option/toggle-option.component.ts index 7dbf865fa..594a36bbd 100644 --- a/src/app/components/header/processing-queue/processing-options/toggle-option/toggle-option.component.ts +++ b/src/app/components/header/processing-queue/processing-options/toggle-option/toggle-option.component.ts @@ -1,10 +1,13 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { MatSlideToggle } from '@angular/material/slide-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { FormsModule } from '@angular/forms'; @Component({ selector: 'app-toggle-option', templateUrl: './toggle-option.component.html', styleUrls: ['./toggle-option.component.scss'], - standalone: false, + imports: [MatSlideToggle, MatTooltip, FormsModule], }) export class ToggleOptionComponent { @Input() value: boolean; diff --git a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html index 58cf7fdef..567e12709 100644 --- a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html +++ b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html @@ -4,11 +4,13 @@ {{ 'SORT_CRITERIA' | translate }} -
- - {{ item | uppercase | translate }} - -
+ @for (item of sortTypes; track item) { +
+ + {{ item | uppercase | translate }} + +
+ }
@@ -17,146 +19,150 @@ {{ 'SORT_ORDER' | translate }} -
- - {{ item | uppercase | translate }} - -
+ @for (item of sortOrders; track item) { +
+ + {{ item | uppercase | translate }} + +
+ }
-
-
- {{ jobsDisplay.length }} - - {{ 'JOB' | translate }} - {{ - 'JOBS' | translate - }} , {{ costPerJob * jobsDisplay.length }} - - {{ - 'CREDIT' | translate - }} - {{ - 'CREDITS' | translate - }} - + @if (jobsDisplay.length > 0) { +
+
+ {{ jobsDisplay.length }} + + {{ 'JOB' | translate }} + {{ + 'JOBS' | translate + }} , {{ costPerJob * jobsDisplay.length }} + + {{ + 'CREDIT' | translate + }} + {{ + 'CREDITS' | translate + }} + +
-
+ }
- - - - - - - - - @if (job.job_type.name !== 'ARIA_S1_GUNW') { -
- {{ job.granules[0].name }} + @if (!areJobsLoading) { + + @if (jobsDisplay.length > 0) { + @for (job of jobsDisplay; track job) { + + + @if (job.job_type.name !== 'ARIA_S1_GUNW') { +
+ {{ job.granules[0].name }} +
+ } @else { +
+ {{ job.granules[0].metadata.date | shortDate }} - + {{ job.granules[1].metadata.date | shortDate }} +
+ } + + @if (job.job_type.name === 'ARIA_S1_GUNW') { +
+ Frame {{ job.reference_id }} + + ({{ costPerJob }} + + {{ + 'CREDIT' | uppercase | translate + }} + {{ + 'CREDITS' | uppercase | translate + }} ) + +
+ } + @if (job.job_type.name === 'RTC GAMMA') { +
+ + {{ job.job_type.name }} + + + @if (job.granules[0].bytes === 0) { + Virtual + } + @if (job.granules[0].bytes !== 0) { + {{ + job.granules[0].bytes.toString() | readableSizeFromBytes + }} + } + + + ({{ costPerJob }} + + {{ + 'CREDIT' | uppercase | translate + }} + {{ + 'CREDITS' | uppercase | translate + }} ) + +
+ } + @if (!['ARIA_S1_GUNW', 'RTC GAMMA'].includes(job.job_type.name)) { +
+ {{ job.granules[1]?.name }} +
+ } +
+ +
+ + } + } @else { +
+
+ {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' | translate }}
- } @else { -
- {{ job.granules[0].metadata.date | shortDate }} - - {{ job.granules[1].metadata.date | shortDate }} +
+ + {{ 'ON_DEMAND_HY_P3_DOCUMENTATION' | translate }} +
- } - - -
- Frame {{ job.reference_id }} - - ({{ costPerJob }} - - {{ - 'CREDIT' | uppercase | translate - }} - {{ - 'CREDITS' | uppercase | translate - }} ) -
- -
- - {{ job.job_type.name }} - - - Virtual - {{ - job.granules[0].bytes.toString() | readableSizeFromBytes - }} - - - ({{ costPerJob }} - - {{ - 'CREDIT' | uppercase | translate - }} - {{ - 'CREDITS' | uppercase | translate - }} ) - -
-
- {{ job.granules[1]?.name }} -
- -
+
+ @if (!isLoggedIn) { +

+ {{ 'SIGN_IN_TO_VIEW_SUBMITTED_JOBS' | translate }} +

+ }
- - - - -
-
- {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' | translate }} -
-
- - {{ 'ON_DEMAND_HY_P3_DOCUMENTATION' | translate }} - -
-
- -
- -

- {{ 'SIGN_IN_TO_VIEW_SUBMITTED_JOBS' | translate }} -

-
- - + } + + }
diff --git a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.ts b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.ts index d00d1339c..8510e6a30 100644 --- a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.ts +++ b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.ts @@ -21,12 +21,54 @@ import { SubSink } from 'subsink'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { distinctUntilChanged, filter, map } from 'rxjs/operators'; import moment from 'moment'; +import { MatFormField, MatLabel } from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; +import { NgPlural, NgPluralCase, UpperCasePipe } from '@angular/common'; +import { + MatList, + MatListItem, + MatListItemAvatar, + MatListItemTitle, + MatListItemLine, + MatListItemMeta, +} from '@angular/material/list'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-processing-queue-jobs', templateUrl: './processing-queue-jobs.component.html', styleUrls: ['./processing-queue-jobs.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatSelect, + FormsModule, + + MatOption, + + NgPlural, + NgPluralCase, + MatList, + MatListItem, + MatListItemAvatar, + MatListItemTitle, + MatListItemLine, + MatListItemMeta, + MatIconButton, + MatTooltip, + MatIcon, + MatButton, + UpperCasePipe, + ReadableSizeFromBytesPipe, + ShortDatePipe, + TranslateModule, + ], }) export class ProcessingQueueJobsComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.module.ts b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.module.ts deleted file mode 100644 index 7bd28e25a..000000000 --- a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatSelectModule } from '@angular/material/select'; -import { ProcessingQueueJobsComponent } from './processing-queue-jobs.component'; -import { FormsModule } from '@angular/forms'; - -import { MatChipsModule } from '@angular/material/chips'; -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; -import { CopyToClipboardModule } from './../../../shared/copy-to-clipboard/copy-to-clipboard.module'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ProcessingQueueJobsComponent], - imports: [ - CommonModule, - PipesModule, - MatSharedModule, - MatSelectModule, - MatChipsModule, - MatExpansionModule, - CopyToClipboardModule, - FormsModule, - SharedModule, - ], - exports: [ProcessingQueueJobsComponent], -}) -export class ProcessingQueueJobsModule {} diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index bd6f36297..a8b17cbb3 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -20,7 +20,7 @@
- + @if (breakpoint !== breakpoints.MOBILE) {
@@ -32,9 +32,9 @@ {{ 'POWERED_BY_HY_P3' | translate }}
- + } - + @if (breakpoint === breakpoints.MOBILE) {
- + }
- + @if (breakpoint !== breakpoints.MOBILE) { @if ( userStatus === 'NOT_STARTED' || userStatus === 'PENDING' || @@ -90,7 +90,7 @@ User Signup } - + @for (hyp3Job of jobTypesWithQueued; track hyp3Job) { - - + } + } - + @if ( + breakpoint === breakpoints.MOBILE && + !!jobTypesWithQueued && + jobTypesWithQueued.length > 0 + ) { - - + @for (hyp3Job of jobTypesWithQueued; track hyp3Job) { - + } - + }
@if (!this.isSignupSelected) {
-
-
- {{ 'SIGN_IN_TO_PROCESS_DATA' | translate }} -
-
- + @if (!isUserLoggedIn && !isUserLoading) { +
+
+ {{ 'SIGN_IN_TO_PROCESS_DATA' | translate }} +
+
+ +
-
+ }
-
-

- {{ hyp3JobTypes[selectedJobTypeId].description | translate }} - [MORE] -

-
+ @if (selectedJobTypeId) { +
+

+ {{ hyp3JobTypes[selectedJobTypeId].description | translate }} + [MORE] +

+
+ } - - + @if (selectedJobTypeId) { + + + }
@@ -229,72 +226,71 @@
-
-
- {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} -
-
- ({{ allJobs.length - remaining }} extra job{{ - allJobs.length - remaining === 1 ? '' : 's' - }}) + @if ( + isUserLoggedIn && + !isUnlimitedUser && + !isUserLoading && + allJobs.length > remaining + ) { +
+
+ {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} +
+
+ ({{ allJobs.length - remaining }} extra job{{ + allJobs.length - remaining === 1 ? '' : 's' + }}) +
-
+ } -
-
- {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }} + @if ( + isUserLoggedIn && + !isUnlimitedUser && + !isUserLoading && + remaining === 0 + ) { +
+
+ {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }} +
+
+ +
-
- -
-
+ } -
-
- - + @if (breakpoint !== breakpoints.MOBILE) { +
+
+ + +
-
+ } -
-
- - + @if (breakpoint === breakpoints.MOBILE) { +
+
+ + +
-
+ }
@@ -321,12 +317,13 @@

Request for access has been rejected.

- - + @if (isQueueSubmitProcessing) { + + + }
Request for access has been rejected. }" >
- - - + @if (previousQueue === null) { + } -
- -
+ } + + @for (hyp3Job of jobTypesWithQueued; track hyp3Job) { +
+ +
+ } - + @if (previousQueue !== null) { + + }
@@ -403,69 +402,87 @@

Request for access has been rejected.

} @default { -
- - - {{ remaining | number }} + @if (isUserLoggedIn && !isUserLoading && user !== '') { + + } +
+ } -
- {{ 'LOADING' | translate }}... -
+ @if (isUserLoggedIn && isUserLoading) { +
+ {{ 'LOADING' | translate }}... +
+ } } } -
- - N/A - {{ 'LOGIN_TO_VIEW' | translate }} - - - N/A - - {{ 'LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH' | translate }} - -
+ @if (!isUserLoggedIn) { +
+ @if (breakpoint === breakpoints.MOBILE) { + N/A - {{ 'LOGIN_TO_VIEW' | translate }} + } + @if (breakpoint !== breakpoints.MOBILE) { + + N/A - + {{ + 'LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH' | translate + }} + + } +
+ }
- - {{ 'VALIDATE_ONLY' | translate }} - + @if (env.maturity !== 'prod' && breakpoint !== breakpoints.MOBILE) { + + {{ 'VALIDATE_ONLY' | translate }} + + }
diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 824ae3337..5187c4a3c 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -5,7 +5,13 @@ import { ViewChild, inject, } from '@angular/core'; -import { MatDialog, MatDialogRef } from '@angular/material/dialog'; +import { + MatDialog, + MatDialogRef, + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; import { ConfirmationComponent } from './confirmation/confirmation.component'; @@ -22,6 +28,28 @@ import * as userStore from '@store/user'; import * as uiStore from '@store/ui'; import * as models from '@models'; import * as services from '@services'; +import { CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop'; +import { ResizedDirective } from '../../../directives/resized.directive'; +import { MatIcon } from '@angular/material/icon'; +import { + NgPlural, + NgPluralCase, + NgStyle, + DecimalPipe, + TitleCasePipe, +} from '@angular/common'; +import { Hyp3UrlComponent } from '@components/shared/hyp3-url/hyp3-url.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { ProcessingOptionsComponent } from './processing-options/processing-options.component'; +import { ProcessingQueueJobsComponent } from './processing-queue-jobs/processing-queue-jobs.component'; +import { ProcessingSignupComponent } from './processing-signup/processing-signup.component'; +import { MatProgressBar } from '@angular/material/progress-bar'; +import { MatSlideToggle } from '@angular/material/slide-toggle'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; enum ProcessingQueueTab { SCENES = 'Scenes', @@ -33,7 +61,34 @@ enum ProcessingQueueTab { selector: 'app-processing-queue', templateUrl: './processing-queue.component.html', styleUrls: ['./processing-queue.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkDrag, + CdkDragHandle, + ResizedDirective, + MatIcon, + Hyp3UrlComponent, + DocsModalComponent, + MatButton, + NgPlural, + NgPluralCase, + MatMenuTrigger, + MatMenu, + MatMenuItem, + CdkScrollable, + MatDialogContent, + ProcessingOptionsComponent, + ProcessingQueueJobsComponent, + ProcessingSignupComponent, + MatDialogActions, + MatProgressBar, + NgStyle, + MatSlideToggle, + FormsModule, + DecimalPipe, + TitleCasePipe, + TranslateModule, + ], }) export class ProcessingQueueComponent implements OnInit { authService = inject(services.AuthService); diff --git a/src/app/components/header/processing-queue/processing-queue.module.ts b/src/app/components/header/processing-queue/processing-queue.module.ts deleted file mode 100644 index db4720875..000000000 --- a/src/app/components/header/processing-queue/processing-queue.module.ts +++ /dev/null @@ -1,81 +0,0 @@ -import { NgModule, inject } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { - FontAwesomeModule, - FaIconLibrary, -} from '@fortawesome/angular-fontawesome'; -import { faSpinner, fas } from '@fortawesome/free-solid-svg-icons'; -import { ScrollingModule } from '@angular/cdk/scrolling'; - -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; -import { MatTabsModule } from '@angular/material/tabs'; -import { MatMenuModule } from '@angular/material/menu'; - -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; -import { ProcessingQueueComponent } from './processing-queue.component'; -import { ProcessingQueueJobsModule } from './processing-queue-jobs'; -import { ProcessingOptionsModule } from './processing-options'; -import { ProcessingSignupModule } from './processing-signup'; -import { MatDialogModule } from '@angular/material/dialog'; -import { QueueSubmitComponent } from './queue-submit/queue-submit.component'; -import { ResizableModule } from 'angular-resizable-element'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { ProjectNameSelectorModule } from '@components/shared/selectors/project-name-selector'; -import { ConfirmationComponent } from './confirmation/confirmation.component'; -import { ResizedEventModule } from '@directives/resized.directive'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { Hyp3UrlModule } from '@components/shared/hyp3-url/hyp3-url.module'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ - ProcessingQueueComponent, - QueueSubmitComponent, - ConfirmationComponent, - ], - imports: [ - CommonModule, - FormsModule, - FontAwesomeModule, - MatSharedModule, - MatInputModule, - MatChipsModule, - MatSelectModule, - MatSlideToggleModule, - MatProgressSpinnerModule, - MatProgressBarModule, - MatBottomSheetModule, - PipesModule, - ProjectNameSelectorModule, - ProcessingQueueJobsModule, - ProcessingOptionsModule, - ProcessingSignupModule, - MatDialogModule, - ResizableModule, - ResizedEventModule, - DragDropModule, - MatTabsModule, - MatMenuModule, - ScrollingModule, - DocsModalModule, - Hyp3UrlModule, - SharedModule, - ], -}) -export class ProcessingQueueModule { - constructor() { - const library = inject(FaIconLibrary); - - library.addIconPacks(fas); - library.addIcons(faSpinner); - } -} diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index f4957cadc..6ec89af13 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -1,5 +1,10 @@ import { Component, OnInit, inject } from '@angular/core'; -import { FormBuilder, Validators } from '@angular/forms'; +import { + FormBuilder, + Validators, + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; import { Store } from '@ngrx/store'; import { Hyp3ApiService, @@ -11,12 +16,51 @@ import { EarthdataUserInfo, Hyp3User, ApplicationStatus } from '@models'; import * as userStore from '@store/user'; import * as hyp3Store from '@store/hyp3'; import { ValidationError } from 'xml2js'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, +} from '@angular/material/expansion'; +import { + MatList, + MatListItem, + MatListItemTitle, + MatListItemLine, +} from '@angular/material/list'; +import { + MatFormField, + MatLabel, + MatInput, + MatError, +} from '@angular/material/input'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatButton } from '@angular/material/button'; @Component({ selector: 'app-processing-signup', templateUrl: './processing-signup.component.html', styleUrl: './processing-signup.component.scss', - standalone: false, + imports: [ + FormsModule, + ReactiveFormsModule, + MatCheckbox, + MatAccordion, + MatExpansionPanel, + MatExpansionPanelHeader, + MatExpansionPanelTitle, + MatList, + MatListItem, + MatListItemTitle, + MatListItemLine, + MatFormField, + MatLabel, + MatInput, + MatError, + MatTooltip, + MatButton, + ], }) export class ProcessingSignupComponent implements OnInit { private formBuilder = inject(FormBuilder); diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts deleted file mode 100644 index 61bba9ed5..000000000 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatSelectModule } from '@angular/material/select'; -import { ProcessingSignupComponent } from './processing-signup.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MatChipsModule } from '@angular/material/chips'; -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; -import { SharedModule } from '@shared'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; - -@NgModule({ - declarations: [ProcessingSignupComponent], - imports: [ - CommonModule, - PipesModule, - MatSharedModule, - MatSelectModule, - MatChipsModule, - MatExpansionModule, - MatCheckboxModule, - MatFormFieldModule, - MatInputModule, - ReactiveFormsModule, - FormsModule, - SharedModule, - ], - exports: [ProcessingSignupComponent], -}) -export class ProcessingSignupModule {} diff --git a/src/app/components/header/processing-queue/queue-submit/queue-submit.component.ts b/src/app/components/header/processing-queue/queue-submit/queue-submit.component.ts index 62fc91c7d..2d314f43a 100644 --- a/src/app/components/header/processing-queue/queue-submit/queue-submit.component.ts +++ b/src/app/components/header/processing-queue/queue-submit/queue-submit.component.ts @@ -9,12 +9,14 @@ import { MatBottomSheetRef, MAT_BOTTOM_SHEET_DATA, } from '@angular/material/bottom-sheet'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-queue-submit', templateUrl: './queue-submit.component.html', styleUrls: ['./queue-submit.component.scss'], - standalone: false, + imports: [MatButton, TranslateModule], }) export class QueueSubmitComponent { data = inject(MAT_BOTTOM_SHEET_DATA); diff --git a/src/app/components/header/queue/download-all/download-all.component.ts b/src/app/components/header/queue/download-all/download-all.component.ts index cda8fa659..8d702ab3e 100644 --- a/src/app/components/header/queue/download-all/download-all.component.ts +++ b/src/app/components/header/queue/download-all/download-all.component.ts @@ -1,11 +1,14 @@ import { Component, OnInit, Output, EventEmitter, Input } from '@angular/core'; import { UAParser } from 'ua-parser-js'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatMenuItem } from '@angular/material/menu'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-download-all', templateUrl: './download-all.component.html', styleUrls: ['./download-all.component.scss'], - standalone: false, + imports: [MatTooltip, MatMenuItem, TranslateModule], }) export class DownloadAllComponent implements OnInit { @Output() dlAllEvent = new EventEmitter(); diff --git a/src/app/components/header/queue/download-all/download-all.module.ts b/src/app/components/header/queue/download-all/download-all.module.ts deleted file mode 100644 index a7ba9bda4..000000000 --- a/src/app/components/header/queue/download-all/download-all.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { DownloadAllComponent } from './download-all.component'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatMenuModule } from '@angular/material/menu'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DownloadAllComponent], - exports: [DownloadAllComponent], - imports: [CommonModule, MatTooltipModule, MatMenuModule, SharedModule], -}) -export class DownloadAllModule {} diff --git a/src/app/components/header/queue/index.ts b/src/app/components/header/queue/index.ts index 46df41e95..7561c31cf 100644 --- a/src/app/components/header/queue/index.ts +++ b/src/app/components/header/queue/index.ts @@ -1,2 +1 @@ -export * from './queue.module'; export * from './queue.component'; diff --git a/src/app/components/header/queue/queue.component.html b/src/app/components/header/queue/queue.component.html index fe9c5f07d..21320fc3a 100644 --- a/src/app/components/header/queue/queue.component.html +++ b/src/app/components/header/queue/queue.component.html @@ -49,30 +49,34 @@

-
- {{ 'RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING' | translate }} - - {{ 'MORE' | translate }}... - -
+@if (showDemWarning) { +
+ {{ 'RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING' | translate }} + + {{ 'MORE' | translate }}... + +
+} -
- {{ - 'PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT' - | translate - }} - - {{ 'MORE' | translate }}... - -
+@if (showRestrictedDatasetWarning) { +
+ {{ + 'PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT' + | translate + }} + + {{ 'MORE' | translate }}... + +
+} " > - - -
- +
- {{ - fileName | truncate: 50 - }} - {{ - fileName | truncate: 10 - }} - - {{ fileName.substr(fileName.length - 4) }} - {{ fileName.substr(fileName.length - 11) }} - - - • - - Virtual - {{ - product.bytes | readableSizeFromBytes - }} - -
-
- {{ product.productTypeDisplay }} -
- - + {{ product.productTypeDisplay }} +
+ @if ( !product.isUnzippedFile && !product.metadata.job && product.groupId !== 'SARViews' - " - prompt="{{ 'COPY_FILE_ID' | translate }}" - [value]=" - product.metadata.productType === 'BURST_XML' - ? product.id?.split('-XML')[0] - : product.metadata.parentID || product.id - " - class="clipboard-button" - matListItemMeta - > - - - - - - - - - + ) { + + + } + + + + + } + } + @if ((products$ | async).length < 1) {


{{ 'YOUR_DOWNLOAD_QUEUE_IS_EMPTY' | translate }}
- + } -
- -
- - - -
- -
- - - - - - - - - - - - - {{ limitedExportString() }} - - - - - - - - - - + } +
+ + @if (areAnyProducts) { +
- - - - - - - - - - - - - - - - - - -
- - -
+ @if ((numberOfS3Products$ | async) === 0) { + + } + @if ((numberOfS3Products$ | async) > 0) { + + } + + + + + @if (breakpoint > breakpoints.MOBILE && dlWidth >= dlWidthMin) { + @if ( + queueHasOnDemandProducts || queueHasEventMonitoringProducts + ) { + + {{ limitedExportString() }} + + } + + + } + @if (breakpoint === breakpoints.MOBILE || dlWidth < dlWidthMin) { + + + + + + } + + + + + + + + + + + +
+ } + + } +
+ } diff --git a/src/app/components/header/queue/queue.component.ts b/src/app/components/header/queue/queue.component.ts index 8584b1511..41dd66614 100644 --- a/src/app/components/header/queue/queue.component.ts +++ b/src/app/components/header/queue/queue.component.ts @@ -18,13 +18,43 @@ import * as queueStore from '@store/queue'; import { NotificationService, ScreenSizeService } from '@services'; import { CMRProduct, AsfApiOutputFormat, Breakpoints } from '@models'; -import { MatDialogRef } from '@angular/material/dialog'; +import { + MatDialogRef, + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; import { SubSink } from 'subsink'; import { ResizedEvent } from '@directives/resized.directive'; import * as userStore from '@store/user'; import { DownloadFileButtonComponent } from '@components/shared/download-file-button/download-file-button.component'; import UAParser from 'ua-parser-js'; import { DownloadService } from '@services/download.service'; +import { CdkDrag, CdkDragHandle } from '@angular/cdk/drag-drop'; +import { ResizedDirective } from '../../../directives/resized.directive'; +import { MatProgressBar } from '@angular/material/progress-bar'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { MatIcon } from '@angular/material/icon'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { + MatList, + MatListItem, + MatListItemTitle, + MatListItemLine, + MatListItemMeta, +} from '@angular/material/list'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { DownloadFileButtonComponent as DownloadFileButtonComponent_1 } from '@components/shared/download-file-button/download-file-button.component'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { DownloadAllComponent } from './download-all/download-all.component'; +import { TruncateModule } from '@yellowspot/ng-truncate'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; +import { FilterExtensionPipe } from '@pipes/filter-extension.pipe'; +import { TranslateModule } from '@ngx-translate/core'; // import { DownloadService } from '@services/download.service'; export interface selectedItems { @@ -36,7 +66,41 @@ export interface selectedItems { selector: 'app-queue', templateUrl: './queue.component.html', styleUrls: ['./queue.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkDrag, + CdkDragHandle, + ResizedDirective, + MatProgressBar, + DocsModalComponent, + MatIcon, + + CdkScrollable, + MatDialogContent, + MatList, + + MatListItem, + MatListItemTitle, + NgClass, + MatListItemLine, + CopyToClipboardComponent, + MatListItemMeta, + DownloadFileButtonComponent_1, + MatIconButton, + MatTooltip, + MatDialogActions, + MatButton, + FontAwesomeModule, + MatMenuTrigger, + MatMenu, + MatMenuItem, + DownloadAllComponent, + AsyncPipe, + TruncateModule, + ReadableSizeFromBytesPipe, + FilterExtensionPipe, + TranslateModule, + ], }) export class QueueComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/header/queue/queue.module.ts b/src/app/components/header/queue/queue.module.ts deleted file mode 100644 index 408abcb6f..000000000 --- a/src/app/components/header/queue/queue.module.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ScrollingModule } from '@angular/cdk/scrolling'; - -import { MatMenuModule } from '@angular/material/menu'; - -import { ClipboardModule } from 'ngx-clipboard'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { TruncateModule } from '@yellowspot/ng-truncate'; - -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; - -import { QueueComponent } from './queue.component'; -import { ResizableModule } from 'angular-resizable-element'; -import { DragDropModule } from '@angular/cdk/drag-drop'; -import { MatDialogModule } from '@angular/material/dialog'; -import { ResizedEventModule } from '@directives/resized.directive'; -import { FileDownloadDirective } from '@directives/file-download.directive'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; - -import { DownloadFileButtonModule } from '@components/shared/download-file-button/download-file-button.module'; -import { DownloadAllModule } from '@components/header/queue/download-all/download-all.module'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [QueueComponent, FileDownloadDirective], - imports: [ - CommonModule, - MatMenuModule, - ScrollingModule, - TruncateModule, - ClipboardModule, - DownloadFileButtonModule, - FontAwesomeModule, - CopyToClipboardModule, - MatSharedModule, - PipesModule, - ResizableModule, - DragDropModule, - MatDialogModule, - ResizedEventModule, - MatProgressBarModule, - MatCheckboxModule, - MatProgressSpinnerModule, - DownloadAllModule, - DocsModalModule, - SharedModule, - ], - exports: [QueueComponent], -}) -export class QueueModule {} diff --git a/src/app/components/header/sarviews-header/sarviews-header.component.html b/src/app/components/header/sarviews-header/sarviews-header.component.html index a556038ca..8433df501 100644 --- a/src/app/components/header/sarviews-header/sarviews-header.component.html +++ b/src/app/components/header/sarviews-header/sarviews-header.component.html @@ -1,68 +1,64 @@ -
- -
- - -
- -
+@if (breakpoint$ | async; as breakpoint) { +
+ @if (breakpoint !== breakpoints.MOBILE) {
-
- -
-
- -
-
- -
- -
-
+
+
+ @if (breakpoint === breakpoints.FULL) { +
+ +
+ } + @if (breakpoint === breakpoints.FULL) { +
+ +
+ } + @if (breakpoint === breakpoints.FULL) { +
+ +
+ } +
+ + {{ 'FILTERS' | translate }}
+ more_horiz + +
+
+ +
- -
- +
+
- -
- -
-
- - - -
- - -
- + } + @if (breakpoint === breakpoints.MOBILE) { +
+ +
+ +
-
- -
+ } +
+} diff --git a/src/app/components/header/sarviews-header/sarviews-header.component.ts b/src/app/components/header/sarviews-header/sarviews-header.component.ts index 3f67cb2ef..8ef092073 100644 --- a/src/app/components/header/sarviews-header/sarviews-header.component.ts +++ b/src/app/components/header/sarviews-header/sarviews-header.component.ts @@ -10,12 +10,33 @@ import * as uiStore from '@store/ui'; import { SubSink } from 'subsink'; import * as services from '@services'; +import { AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { SarviewsEventSearchSelectorComponent } from '@components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component'; +import { SarviewsEventTypeSelectorComponent } from '@components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component'; +import { DateSelectorComponent } from '@components/shared/selectors/date-selector/date-selector.component'; +import { MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-header', templateUrl: './sarviews-header.component.html', styleUrls: ['./sarviews-header.component.scss', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + SarviewsEventSearchSelectorComponent, + SarviewsEventTypeSelectorComponent, + DateSelectorComponent, + MatButton, + MatIcon, + SearchButtonComponent, + HeaderButtonsComponent, + AsyncPipe, + TranslateModule, + ], }) export class SarviewsHeaderComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/header/timeseries-header/timeseries-header.component.html b/src/app/components/header/timeseries-header/timeseries-header.component.html index 57a50e437..49bdff026 100644 --- a/src/app/components/header/timeseries-header/timeseries-header.component.html +++ b/src/app/components/header/timeseries-header/timeseries-header.component.html @@ -1,59 +1,61 @@ - -
-
- - - -
- - - - Azimuth - Azimuth - - - {{ 'RADAR_LOOK_DIRECTION' | translate }}: - 78° - 283° - - - Line of Site - - - {{ 'INCIDENCE_ANGLE' | translate }}: 29° – 46° - -
- -
- +@if (breakpoint$ | async; as breakpoint) { + @if (breakpoint > breakpoints.MOBILE) { +
+
+ @if (!(isKioskMode$ | async)) { + + + } +
+ + + + @if (!flightDesc) { + Azimuth + } + @if (flightDesc) { + Azimuth + } + + + {{ 'RADAR_LOOK_DIRECTION' | translate }}: + @if (!flightDesc) { + 78° + } + @if (flightDesc) { + 283° + } + + + Line of Site + + + {{ 'INCIDENCE_ANGLE' | translate }}: 29° – 46° + +
+
+ +
-
- + } +} diff --git a/src/app/components/header/timeseries-header/timeseries-header.component.ts b/src/app/components/header/timeseries-header/timeseries-header.component.ts index 373ea9d2c..5e24314ba 100644 --- a/src/app/components/header/timeseries-header/timeseries-header.component.ts +++ b/src/app/components/header/timeseries-header/timeseries-header.component.ts @@ -11,12 +11,26 @@ import * as filtersStore from '@store/filters'; import { ScreenSizeService } from '@services'; import { MapDrawModeType, MapInteractionModeType } from '@models'; import * as models from '@models'; +import { NgOptimizedImage, AsyncPipe } from '@angular/common'; +import { SearchTypeSelectorComponent } from '@components/shared/selectors/search-type-selector/search-type-selector.component'; +import { DrawSelectorComponent } from '@components/shared/aoi-options/draw-selector/draw-selector.component'; +import { TimeseriesChartFlightDirectionToggleComponent } from '../../timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component'; +import { HeaderButtonsComponent } from '../header-buttons/header-buttons.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-timeseries-header', templateUrl: './timeseries-header.component.html', styleUrls: ['./timeseries-header.component.scss', '../header.component.scss'], - standalone: false, + imports: [ + SearchTypeSelectorComponent, + DrawSelectorComponent, + TimeseriesChartFlightDirectionToggleComponent, + NgOptimizedImage, + HeaderButtonsComponent, + AsyncPipe, + TranslateModule, + ], }) export class TimeseriesHeaderComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/help/help-pages/help-baseline-search/help-baseline-search.component.ts b/src/app/components/help/help-pages/help-baseline-search/help-baseline-search.component.ts index 13d04d753..002d0e50e 100644 --- a/src/app/components/help/help-pages/help-baseline-search/help-baseline-search.component.ts +++ b/src/app/components/help/help-pages/help-baseline-search/help-baseline-search.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-baseline-search', templateUrl: './help-baseline-search.component.html', styleUrls: ['./help-baseline-search.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpBaselineSearchComponent {} diff --git a/src/app/components/help/help-pages/help-download-queue/help-download-queue.component.ts b/src/app/components/help/help-pages/help-download-queue/help-download-queue.component.ts index 73e85b7b5..b3bec01d5 100644 --- a/src/app/components/help/help-pages/help-download-queue/help-download-queue.component.ts +++ b/src/app/components/help/help-pages/help-download-queue/help-download-queue.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-download-queue', templateUrl: './help-download-queue.component.html', styleUrls: ['./help-download-queue.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpDownloadQueueComponent {} diff --git a/src/app/components/help/help-pages/help-export-options/help-export-options.component.ts b/src/app/components/help/help-pages/help-export-options/help-export-options.component.ts index d04c53e44..9ca46eb29 100644 --- a/src/app/components/help/help-pages/help-export-options/help-export-options.component.ts +++ b/src/app/components/help/help-pages/help-export-options/help-export-options.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-export-options', templateUrl: './help-export-options.component.html', styleUrls: ['./help-export-options.component.scss'], - standalone: false, + imports: [TranslateModule], }) export class HelpExportOptionsComponent {} diff --git a/src/app/components/help/help-pages/help-filters/help-filters.component.ts b/src/app/components/help/help-pages/help-filters/help-filters.component.ts index d9911f71f..349a29c31 100644 --- a/src/app/components/help/help-pages/help-filters/help-filters.component.ts +++ b/src/app/components/help/help-pages/help-filters/help-filters.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-filters', templateUrl: './help-filters.component.html', styleUrls: ['./help-filters.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpFiltersComponent {} diff --git a/src/app/components/help/help-pages/help-geo-search/help-geo-search.component.ts b/src/app/components/help/help-pages/help-geo-search/help-geo-search.component.ts index 6ac602633..12f534f5c 100644 --- a/src/app/components/help/help-pages/help-geo-search/help-geo-search.component.ts +++ b/src/app/components/help/help-pages/help-geo-search/help-geo-search.component.ts @@ -1,11 +1,12 @@ import { Component, inject } from '@angular/core'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; +import { MatIcon } from '@angular/material/icon'; @Component({ selector: 'app-help-geo-search', templateUrl: './help-geo-search.component.html', styleUrls: ['./help-geo-search.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpGeoSearchComponent { translate = inject(TranslateService); diff --git a/src/app/components/help/help-pages/help-list-search/help-list-search.component.ts b/src/app/components/help/help-pages/help-list-search/help-list-search.component.ts index bc08498a4..08109315f 100644 --- a/src/app/components/help/help-pages/help-list-search/help-list-search.component.ts +++ b/src/app/components/help/help-pages/help-list-search/help-list-search.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-list-search', templateUrl: './help-list-search.component.html', styleUrls: ['./help-list-search.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpListSearchComponent {} diff --git a/src/app/components/help/help-pages/help-login/help-login.component.ts b/src/app/components/help/help-pages/help-login/help-login.component.ts index 0f0ef8970..1e89da474 100644 --- a/src/app/components/help/help-pages/help-login/help-login.component.ts +++ b/src/app/components/help/help-pages/help-login/help-login.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-login', templateUrl: './help-login.component.html', styleUrls: ['./help-login.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpLoginComponent {} diff --git a/src/app/components/help/help-pages/help-map-controls/help-map-controls.component.ts b/src/app/components/help/help-pages/help-map-controls/help-map-controls.component.ts index 064822e5b..cf9846d34 100644 --- a/src/app/components/help/help-pages/help-map-controls/help-map-controls.component.ts +++ b/src/app/components/help/help-pages/help-map-controls/help-map-controls.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-map-controls', templateUrl: './help-map-controls.component.html', styleUrls: ['./help-map-controls.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpMapControlsComponent {} diff --git a/src/app/components/help/help-pages/help-more-like-this/help-more-like-this.component.ts b/src/app/components/help/help-pages/help-more-like-this/help-more-like-this.component.ts index 641dd6ec3..071f7564f 100644 --- a/src/app/components/help/help-pages/help-more-like-this/help-more-like-this.component.ts +++ b/src/app/components/help/help-pages/help-more-like-this/help-more-like-this.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-more-like-this', templateUrl: './help-more-like-this.component.html', styleUrls: ['./help-more-like-this.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpMoreLikeThisComponent {} diff --git a/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.html b/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.html index 20a744638..2e4267ddc 100644 --- a/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.html +++ b/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.html @@ -1,12 +1,14 @@ -
-
- +@if (breakpoint$ | async; as breakpoint) { +
+
+ +
-
+} diff --git a/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.ts b/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.ts index 4e6669f5d..4a94a7e5a 100644 --- a/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.ts +++ b/src/app/components/help/help-pages/help-new-stuff/help-new-stuff.component.ts @@ -2,12 +2,13 @@ import { Component, inject } from '@angular/core'; import * as models from '@models'; import * as services from '@services'; +import { NgClass, AsyncPipe } from '@angular/common'; @Component({ selector: 'app-help-new-stuff', templateUrl: './help-new-stuff.component.html', styleUrls: ['./help-new-stuff.component.scss'], - standalone: false, + imports: [NgClass, AsyncPipe], }) export class HelpNewStuffComponent { private screenSize = inject(services.ScreenSizeService); diff --git a/src/app/components/help/help-pages/help-on-demand/help-on-demand.component.ts b/src/app/components/help/help-pages/help-on-demand/help-on-demand.component.ts index 8700c0fd1..242c54685 100644 --- a/src/app/components/help/help-pages/help-on-demand/help-on-demand.component.ts +++ b/src/app/components/help/help-pages/help-on-demand/help-on-demand.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-on-demand', templateUrl: './help-on-demand.component.html', styleUrls: ['./help-on-demand.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpOnDemandComponent {} diff --git a/src/app/components/help/help-pages/help-saved-searches/help-saved-searches.component.ts b/src/app/components/help/help-pages/help-saved-searches/help-saved-searches.component.ts index bb2362452..f301492fc 100644 --- a/src/app/components/help/help-pages/help-saved-searches/help-saved-searches.component.ts +++ b/src/app/components/help/help-pages/help-saved-searches/help-saved-searches.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-saved-searches', templateUrl: './help-saved-searches.component.html', styleUrls: ['./help-saved-searches.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpSavedSearchesComponent {} diff --git a/src/app/components/help/help-pages/help-sbas-search/help-sbas-search.component.ts b/src/app/components/help/help-pages/help-sbas-search/help-sbas-search.component.ts index b8cbacbcb..0cfeecabc 100644 --- a/src/app/components/help/help-pages/help-sbas-search/help-sbas-search.component.ts +++ b/src/app/components/help/help-pages/help-sbas-search/help-sbas-search.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-sbas-search', templateUrl: './help-sbas-search.component.html', styleUrls: ['./help-sbas-search.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpSbasSearchComponent {} diff --git a/src/app/components/help/help-pages/help-search-results/help-search-results.component.ts b/src/app/components/help/help-pages/help-search-results/help-search-results.component.ts index 02218f388..14314ca50 100644 --- a/src/app/components/help/help-pages/help-search-results/help-search-results.component.ts +++ b/src/app/components/help/help-pages/help-search-results/help-search-results.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-search-results', templateUrl: './help-search-results.component.html', styleUrls: ['./help-search-results.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpSearchResultsComponent {} diff --git a/src/app/components/help/help-pages/help-toc/help-toc.component.ts b/src/app/components/help/help-pages/help-toc/help-toc.component.ts index 0904cbb3f..9644da31d 100644 --- a/src/app/components/help/help-pages/help-toc/help-toc.component.ts +++ b/src/app/components/help/help-pages/help-toc/help-toc.component.ts @@ -9,14 +9,54 @@ import { YoutubeVideo, YoutubeVideoContentDetails, } from '@models/youtube.model'; -import { MatTableDataSource } from '@angular/material/table'; +import { + MatTableDataSource, + MatTable, + MatColumnDef, + MatHeaderCellDef, + MatHeaderCell, + MatCellDef, + MatCell, + MatHeaderRowDef, + MatHeaderRow, + MatRowDef, + MatRow, +} from '@angular/material/table'; import { MatSort } from '@angular/material/sort'; +import { + MatCard, + MatCardHeader, + MatCardAvatar, + MatCardTitle, + MatCardSubtitle, +} from '@angular/material/card'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-toc', templateUrl: './help-toc.component.html', styleUrls: ['./help-toc.component.scss'], - standalone: false, + imports: [ + MatCard, + MatCardHeader, + MatCardAvatar, + MatIcon, + MatCardTitle, + MatCardSubtitle, + MatTable, + MatSort, + MatColumnDef, + MatHeaderCellDef, + MatHeaderCell, + MatCellDef, + MatCell, + MatHeaderRowDef, + MatHeaderRow, + MatRowDef, + MatRow, + TranslateModule, + ], }) export class HelpTocComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/help/help-pages/help-unzipping/help-unzipping.component.ts b/src/app/components/help/help-pages/help-unzipping/help-unzipping.component.ts index a34c9fc55..f133f8ecf 100644 --- a/src/app/components/help/help-pages/help-unzipping/help-unzipping.component.ts +++ b/src/app/components/help/help-pages/help-unzipping/help-unzipping.component.ts @@ -1,9 +1,11 @@ import { Component } from '@angular/core'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help-unzipping', templateUrl: './help-unzipping.component.html', styleUrls: ['./help-unzipping.component.scss'], - standalone: false, + imports: [MatIcon, TranslateModule], }) export class HelpUnzippingComponent {} diff --git a/src/app/components/help/help.component.html b/src/app/components/help/help.component.html index 70959cc78..23cf8dd1f 100644 --- a/src/app/components/help/help.component.html +++ b/src/app/components/help/help.component.html @@ -3,68 +3,70 @@

{{ 'SEARCH_HELP' | translate }}

-
- -
+ @if (topic !== 'toc') { +
+ +
+ }
-
- + @switch (topic) { + @case ('toc') { - - + } + @case ('geoSearch') { - - + } + @case ('help') { - - + } + @case ('searchResults') { - - + } + @case ('logIn') { - - + } + @case ('mapControls') { - - + } + @case ('filters') { - - + } + @case ('savedSearches') { - - + } + @case ('newStuff') { - - + } + @case ('unzipping') { - - + } + @case ('downloadQueue') { - - + } + @case ('exportOptions') { - - + } + @case ('moreLikeThis') { - - + } + @case ('baselineSearch') { - - + } + @case ('sbasSearch') { - - + } + @case ('onDemand') { - - + } + @default { - -
+ } + }
diff --git a/src/app/components/help/help.component.ts b/src/app/components/help/help.component.ts index 7f6ba865e..fed210899 100644 --- a/src/app/components/help/help.component.ts +++ b/src/app/components/help/help.component.ts @@ -4,12 +4,51 @@ import { MatDialogRef } from '@angular/material/dialog'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as uiStore from '@store/ui'; +import { TitleCasePipe } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { HelpTocComponent } from './help-pages/help-toc/help-toc.component'; +import { HelpGeoSearchComponent } from './help-pages/help-geo-search/help-geo-search.component'; +import { HelpListSearchComponent } from './help-pages/help-list-search/help-list-search.component'; +import { HelpSearchResultsComponent } from './help-pages/help-search-results/help-search-results.component'; +import { HelpLoginComponent } from './help-pages/help-login/help-login.component'; +import { HelpMapControlsComponent } from './help-pages/help-map-controls/help-map-controls.component'; +import { HelpFiltersComponent } from './help-pages/help-filters/help-filters.component'; +import { HelpSavedSearchesComponent } from './help-pages/help-saved-searches/help-saved-searches.component'; +import { HelpNewStuffComponent } from './help-pages/help-new-stuff/help-new-stuff.component'; +import { HelpUnzippingComponent } from './help-pages/help-unzipping/help-unzipping.component'; +import { HelpDownloadQueueComponent } from './help-pages/help-download-queue/help-download-queue.component'; +import { HelpExportOptionsComponent } from './help-pages/help-export-options/help-export-options.component'; +import { HelpMoreLikeThisComponent } from './help-pages/help-more-like-this/help-more-like-this.component'; +import { HelpBaselineSearchComponent } from './help-pages/help-baseline-search/help-baseline-search.component'; +import { HelpSbasSearchComponent } from './help-pages/help-sbas-search/help-sbas-search.component'; +import { HelpOnDemandComponent } from './help-pages/help-on-demand/help-on-demand.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-help', templateUrl: './help.component.html', styleUrls: ['./help.component.scss'], - standalone: false, + imports: [ + MatButton, + HelpTocComponent, + HelpGeoSearchComponent, + HelpListSearchComponent, + HelpSearchResultsComponent, + HelpLoginComponent, + HelpMapControlsComponent, + HelpFiltersComponent, + HelpSavedSearchesComponent, + HelpNewStuffComponent, + HelpUnzippingComponent, + HelpDownloadQueueComponent, + HelpExportOptionsComponent, + HelpMoreLikeThisComponent, + HelpBaselineSearchComponent, + HelpSbasSearchComponent, + HelpOnDemandComponent, + TitleCasePipe, + TranslateModule, + ], }) export class HelpComponent implements OnInit { private dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/help/help.module.ts b/src/app/components/help/help.module.ts deleted file mode 100644 index 26a18e7d3..000000000 --- a/src/app/components/help/help.module.ts +++ /dev/null @@ -1,63 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; - -import { MatTableModule } from '@angular/material/table'; -import { MatSortModule } from '@angular/material/sort'; - -import { HelpComponent } from './help.component'; - -import { HelpGeoSearchComponent } from './help-pages/help-geo-search/help-geo-search.component'; -import { HelpListSearchComponent } from './help-pages/help-list-search/help-list-search.component'; -import { HelpSearchResultsComponent } from './help-pages/help-search-results/help-search-results.component'; -import { HelpTocComponent } from './help-pages/help-toc/help-toc.component'; -import { HelpLoginComponent } from './help-pages/help-login/help-login.component'; -import { HelpMapControlsComponent } from './help-pages/help-map-controls/help-map-controls.component'; -import { HelpFiltersComponent } from './help-pages/help-filters/help-filters.component'; -import { HelpSavedSearchesComponent } from './help-pages/help-saved-searches/help-saved-searches.component'; -import { HelpNewStuffComponent } from './help-pages/help-new-stuff/help-new-stuff.component'; -import { HelpMoreLikeThisComponent } from '@components/help/help-pages/help-more-like-this/help-more-like-this.component'; -import { HelpBaselineSearchComponent } from '@components/help/help-pages/help-baseline-search/help-baseline-search.component'; -import { HelpSbasSearchComponent } from '@components/help/help-pages/help-sbas-search/help-sbas-search.component'; -import { HelpUnzippingComponent } from '@components/help/help-pages/help-unzipping/help-unzipping.component'; -import { HelpDownloadQueueComponent } from './help-pages/help-download-queue/help-download-queue.component'; -import { HelpExportOptionsComponent } from './help-pages/help-export-options/help-export-options.component'; -import { HelpOnDemandComponent } from './help-pages/help-on-demand/help-on-demand.component'; -import { MatInputModule } from '@angular/material/input'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - declarations: [ - HelpComponent, - HelpBaselineSearchComponent, - HelpSbasSearchComponent, - HelpGeoSearchComponent, - HelpListSearchComponent, - HelpSearchResultsComponent, - HelpTocComponent, - HelpLoginComponent, - HelpMapControlsComponent, - HelpFiltersComponent, - HelpSavedSearchesComponent, - HelpNewStuffComponent, - HelpMoreLikeThisComponent, - HelpUnzippingComponent, - HelpDownloadQueueComponent, - HelpExportOptionsComponent, - HelpOnDemandComponent, - ], - imports: [ - CommonModule, - MatSharedModule, - MatTableModule, - MatSortModule, - MatInputModule, - DocsModalModule, - TranslateModule, - ], - exports: [HelpComponent], -}) -export class HelpModule {} diff --git a/src/app/components/map/attributions/attributions.component.html b/src/app/components/map/attributions/attributions.component.html index 449ad0713..76a2d63cf 100644 --- a/src/app/components/map/attributions/attributions.component.html +++ b/src/app/components/map/attributions/attributions.component.html @@ -1,9 +1,8 @@ - + @if (breakpoint > breakpoints.MOBILE) { -
© {{ anio }} ASF | @@ -26,9 +25,9 @@ >
 
- + } - + @if (breakpoint === breakpoints.MOBILE) {
- -
+ } + @if (breakpoint === breakpoints.SMALL) { +
+ } diff --git a/src/app/components/map/attributions/attributions.component.ts b/src/app/components/map/attributions/attributions.component.ts index 36d8f0f7a..19bc6a15d 100644 --- a/src/app/components/map/attributions/attributions.component.ts +++ b/src/app/components/map/attributions/attributions.component.ts @@ -8,12 +8,19 @@ import * as uiStore from '@store/ui'; import * as scenesStore from '@store/scenes'; import { Breakpoints, asfWebsite } from '@models'; +import { MaxResultsSelectorComponent } from '@components/shared/max-results-selector/max-results-selector.component'; +import { SearchButtonComponent } from '@components/shared/search-button/search-button.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-attributions', templateUrl: './attributions.component.html', styleUrls: ['./attributions.component.scss'], - standalone: false, + imports: [ + MaxResultsSelectorComponent, + SearchButtonComponent, + TranslateModule, + ], }) export class AttributionsComponent { private store$ = inject>(Store); diff --git a/src/app/components/map/banners/banner-dialog/banner-dialog.component.ts b/src/app/components/map/banners/banner-dialog/banner-dialog.component.ts index 5885b9bce..5892d1358 100644 --- a/src/app/components/map/banners/banner-dialog/banner-dialog.component.ts +++ b/src/app/components/map/banners/banner-dialog/banner-dialog.component.ts @@ -1,13 +1,28 @@ import { Component, ViewEncapsulation, inject } from '@angular/core'; import { DialogData } from '@components/map/banners'; -import { MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { + MAT_DIALOG_DATA, + MatDialogTitle, + MatDialogContent, + MatDialogActions, + MatDialogClose, +} from '@angular/material/dialog'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { MatButton } from '@angular/material/button'; @Component({ selector: 'app-banner-dialog', templateUrl: './banner-dialog.component.html', styleUrls: ['./banner-dialog.component.scss'], encapsulation: ViewEncapsulation.None, - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + MatDialogActions, + MatButton, + MatDialogClose, + ], }) export class BannerDialogComponent { data = inject(MAT_DIALOG_DATA); diff --git a/src/app/components/map/banners/banners.component.html b/src/app/components/map/banners/banners.component.html index cec4e8ecb..a35f3aae6 100644 --- a/src/app/components/map/banners/banners.component.html +++ b/src/app/components/map/banners/banners.component.html @@ -1,3 +1,5 @@ - - - +@for (banner of banners; track banner) { + + + +} diff --git a/src/app/components/map/banners/banners.component.ts b/src/app/components/map/banners/banners.component.ts index 992a39499..b42da5265 100644 --- a/src/app/components/map/banners/banners.component.ts +++ b/src/app/components/map/banners/banners.component.ts @@ -3,15 +3,13 @@ import { ActiveToast, ToastrService } from 'ngx-toastr'; import { Banner } from '@models'; import { MatDialog } from '@angular/material/dialog'; import { BannerDialogComponent } from '@components/map/banners/banner-dialog/banner-dialog.component'; +import {} from '@angular/common'; export interface DialogData { title: string; } -@Directive({ - selector: '[bannerCreate]', - standalone: false, -}) +@Directive({ selector: '[bannerCreate]' }) export class BannerCreateDirective implements OnInit { private toastr = inject(ToastrService); dialog = inject(MatDialog); @@ -127,7 +125,7 @@ export class BannerCreateDirective implements OnInit { selector: 'app-banners', templateUrl: './banners.component.html', styleUrls: ['./banners.component.scss'], - standalone: false, + imports: [BannerCreateDirective], }) export class BannersComponent { @Input() banners: Banner[]; diff --git a/src/app/components/map/banners/banners.module.ts b/src/app/components/map/banners/banners.module.ts deleted file mode 100644 index acdb22571..000000000 --- a/src/app/components/map/banners/banners.module.ts +++ /dev/null @@ -1,18 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatSharedModule } from '@shared'; - -import { BannersComponent, BannerCreateDirective } from './banners.component'; -import { BannerDialogComponent } from './banner-dialog/banner-dialog.component'; -import { MatDialogModule } from '@angular/material/dialog'; - -@NgModule({ - declarations: [ - BannersComponent, - BannerCreateDirective, - BannerDialogComponent, - ], - imports: [CommonModule, MatSharedModule, MatDialogModule], - exports: [BannersComponent, BannerCreateDirective, BannerDialogComponent], -}) -export class BannersModule {} diff --git a/src/app/components/map/banners/index.ts b/src/app/components/map/banners/index.ts index 446fbe145..ee9645822 100644 --- a/src/app/components/map/banners/index.ts +++ b/src/app/components/map/banners/index.ts @@ -1,2 +1 @@ export * from './banners.component'; -export * from './banners.module'; diff --git a/src/app/components/map/displacement-layers/displacement-layers.component.ts b/src/app/components/map/displacement-layers/displacement-layers.component.ts index 91fce8018..1bd453ad2 100644 --- a/src/app/components/map/displacement-layers/displacement-layers.component.ts +++ b/src/app/components/map/displacement-layers/displacement-layers.component.ts @@ -10,13 +10,27 @@ import { distinctUntilChanged, filter, map } from 'rxjs'; import { MatCheckbox } from '@angular/material/checkbox'; import * as mapStore from '@store/map'; import { getVelocityOverlayOpacity } from '@store/map'; -import { MatSlider } from '@angular/material/slider'; +import { MatSlider, MatSliderThumb } from '@angular/material/slider'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { MapLegendComponent } from './map-legend/map-legend.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-displacement-layers', templateUrl: './displacement-layers.component.html', styleUrl: './displacement-layers.component.scss', - standalone: false, + imports: [ + MatCheckbox, + DocsModalComponent, + MapLegendComponent, + MatSlider, + MatTooltip, + MatSliderThumb, + FormsModule, + TranslateModule, + ], }) export class DisplacementLayersComponent implements OnInit, OnDestroy { mapService = inject(MapService); diff --git a/src/app/components/map/displacement-layers/displacement-layers.module.ts b/src/app/components/map/displacement-layers/displacement-layers.module.ts deleted file mode 100644 index 6ce6ab25d..000000000 --- a/src/app/components/map/displacement-layers/displacement-layers.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatMenuModule } from '@angular/material/menu'; -import { MatRadioModule } from '@angular/material/radio'; -import { MatCheckboxModule } from '@angular/material/checkbox'; - -import { DisplacementLayersComponent } from './displacement-layers.component'; -import { MapLegendComponent } from './map-legend/map-legend.component'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -import { MatSharedModule } from '@shared'; -import { SharedModule } from '@shared'; -import { CdkDrag } from '@angular/cdk/drag-drop'; -import { MatSlider, MatSliderThumb } from '@angular/material/slider'; -import { FormsModule } from '@angular/forms'; - -@NgModule({ - imports: [ - CommonModule, - MatMenuModule, - MatCheckboxModule, - MatRadioModule, - MatSharedModule, - SharedModule, - DocsModalModule, - MapLegendComponent, - CdkDrag, - MatSlider, - MatSliderThumb, - FormsModule, - ], - declarations: [DisplacementLayersComponent], - exports: [DisplacementLayersComponent], -}) -export class DisplacementLayersModule {} diff --git a/src/app/components/map/index.ts b/src/app/components/map/index.ts index b66dd3fa0..66985498b 100644 --- a/src/app/components/map/index.ts +++ b/src/app/components/map/index.ts @@ -1,2 +1 @@ -export { MapModule } from './map.module'; export { MapComponent } from './map.component'; diff --git a/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.component.ts b/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.component.ts index 6b00a1b7c..ff77c2a78 100644 --- a/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.component.ts +++ b/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.component.ts @@ -3,12 +3,16 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as mapStore from '@store/map'; import { SubSink } from 'subsink'; +import { MatButtonToggle } from '@angular/material/button-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-gridlines-selector', templateUrl: './gridlines-selector.component.html', styleUrls: ['./gridlines-selector.component.scss'], - standalone: false, + imports: [MatButtonToggle, MatTooltip, MatIcon, TranslateModule], }) export class GridlinesSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.module.ts b/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.module.ts deleted file mode 100644 index 6d38c2f3f..000000000 --- a/src/app/components/map/map-controls/gridlines-selector/gridlines-selector.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { GridlinesSelectorComponent } from './gridlines-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [GridlinesSelectorComponent], - imports: [ - CommonModule, - MatCheckboxModule, - MatSharedModule, - MatButtonToggleModule, - SharedModule, - ], - exports: [GridlinesSelectorComponent], -}) -export class GridlinesSelectorModule {} diff --git a/src/app/components/map/map-controls/gridlines-selector/index.ts b/src/app/components/map/map-controls/gridlines-selector/index.ts index 751c606b7..ca7b93ceb 100644 --- a/src/app/components/map/map-controls/gridlines-selector/index.ts +++ b/src/app/components/map/map-controls/gridlines-selector/index.ts @@ -1,2 +1 @@ export { GridlinesSelectorComponent } from './gridlines-selector.component'; -export * from './gridlines-selector.module'; diff --git a/src/app/components/map/map-controls/layer-selector/index.ts b/src/app/components/map/map-controls/layer-selector/index.ts index 48c3f1a15..9b2e60843 100644 --- a/src/app/components/map/map-controls/layer-selector/index.ts +++ b/src/app/components/map/map-controls/layer-selector/index.ts @@ -1,2 +1 @@ export { LayerSelectorComponent } from './layer-selector.component'; -export * from './layer-selector.module'; diff --git a/src/app/components/map/map-controls/layer-selector/layer-selector.component.html b/src/app/components/map/map-controls/layer-selector/layer-selector.component.html index 89538c49a..a731b003a 100644 --- a/src/app/components/map/map-controls/layer-selector/layer-selector.component.html +++ b/src/app/components/map/map-controls/layer-selector/layer-selector.component.html @@ -4,16 +4,14 @@ [matMenuTriggerFor]="layerMenu" aria-label="Map projection view" > - - terrain - - - directions_car - +
+ @if (layerType === layerTypes.SATELLITE) { + terrain + } @else { + directions_car + } +
+ @@ -54,38 +52,38 @@ {{ 'OVERVIEW_MAP' | translate }} - - - + + {{ 'COHERENCE_LAYER' | translate }} + + @for (layer of months; track layer) { + + } + + + } - -
- {{ 'BROWSE_IMAGE_OPACITY' | translate }} + ) { +
+
+
- - - -
- {{ 'OPACITY_OF_COHERENCE_LAYER' | translate }} +
+ + +
+ {{ 'BROWSE_IMAGE_OPACITY' | translate }} +
+ + + +
+ {{ 'OPACITY_OF_COHERENCE_LAYER' | translate }} +
+ + + +
- - - - -
+
+ } +
+
+
-
- -
-
-
+ }
-
- arrow_circle_left -
-
- arrow_circle_right -
+ @if (showToolBar === true) { +
+ arrow_circle_left +
+ } + @if (showToolBar === false) { +
+ arrow_circle_right +
+ }
diff --git a/src/app/components/map/map-controls/map-controls.component.ts b/src/app/components/map/map-controls/map-controls.component.ts index 951a22e0c..c8c0be8ef 100644 --- a/src/app/components/map/map-controls/map-controls.component.ts +++ b/src/app/components/map/map-controls/map-controls.component.ts @@ -15,12 +15,46 @@ import { combineLatest, Observable } from 'rxjs'; import { filter, map, startWith, tap } from 'rxjs/operators'; import { ToggleBrowseOverlay } from '@store/map'; +import { NgClass, AsyncPipe, DecimalPipe } from '@angular/common'; +import { ViewSelectorComponent } from './view-selector/view-selector.component'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { LayerSelectorComponent } from './layer-selector/layer-selector.component'; +import { InteractionSelectorComponent } from '@components/shared/aoi-options/interaction-selector/interaction-selector.component'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu } from '@angular/material/menu'; +import { MatSlider, MatSliderThumb } from '@angular/material/slider'; +import { MapInfoComponent } from './map-info/map-info.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-map-controls', templateUrl: './map-controls.component.html', styleUrls: ['./map-controls.component.scss'], - standalone: false, + imports: [ + NgClass, + + ViewSelectorComponent, + MatButtonToggleGroup, + MatButtonToggle, + MatTooltip, + MatIcon, + LayerSelectorComponent, + InteractionSelectorComponent, + MatButton, + MatMenuTrigger, + MatMenu, + MatSlider, + MatSliderThumb, + MapInfoComponent, + AsyncPipe, + DecimalPipe, + TranslateModule, + ], }) export class MapControlsComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/map/map-controls/map-controls.module.ts b/src/app/components/map/map-controls/map-controls.module.ts deleted file mode 100644 index b0f003797..000000000 --- a/src/app/components/map/map-controls/map-controls.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatSharedModule } from '@shared'; -import { ViewSelectorModule } from './view-selector'; -import { AoiOptionsModule } from '@components/shared/aoi-options'; -import { LayerSelectorModule } from './layer-selector'; -import { GridlinesSelectorModule } from './gridlines-selector'; -import { MatSliderModule } from '@angular/material/slider'; - -import { MapControlsComponent } from './map-controls.component'; -import { MapInfoComponent } from './map-info/map-info.component'; -import { SharedModule } from '@shared'; -import { FormsModule } from '@angular/forms'; - -@NgModule({ - imports: [ - CommonModule, - MatButtonToggleModule, - MatMenuModule, - MatSharedModule, - MatSliderModule, - AoiOptionsModule, - ViewSelectorModule, - LayerSelectorModule, - GridlinesSelectorModule, - SharedModule, - FormsModule, - ], - declarations: [MapControlsComponent, MapInfoComponent], - exports: [MapControlsComponent], -}) -export class MapControlsModule {} diff --git a/src/app/components/map/map-controls/map-info/map-info.component.ts b/src/app/components/map/map-controls/map-info/map-info.component.ts index c8528d57b..82d30be43 100644 --- a/src/app/components/map/map-controls/map-info/map-info.component.ts +++ b/src/app/components/map/map-controls/map-info/map-info.component.ts @@ -8,12 +8,13 @@ import { import { LonLat } from '@models'; import * as services from '@services'; +import { DecimalPipe } from '@angular/common'; @Component({ selector: 'app-map-info', templateUrl: './map-info.component.html', styleUrls: ['./map-info.component.scss'], - standalone: false, + imports: [DecimalPipe], }) export class MapInfoComponent implements AfterViewInit { private mapService = inject(services.MapService); diff --git a/src/app/components/map/map-controls/view-selector/index.ts b/src/app/components/map/map-controls/view-selector/index.ts index 29f93b2b6..56ab26d7c 100644 --- a/src/app/components/map/map-controls/view-selector/index.ts +++ b/src/app/components/map/map-controls/view-selector/index.ts @@ -1,2 +1 @@ export { ViewSelectorComponent } from './view-selector.component'; -export * from './view-selector.module'; diff --git a/src/app/components/map/map-controls/view-selector/view-selector.component.html b/src/app/components/map/map-controls/view-selector/view-selector.component.html index 4b0c22806..44d59ba02 100644 --- a/src/app/components/map/map-controls/view-selector/view-selector.component.html +++ b/src/app/components/map/map-controls/view-selector/view-selector.component.html @@ -4,23 +4,16 @@ [matMenuTriggerFor]="viewMenu" aria-label="Map projection view" > - - - - - + @if (view === types.ARCTIC) { + + } + @if (view === types.EQUATORIAL) { + + + } + @if (view === types.ANTARCTIC) { + + } @@ -30,6 +23,7 @@ aria-label="Arctic map projection" (click)="onArcticSelected()" [value]="types.ARCTIC" + [disabled]="isDisplacementSearch" > >(Store); public view: MapViewType; public types = MapViewType; + public isDisplacementSearch = false; private subs = new SubSink(); ngOnInit() { @@ -38,6 +52,21 @@ export class ViewSelectorComponent implements OnInit, OnDestroy { }); }), ); + + this.subs.add( + this.store$.select(searchStore.getSearchType).subscribe((searchType) => { + this.isDisplacementSearch = searchType === SearchType.DISPLACEMENT; + + // Auto-switch to equatorial view if switching to Displacement Search from a polar view + if ( + this.isDisplacementSearch && + (this.view === MapViewType.ARCTIC || + this.view === MapViewType.ANTARCTIC) + ) { + this.store$.dispatch(new mapStore.SetMapView(MapViewType.EQUATORIAL)); + } + }), + ); } public onArcticSelected = () => this.onNewProjection(MapViewType.ARCTIC); diff --git a/src/app/components/map/map-controls/view-selector/view-selector.module.ts b/src/app/components/map/map-controls/view-selector/view-selector.module.ts deleted file mode 100644 index 7e17add5e..000000000 --- a/src/app/components/map/map-controls/view-selector/view-selector.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; - -import { ViewSelectorComponent } from './view-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ViewSelectorComponent], - imports: [ - CommonModule, - MatButtonToggleModule, - MatSharedModule, - MatMenuModule, - SharedModule, - ], - exports: [ViewSelectorComponent], -}) -export class ViewSelectorModule {} diff --git a/src/app/components/map/map.component.html b/src/app/components/map/map.component.html index a358a9bbf..3f6e11b99 100644 --- a/src/app/components/map/map.component.html +++ b/src/app/components/map/map.component.html @@ -24,20 +24,21 @@ (areResultsLoaded$ | async) && breakpoint === breakpoints.MOBILE " > -
-
- -
- - @if ( - searchType === searchTypes.DISPLACEMENT && - breakpoint > breakpoints.MOBILE - ) { -
- + @if (breakpoint > breakpoints.MOBILE) { +
+
+
- } -
+ @if ( + searchType === searchTypes.DISPLACEMENT && + breakpoint > breakpoints.MOBILE + ) { +
+ +
+ } +
+ } -
- -
- - -
- + @if (breakpoint === breakpoints.MOBILE) {
-
- -
- -
- - - - - -
+
- + } + + @if (breakpoint === breakpoints.MOBILE) { + @if (fullscreenControl !== fc.NONE) { +
+ } + @if (fullscreenControl === fc.MAP) { +
+
+ +
+
+ @if (searchType !== searchTypes.SARVIEWS_EVENTS) { + + } + @if ((view$ | async) === viewTypes.EQUATORIAL) { + + } +
+
+ } + }
- +@if (breakpoint > breakpoints.MOBILE) { + +} + +@if ( + breakpoint > breakpoints.MOBILE && searchType === searchTypes.DISPLACEMENT +) { + +} - - +@if (searchType === searchTypes.DATASET) { + + +} diff --git a/src/app/components/map/map.component.scss b/src/app/components/map/map.component.scss index ed6cb5954..6fac3481e 100644 --- a/src/app/components/map/map.component.scss +++ b/src/app/components/map/map.component.scss @@ -86,6 +86,23 @@ button { right: 10px; } +.opera-logo { + position: fixed; + bottom: 30px; + left: 10px; + width: 110px; + height: auto; + cursor: pointer; + pointer-events: auto; + opacity: 0.85; + transition: opacity 0.2s ease; + z-index: 999; + + &:hover { + opacity: 1; + } +} + .mobile-map-controls { pointer-events: auto; position: fixed; diff --git a/src/app/components/map/map.component.ts b/src/app/components/map/map.component.ts index 0c410dd94..f113f20cb 100644 --- a/src/app/components/map/map.component.ts +++ b/src/app/components/map/map.component.ts @@ -31,6 +31,7 @@ import * as sceneStore from '@store/scenes'; import * as models from '@models'; import { CMRProduct, SarviewsEvent } from '@models'; import { + DisplacementDisclaimerService, MapService, PointHistoryService, SarviewsEventsService, @@ -43,8 +44,22 @@ import { StyleLike } from 'ol/style/Style'; import { Feature } from 'ol'; import Geometry from 'ol/geom/Geometry'; import { MatDialog } from '@angular/material/dialog'; +import { MatTooltipModule } from '@angular/material/tooltip'; import WKT from 'ol/format/WKT'; import { getTimeseriesChartStates } from '@store/charts'; +import { MatButton, MatFabButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { AsyncPipe } from '@angular/common'; +import { MapControlsComponent } from './map-controls/map-controls.component'; +import { DisplacementLayersComponent } from './displacement-layers/displacement-layers.component'; +import { BannersComponent } from './banners/banners.component'; +import { InteractionSelectorComponent } from '@components/shared/aoi-options/interaction-selector/interaction-selector.component'; +import { ViewSelectorComponent } from './map-controls/view-selector/view-selector.component'; +import { LayerSelectorComponent } from './map-controls/layer-selector/layer-selector.component'; +import { FiltersDropdownComponent } from '../filters-dropdown/filters-dropdown.component'; +import { FileUploadComponent } from '@components/shared/aoi-options/file-upload/file-upload.component'; +import { AttributionsComponent } from './attributions/attributions.component'; +import { TranslateModule } from '@ngx-translate/core'; enum FullscreenControls { MAP = 'Map', @@ -56,7 +71,24 @@ enum FullscreenControls { selector: 'app-map', templateUrl: './map.component.html', styleUrls: ['./map.component.scss'], - standalone: false, + imports: [ + MatButton, + MatIcon, + + MapControlsComponent, + DisplacementLayersComponent, + BannersComponent, + MatFabButton, + InteractionSelectorComponent, + ViewSelectorComponent, + LayerSelectorComponent, + FiltersDropdownComponent, + FileUploadComponent, + AttributionsComponent, + AsyncPipe, + TranslateModule, + MatTooltipModule, + ], }) export class MapComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -67,6 +99,7 @@ export class MapComponent implements OnInit, OnDestroy { private eventMonitoringService = inject(SarviewsEventsService); dialog = inject(MatDialog); private pointHistoryService = inject(PointHistoryService); + private disclaimerService = inject(DisplacementDisclaimerService); @Output() loadUrlState = new EventEmitter(); @ViewChild('overlay', { static: true }) overlayRef: ElementRef; @@ -773,6 +806,10 @@ export class MapComponent implements OnInit, OnDestroy { this.fullscreenControl = FullscreenControls.NONE; } + public onOpenDispDisclaimer(): void { + this.disclaimerService.open(); + } + ngOnDestroy() { this.subs.unsubscribe(); } diff --git a/src/app/components/map/map.module.ts b/src/app/components/map/map.module.ts deleted file mode 100644 index 4a3de96bb..000000000 --- a/src/app/components/map/map.module.ts +++ /dev/null @@ -1,49 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatSharedModule } from '@shared'; - -import { SearchButtonModule } from '@components/shared/search-button'; -import { ClearButtonModule } from '@components/shared/clear-button'; -import { MaxResultsSelectorModule } from '@components/shared/max-results-selector'; -import { ViewSelectorModule } from './map-controls/view-selector'; -import { LayerSelectorModule } from './map-controls/layer-selector'; -import { GridlinesSelectorModule } from './map-controls/gridlines-selector'; - -import { MapComponent } from './map.component'; -import { MapControlsModule } from './map-controls'; -import { AoiOptionsModule } from '@components/shared/aoi-options'; -import { AttributionsComponent } from './attributions/attributions.component'; -import { FiltersDropdownModule } from '@components/filters-dropdown'; -import { BannersModule } from './banners'; -import { DisplacementLayersModule } from './displacement-layers'; - -import { FileUploadModule } from '@components/shared/aoi-options/file-upload'; -import { SharedModule } from '@shared'; - -@NgModule({ - imports: [ - CommonModule, - - MatDialogModule, - MatSharedModule, - - ViewSelectorModule, - LayerSelectorModule, - GridlinesSelectorModule, - MapControlsModule, - FiltersDropdownModule, - AoiOptionsModule, - DisplacementLayersModule, - - SearchButtonModule, - ClearButtonModule, - MaxResultsSelectorModule, - BannersModule, - FileUploadModule, - SharedModule, - ], - declarations: [MapComponent, AttributionsComponent], - exports: [MapComponent], -}) -export class MapModule {} diff --git a/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.html b/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.html index 4c5585199..1af2bca51 100644 --- a/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.html +++ b/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.html @@ -1,199 +1,213 @@ - +@if (breakpoint > breakpoints.MEDIUM) { -
- {{ 'SCENE_DETAIL' | translate }} - - +} - - - -
-
-
 
-
-
- - - {{ numBaselineScenes$ | async }} {{ 'OF' | translate }} - {{ numUnfilteredBaselineScenes$ | async }} - {{ 'SCENE' | translate - }}{{ (numBaselineScenes$ | async) === 1 ? '' : 's' }} +@if (breakpoint <= breakpoints.MEDIUM) { + @if (view === Views.LIST) { + + +
+
+
 
+
+
+ + + {{ numBaselineScenes$ | async }} {{ 'OF' | translate }} + {{ numUnfilteredBaselineScenes$ | async }} + {{ 'SCENE' | translate + }}{{ (numBaselineScenes$ | async) === 1 ? '' : 's' }} + - +
-
-
-
- -
-
-
- - +
+ +
+
+
+ - settings_overscan - - + + settings_overscan + + +
-
- -
-
- -
-
-
- - +
+ +
+
+
+ - add_shopping_cart - - + + add_shopping_cart + + +
-
- -
-
- -
-
-
- - - - - + ) { +
+
+ +
+
+
+ + + + + +
+
+
-
- - -
- -
-
- -
-
-
- - +
+ +
+
+
+ - get_app - - + + get_app + + +
+ + + + + + + + + + + + + + + + +
+ + +
- - - - - - - - - - - - - - - - - - - - -
+ +
+ +
+ + } + @if (isOfCardView(Views.DETAIL)) { + + +
-
- - -
- -
- - - - -
- - -
- - - - - + + + + } +} >(Store); diff --git a/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.module.ts b/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.module.ts deleted file mode 100644 index 45f3c2f10..000000000 --- a/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { ResizableModule } from 'angular-resizable-element'; - -import { SceneDetailModule } from '../scene-detail'; -import { ScenesListModule } from '../scenes-list'; -import { ScenesListHeaderModule } from '../scenes-list-header/scenes-list-header.module'; -import { OnDemandAddMenuModule } from '@components/shared/on-demand-add-menu'; - -import { BaselineChartModule } from '@components/baseline-chart/baseline-chart.module'; - -import { BaselineResultsMenuComponent } from './baseline-results-menu.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [BaselineResultsMenuComponent], - imports: [ - CommonModule, - MatMenuModule, - MatSharedModule, - MatButtonToggleModule, - ResizableModule, - SharedModule, - SceneDetailModule, - ScenesListModule, - ScenesListHeaderModule, - OnDemandAddMenuModule, - BaselineChartModule, - ], - exports: [BaselineResultsMenuComponent], -}) -export class BaselineResultsMenuModule {} diff --git a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.html b/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.html index 18c783411..caa4f306c 100644 --- a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.html +++ b/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.html @@ -16,7 +16,7 @@ - +@if (breakpoint > breakpoints.SMALL) { {{ @@ -25,60 +25,53 @@ : ('SCENE_DETAIL' | translate | titlecase) }} - + @if (scenesLength !== 0 || sarviewsEventsLength !== 0) { + + } - - - {{ products.length || '' }} {{ 'FILE' | translate - }}{{ (products || []).length === 1 ? '' : 's' }} + @let products = selectedProducts$ | async; + + @if (products) { + {{ products.length || '' }} {{ 'FILE' | translate + }}{{ (products || []).length === 1 ? '' : 's' }} + } @else { + {{ 'FILES' | translate }} + } - {{ - 'FILES' | translate - }} -
- + @if (scenesLength !== 0) { + + }
- +} - +@if (breakpoint <= breakpoints.SMALL) { {{ 'SCENE_DETAIL' | translate }} / - - {{ products.length || '' }} {{ 'FILE' | translate - }}{{ (products || []).length === 1 ? '' : 's' }} + @let products = selectedProducts$ | async; + + @if (products) { + {{ products.length || '' }} {{ 'FILE' | translate + }}{{ (products || []).length === 1 ? '' : 's' }} + } @else { + {{ 'FILES' | translate }} + } - {{ - 'FILES' | translate - }} -
- - + @if (scenesLength !== 0 || sarviewsEventsLength !== 0) { + + }
- + @if (scenesLength !== 0) { + + }
- +} diff --git a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.ts b/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.ts index 3253e10f4..7d8cced28 100644 --- a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.ts +++ b/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.component.ts @@ -8,6 +8,13 @@ import * as scenesStore from '@store/scenes'; import { ScenesService, ScreenSizeService } from '@services'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { MatCard, MatCardSubtitle } from '@angular/material/card'; +import { NgClass, AsyncPipe, TitleCasePipe } from '@angular/common'; +import { ScenesListHeaderComponent } from '../scenes-list-header/scenes-list-header.component'; +import { ScenesListComponent } from '../scenes-list/scenes-list.component'; +import { SceneDetailComponent } from '../scene-detail/scene-detail.component'; +import { SceneFilesComponent } from '../scene-files/scene-files.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-desktop-results-menu', @@ -16,7 +23,19 @@ import * as models from '@models'; './desktop-results-menu.component.css', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatCard, + NgClass, + MatCardSubtitle, + ScenesListHeaderComponent, + ScenesListComponent, + + SceneDetailComponent, + SceneFilesComponent, + AsyncPipe, + TitleCasePipe, + TranslateModule, + ], }) export class DesktopResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.module.ts b/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.module.ts deleted file mode 100644 index 19bb9b6b5..000000000 --- a/src/app/components/results-menu/desktop-results-menu/desktop-results-menu.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; - -import { SceneFilesModule } from '../scene-files'; -import { SceneDetailModule } from '../scene-detail'; -import { ScenesListModule } from '../scenes-list'; -import { ScenesListHeaderModule } from '../scenes-list-header'; - -import { DesktopResultsMenuComponent } from './desktop-results-menu.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DesktopResultsMenuComponent], - imports: [ - CommonModule, - MatSharedModule, - - SceneFilesModule, - SceneDetailModule, - ScenesListModule, - ScenesListHeaderModule, - SharedModule, - ], - exports: [DesktopResultsMenuComponent], -}) -export class DesktopResultsMenuModule {} diff --git a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.html b/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.html index 27f101b23..871c5a88a 100644 --- a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.html +++ b/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.html @@ -13,201 +13,201 @@ mat-button > {{ 'SCENE_DETAIL' | translate }} - + @if ( + searchType !== SearchTypes.BASELINE && searchType !== SearchTypes.SBAS + ) { {{ 'AND_FILES' | translate }} - - - - + @if (searchType === SearchTypes.BASELINE) { + + } + @if (searchType === SearchTypes.SBAS) { + + }
-
- - - - - -
- -
- -
+ @if (view === Views.LIST) { +
+ + + + +
+ +
+ +
+ } -
- - - {{ 'SCENE_DETAIL' | translate }} - + + + {{ 'SCENE_DETAIL' | translate }} + @if ( searchType !== SearchTypes.BASELINE && searchType !== SearchTypes.SBAS - " - > - / - - {{ products.length || '' }} {{ 'FILE' | translate - }}{{ (products || []).length === 1 ? '' : 's' }} - - {{ - 'FILES' | translate - }} - - - -
- - - - - - -
-
-
-
- {{ product.name }} + ) { + / + @if (selectedProducts$ | async; as products) { + + {{ products.length || '' }} {{ 'FILE' | translate + }}{{ (products || []).length === 1 ? '' : 's' }} + + } @else { + {{ 'FILES' | translate }} + } + } + +
+ @if (searchType !== SearchTypes.SBAS) { + + } @else { +
+ @if (pair) { +
+ @for (product of pair; track product) { +
+
+ {{ product.name }} +
+ @if (datasetForProduct.match(product); as dataset) { +
+ + {{ dataset.name | translate }} + + • + {{ + dataset.frequency + }} +
+ } + + +
+
+ }
- -
- +
- {{ dataset.name | translate }} - - • - {{ dataset.frequency }} + {{ 'NO_PAIR_SELECTED' | translate }} +
- - - -
-
+ }
-
-
- {{ 'NO_PAIR_SELECTED' | translate }} -
-
-
- - - -
- - -
- -
- -
- - -
- - - {{ 'BASELINE_CRITERIA' | translate - }}more_horiz - - + ) { +
+ + }
- - - -
+ +
+ } -
- - -
- - + + +
+ - {{ 'SBAS_FILTERS' | translate - }}more_horiz - - -
- error_outline + {{ 'BASELINE_CRITERIA' | translate + }}more_horiz + + +
+ + + +
+ } + + @if (view === Views.SBAS) { +
+ + +
+ - + + {{ 'SBAS_FILTERS' | translate + }}more_horiz + + + @if (this.isDisconnected) { +
+ error_outline + +
+ } +
+ +
+
+
- -
-
- +
+
-
- -
- -
- -
+ +
+ }
diff --git a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.ts b/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.ts index 4c9653906..6f23395a9 100644 --- a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.ts +++ b/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.component.ts @@ -10,6 +10,25 @@ import { DatasetForProductService } from '@services'; import { SubSink } from 'subsink'; import { CMRProductPair, SearchType } from '@models'; +import { MatButton } from '@angular/material/button'; +import { AsyncPipe } from '@angular/common'; +import { MatCard, MatCardSubtitle } from '@angular/material/card'; +import { ScenesListHeaderComponent } from '../scenes-list-header/scenes-list-header.component'; +import { ScenesListComponent } from '../scenes-list/scenes-list.component'; +import { SceneDetailComponent } from '../scene-detail/scene-detail.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { SceneMetadataComponent } from '@components/shared/scene-metadata/scene-metadata.component'; +import { SceneFilesComponent } from '../scene-files/scene-files.component'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatIcon } from '@angular/material/icon'; +import { BaselineChartComponent } from '../../baseline-chart/baseline-chart.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { SBASChartComponent } from '../../sbas-chart/sbas-chart.component'; +import { SbasSlidersTwoComponent } from '../sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component'; +import { TranslateModule } from '@ngx-translate/core'; enum MobileViews { LIST = 0, @@ -25,7 +44,28 @@ enum MobileViews { './mobile-results-menu.component.scss', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatButton, + + MatCard, + MatCardSubtitle, + ScenesListHeaderComponent, + ScenesListComponent, + SceneDetailComponent, + + MatTooltip, + SceneMetadataComponent, + SceneFilesComponent, + MatButtonToggleGroup, + MatButtonToggle, + MatIcon, + BaselineChartComponent, + DocsModalComponent, + SBASChartComponent, + SbasSlidersTwoComponent, + AsyncPipe, + TranslateModule, + ], }) export class MobileResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.module.ts b/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.module.ts deleted file mode 100644 index e556a81d7..000000000 --- a/src/app/components/results-menu/mobile-results-menu/mobile-results-menu.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; - -import { SbasResultsMenuModule } from '../sbas-results-menu/sbas-results-menu.module'; -import { SBASChartModule } from '@components/sbas-chart/sbas-chart.module'; -import { BaselineChartModule } from '@components/baseline-chart/baseline-chart.module'; -import { SceneMetadataModule } from '@components/shared/scene-metadata'; -import { SceneFilesModule } from '../scene-files'; -import { SceneDetailModule } from '../scene-detail'; -import { ScenesListModule } from '../scenes-list'; -import { ScenesListHeaderModule } from '../scenes-list-header'; - -import { MobileResultsMenuComponent } from './mobile-results-menu.component'; -import { SharedModule } from '@shared'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -@NgModule({ - declarations: [MobileResultsMenuComponent], - imports: [ - CommonModule, - MatSharedModule, - MatButtonToggleModule, - - SharedModule, - SBASChartModule, - BaselineChartModule, - SbasResultsMenuModule, - SceneFilesModule, - SceneMetadataModule, - SceneDetailModule, - ScenesListModule, - ScenesListHeaderModule, - DocsModalModule, - ], - exports: [MobileResultsMenuComponent], -}) -export class MobileResultsMenuModule {} diff --git a/src/app/components/results-menu/results-menu.component.html b/src/app/components/results-menu/results-menu.component.html index 9f2672978..7c326e286 100644 --- a/src/app/components/results-menu/results-menu.component.html +++ b/src/app/components/results-menu/results-menu.component.html @@ -1,152 +1,151 @@ - -
+@if (isResultsMenuOpen$ | async) { + @if (breakpoint$ | async; as breakpoint) {
-
+ @if (products.length !== 0 || !(noSarviewsEvents$ | async)) {
- -
-
- -
-
- - - - - - - - +
- - - - - - - - - - - -
- {{ 'NO_MOBILE_DISPLACEMENT_SEARCH' | translate }} + +
+
+
+ @if (products.length !== 0 || !(noSarviewsEvents$ | async)) { +
+ @if (breakpoint > breakpoints.MOBILE) { + @if ( + searchType !== SearchTypes.BASELINE && + searchType !== SearchTypes.SBAS && + searchType !== SearchTypes.SARVIEWS_EVENTS && + searchType !== SearchTypes.DISPLACEMENT + ) { + + + } + @if (searchType === SearchTypes.DISPLACEMENT) { + + + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { + + + } + @if (searchType === SearchTypes.BASELINE) { + + + } + @if (searchType === SearchTypes.SBAS) { + + + } + } + @if (breakpoint === breakpoints.MOBILE) { + @if (searchType === SearchTypes.DISPLACEMENT) { +
+ {{ 'NO_MOBILE_DISPLACEMENT_SEARCH' | translate }} +
+ } + @if (searchType !== SearchTypes.DISPLACEMENT) { + + + } + }
- - - - - - -
- -
-
-
- {{ 'NO_ON_DEMAND_PRODUCTS' | translate }} -
- - - {{ 'GETTING_STARTED' | translate }} - - - - comment{{ 'FEEDBACK' | translate }} +
+
+ {{ 'NO_ON_DEMAND_PRODUCTS' | translate }} +
+ + {{ 'GETTING_STARTED' | translate }} + + + comment{{ 'FEEDBACK' | translate }} +
+
+ }
-
+ }
-
- + } +} diff --git a/src/app/components/results-menu/results-menu.component.ts b/src/app/components/results-menu/results-menu.component.ts index 258af227e..74e9b55ed 100644 --- a/src/app/components/results-menu/results-menu.component.ts +++ b/src/app/components/results-menu/results-menu.component.ts @@ -5,7 +5,7 @@ import { OnDestroy, inject, } from '@angular/core'; -import { ResizeEvent } from 'angular-resizable-element'; +import { ResizeEvent, ResizableModule } from 'angular-resizable-element'; import { SubSink } from 'subsink'; import { Subject } from 'rxjs'; @@ -19,12 +19,35 @@ import * as scenesStore from '@store/scenes'; import * as searchStore from '@store/search'; import * as models from '@models'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { DesktopResultsMenuComponent } from './desktop-results-menu/desktop-results-menu.component'; +import { TimeseriesResultsMenuComponent } from './timeseries-results-menu/timeseries-results-menu.component'; +import { SarviewsResultsMenuComponent } from './sarviews-results-menu/sarviews-results-menu.component'; +import { BaselineResultsMenuComponent } from './baseline-results-menu/baseline-results-menu.component'; +import { SBASResultsMenuComponent } from './sbas-results-menu/sbas-results-menu.component'; +import { MobileResultsMenuComponent } from './mobile-results-menu/mobile-results-menu.component'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-results-menu', templateUrl: './results-menu.component.html', styleUrls: ['./results-menu.component.scss'], - standalone: false, + imports: [ + ResizableModule, + NgClass, + MatIcon, + DesktopResultsMenuComponent, + TimeseriesResultsMenuComponent, + SarviewsResultsMenuComponent, + BaselineResultsMenuComponent, + SBASResultsMenuComponent, + MobileResultsMenuComponent, + MatButton, + AsyncPipe, + TranslateModule, + ], }) export class ResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/results-menu.module.ts b/src/app/components/results-menu/results-menu.module.ts deleted file mode 100644 index bb21eb859..000000000 --- a/src/app/components/results-menu/results-menu.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { ResizableModule } from 'angular-resizable-element'; - -import { SbasResultsMenuModule } from './sbas-results-menu/sbas-results-menu.module'; -import { SarviewsResultsMenuModule } from './sarviews-results-menu/sarviews-results-menu.module'; -import { BaselineResultsMenuModule } from './baseline-results-menu/baseline-results-menu.module'; -import { DesktopResultsMenuModule } from './desktop-results-menu/desktop-results-menu.module'; -import { MobileResultsMenuModule } from './mobile-results-menu/mobile-results-menu.module'; -import { TimeseriesResultsMenuModule } from './timeseries-results-menu/timeseries-results-menu.module'; - -import { ResultsMenuComponent } from './results-menu.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ResultsMenuComponent], - imports: [ - CommonModule, - MatSharedModule, - ResizableModule, - SharedModule, - SbasResultsMenuModule, - SarviewsResultsMenuModule, - BaselineResultsMenuModule, - DesktopResultsMenuModule, - MobileResultsMenuModule, - TimeseriesResultsMenuModule, - ], - exports: [ResultsMenuComponent], -}) -export class ResultsMenuModule {} diff --git a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.html b/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.html index 87571b20d..f31f5904b 100644 --- a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.html +++ b/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.html @@ -16,14 +16,15 @@ - +@if (breakpoint > breakpoints.SMALL) { {{ 'EVENT_DETAIL' | translate }} - + @if (sarviewsEventsLength !== 0) { + + } - @@ -39,7 +40,6 @@ name="ProductSorting" >
-
- -
- -

- {{ 'NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT' | translate }} -

- - - - -
+ @if (sarviewsProductsLength !== 0) { + + } + @if (sarviewsProductsLength === 0) { +
+ +

+ {{ 'NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT' | translate }} +

+ + + @if ((unfilteredEventProductsLength$ | async) > 0) { + + } + +
+ }
- +} - +@if (breakpoint <= breakpoints.SMALL) { {{ 'SCENE_DETAIL' | translate }} / - - {{ products.length || '' }}{{ 'FILE' | translate - }}{{ (products || []).length === 1 ? '' : 's' }} - - {{ - 'FILES' | translate - }} + @if (selectedProducts$ | async; as products) { + + {{ products.length || '' }}{{ 'FILE' | translate + }}{{ (products || []).length === 1 ? '' : 's' }} + + } @else { + {{ 'FILES' | translate }} + } -
- + @if (sarviewsEventsLength !== 0) { + + }
- - -
- -

- {{ 'NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT' | translate }} -

- -
+ @if (sarviewsProductsLength !== 0) { + + } + @if (sarviewsProductsLength === 0) { +
+ +

+ {{ 'NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT' | translate }} +

+ +
+ }
- +} diff --git a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.ts b/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.ts index c051e25c8..8fb08f7f1 100644 --- a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.ts +++ b/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.component.ts @@ -10,6 +10,21 @@ import { SubSink } from 'subsink'; import * as models from '@models'; import { map } from 'rxjs/operators'; import { OpenFiltersMenu } from '@store/ui'; +import { MatCard, MatCardSubtitle } from '@angular/material/card'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { ScenesListHeaderComponent } from '../scenes-list-header/scenes-list-header.component'; +import { ScenesListComponent } from '../scenes-list/scenes-list.component'; +import { SceneDetailComponent } from '../scene-detail/scene-detail.component'; +import { EventProductSortSelectorComponent } from '@components/shared/event-product-sort-selector/event-product-sort-selector.component'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { SceneFilesComponent } from '../scene-files/scene-files.component'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-results-menu', @@ -18,7 +33,24 @@ import { OpenFiltersMenu } from '@store/ui'; './sarviews-results-menu.component.scss', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatCard, + NgClass, + MatCardSubtitle, + ScenesListHeaderComponent, + ScenesListComponent, + + SceneDetailComponent, + EventProductSortSelectorComponent, + MatButtonToggleGroup, + MatButtonToggle, + MatTooltip, + MatIcon, + SceneFilesComponent, + MatButton, + AsyncPipe, + TranslateModule, + ], }) export class SarviewsResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.module.ts b/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.module.ts deleted file mode 100644 index c95dc865a..000000000 --- a/src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; - -import { SceneDetailModule } from '../scene-detail'; -import { ScenesListModule } from '../scenes-list'; -import { SceneFilesModule } from '../scene-files'; -import { ScenesListHeaderModule } from '../scenes-list-header/scenes-list-header.module'; - -import { EventProductSortSelectorModule } from '@components/shared/event-product-sort-selector'; - -import { SarviewsResultsMenuComponent } from './sarviews-results-menu.component'; - -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SarviewsResultsMenuComponent], - imports: [ - CommonModule, - MatSharedModule, - MatButtonToggleModule, - SharedModule, - SceneFilesModule, - SceneDetailModule, - ScenesListModule, - ScenesListHeaderModule, - - EventProductSortSelectorModule, - ], - exports: [SarviewsResultsMenuComponent], -}) -export class SarviewsResultsMenuModule {} diff --git a/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.html b/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.html index 74f80c0b5..c60537a19 100644 --- a/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.html +++ b/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.html @@ -1,5 +1,5 @@ - +@if (breakpoint > breakpoints.MOBILE) { - -
- -
- -
-
-
- {{ product.name }} - -
- - - -
-
+ @if (view === Views.LIST) { +
+
-
+ } + @if (view === Views.DETAIL) { +
+ @if (pair) { +
+ @for (product of pair; track product) { +
+ {{ product.name }} +
+ + +
+
+ } +
+ } +
+ } - -
-
-
- {{ product.name }} -
- + @if (!!pair) { +
+ @for (product of pair; track product) { +
+
+ {{ product.name }} +
+ @if (datasetForProduct.match(product); as dataset) { +
+ + {{ dataset.name }} + + • + {{ dataset.frequency }} +
+ } + + +
+
+ } +
+ } + @if (!pair) { +
- - {{ dataset.name }} - - • - {{ dataset.frequency }} + {{ 'NO_PAIR_SELECTED' | translate }}
- - - -
-
-
-
- {{ 'NO_PAIR_SELECTED' | translate }} -
-
+ }
- +}
-
- -
+ @if (this.isDisconnected) { +
+ +
+ } >(Store); diff --git a/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.module.ts b/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.module.ts deleted file mode 100644 index 919a2fe66..000000000 --- a/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.module.ts +++ /dev/null @@ -1,56 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatCheckboxModule } from '@angular/material/checkbox'; - -import { ResizableModule } from 'angular-resizable-element'; - -import { MatSharedModule } from '@shared'; -import { SBASChartModule } from '@components/sbas-chart/sbas-chart.module'; -import { SceneMetadataModule } from '@components/shared/scene-metadata'; - -import { ScenesListModule } from '../scenes-list'; -import { ScenesListHeaderModule } from '../scenes-list-header/scenes-list-header.module'; - -import { SbasSlidersComponent } from './sbas-sliders/sbas-sliders.component'; -import { SbasSlidersTwoComponent } from './sbas-sliders-two/sbas-sliders-two.component'; - -import { SBASResultsMenuComponent } from './sbas-results-menu.component'; - -import { SharedModule } from '@shared'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -@NgModule({ - declarations: [ - SBASResultsMenuComponent, - SbasSlidersComponent, - SbasSlidersTwoComponent, - ], - imports: [ - CommonModule, - MatSharedModule, - ReactiveFormsModule, - FormsModule, - ResizableModule, - MatFormFieldModule, - MatCheckboxModule, - MatInputModule, - MatButtonToggleModule, - SharedModule, - SBASChartModule, - SceneMetadataModule, - ScenesListModule, - ScenesListHeaderModule, - DocsModalModule, - ], - exports: [ - SBASResultsMenuComponent, - SbasSlidersTwoComponent, - SbasSlidersComponent, - ], -}) -export class SbasResultsMenuModule {} diff --git a/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.html b/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.html index 0d93e2df8..f46314731 100644 --- a/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.html +++ b/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.html @@ -41,9 +41,9 @@ required (input)="updatePerpendicular()" /> - {{ - 'INVALID_BASELINE' | translate - }} + @if (meterDistanceControl.invalid) { + {{ 'INVALID_BASELINE' | translate }} + }
@@ -65,9 +65,9 @@ required (input)="updateDaysOffset()" /> - {{ - 'INVALID_START_DAY' | translate - }} + @if (daysControl.invalid) { + {{ 'INVALID_START_DAY' | translate }} + }
@@ -89,9 +89,9 @@ required (input)="updateDaysOffset()" /> - {{ - 'INVALID_END_DAY' | translate - }} + @if (daysControl.invalid) { + {{ 'INVALID_END_DAY' | translate }} + }
diff --git a/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.ts b/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.ts index a654cc075..752e1eadc 100644 --- a/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.ts +++ b/src/app/components/results-menu/sbas-results-menu/sbas-sliders-two/sbas-sliders-two.component.ts @@ -29,7 +29,15 @@ import { UntypedFormControl, UntypedFormGroup, Validators, + FormsModule, } from '@angular/forms'; +import { + MatFormField, + MatLabel, + MatInput, + MatError, +} from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; declare let wNumb: any; @@ -37,7 +45,15 @@ declare let wNumb: any; selector: 'app-sbas-sliders-two', templateUrl: './sbas-sliders-two.component.html', styleUrls: ['./sbas-sliders-two.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatInput, + FormsModule, + + MatError, + TranslateModule, + ], }) export class SbasSlidersTwoComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/sbas-results-menu/sbas-sliders/sbas-sliders.component.ts b/src/app/components/results-menu/sbas-results-menu/sbas-sliders/sbas-sliders.component.ts index 0554f31fb..9c64de074 100644 --- a/src/app/components/results-menu/sbas-results-menu/sbas-sliders/sbas-sliders.component.ts +++ b/src/app/components/results-menu/sbas-results-menu/sbas-sliders/sbas-sliders.component.ts @@ -24,7 +24,6 @@ declare let wNumb: any; selector: 'app-sbas-sliders', templateUrl: './sbas-sliders.component.html', styleUrls: ['./sbas-sliders.component.scss'], - standalone: false, }) export class SbasSlidersComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.component.ts b/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.component.ts index 2fd4e7e17..5da0900a1 100644 --- a/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.component.ts +++ b/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.component.ts @@ -17,12 +17,13 @@ import * as noUiSlider from 'nouislider'; import { Observable, Subject } from 'rxjs'; import { distinctUntilChanged, withLatestFrom } from 'rxjs/operators'; import { SubSink } from 'subsink'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-event-polygon-slider', templateUrl: './event-polygon-slider.component.html', styleUrls: ['./event-polygon-slider.component.scss'], - standalone: false, + imports: [TranslateModule], }) export class EventPolygonSliderComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.module.ts b/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.module.ts deleted file mode 100644 index 1cf201905..000000000 --- a/src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { EventPolygonSliderComponent } from './event-polygon-slider.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [EventPolygonSliderComponent], - imports: [CommonModule, SharedModule], - exports: [EventPolygonSliderComponent], -}) -export class EventPolygonSliderModule {} diff --git a/src/app/components/results-menu/scene-detail/event-polygon-slider/index.ts b/src/app/components/results-menu/scene-detail/event-polygon-slider/index.ts index 1af45e8d5..bf3136e83 100644 --- a/src/app/components/results-menu/scene-detail/event-polygon-slider/index.ts +++ b/src/app/components/results-menu/scene-detail/event-polygon-slider/index.ts @@ -1,2 +1 @@ -export * from './event-polygon-slider.module'; export * from './event-polygon-slider.component'; diff --git a/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.html b/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.html index bf52d187d..bf88001cd 100644 --- a/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.html +++ b/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.html @@ -1,43 +1,40 @@ - - -
+
- - -
- {{ scene.metadata.date | shortDate }} +
+ + +
+ {{ scene.metadata.date | shortDate }} +
-
- - - - + + +} @else { + -->
{{ product.granules[0].acquisition_date | shortDate }}
- +} diff --git a/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.ts b/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.ts index 0d8d46b59..2f6f69ff8 100644 --- a/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.ts +++ b/src/app/components/results-menu/scene-detail/image-dialog/browse-list/browse-list.component.ts @@ -7,7 +7,11 @@ import { OnDestroy, inject, } from '@angular/core'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, +} from '@angular/cdk/scrolling'; import { SubSink } from 'subsink'; import { Observable } from 'rxjs'; @@ -29,13 +33,23 @@ import * as searchStore from '@store/search'; import * as models from '@models'; import { SarviewsEventsService, ScenesService } from '@services'; import { PinnedProduct } from '@services/browse-map.service'; +import { AsyncPipe } from '@angular/common'; +import { MatBadge } from '@angular/material/badge'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; @Component({ selector: 'app-browse-list', templateUrl: './browse-list.component.html', styleUrls: ['./browse-list.component.scss'], encapsulation: ViewEncapsulation.None, - standalone: false, + imports: [ + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, + MatBadge, + AsyncPipe, + ShortDatePipe, + ], }) export class BrowseListComponent implements OnInit, AfterViewInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.html b/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.html index e06ae54be..cb6236f67 100644 --- a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.html +++ b/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.html @@ -1,106 +1,117 @@
-
-
-
-

- - {{ scene.name }} - -

- - - {{ dataset.name }} - - • - - {{ scene.metadata.date | fullDate }} - - - {{ scene.metadata.date | shortDateTime }} - - -
-
- -
+ @if ((searchType$ | async) !== searchTypes.SARVIEWS_EVENTS) { +
+ @if (scene$ | async; as scene) { +
+
+

+ + {{ scene.name }} + +

+ + @if (dataset) { + + {{ dataset.name }} + + } + • + @if (breakpoint > breakpoints.MOBILE) { + + {{ scene.metadata.date | fullDate }} + + } + @if (breakpoint === breakpoints.MOBILE) { + + {{ scene.metadata.date | shortDateTime }} + + } + +
+
+ +
+
+ }
-
+ } -
-
-
-

- - - {{ event.description }} - - - - - {{ event.event_type[0].toLocaleUpperCase() - }}{{ event.event_type.slice(1) }} {{ 'EVENT' | translate }}: - {{ event.processing_timeframe.start | shortDate }} + @if ( + (searchType$ | async) === searchTypes.SARVIEWS_EVENTS && + !!(sarviewsEvent$ | async) + ) { +
+ @if (sarviewsEvent$ | async; as event) { +
+
+

+ @if (!!event.description) { + + {{ event.description }} + + } @else { + + {{ event.event_type[0].toLocaleUpperCase() + }}{{ event.event_type.slice(1) }} {{ 'EVENT' | translate }}: + {{ event.processing_timeframe.start | shortDate }} + + } +

+ + + {{ event?.event_type === 'quake' ? 'USGS' : 'Smithsonian' }} + + • + @if (breakpoint > breakpoints.MOBILE) { + + {{ event.processing_timeframe.start | fullDate }} + + } + @if (breakpoint === breakpoints.MOBILE) { + + {{ event.processing_timeframe.start | shortDateTime }} + + } - -

- - - {{ event?.event_type === 'quake' ? 'USGS' : 'Smithsonian' }} - - • - - {{ event.processing_timeframe.start | fullDate }} - - - {{ event.processing_timeframe.start | shortDateTime }} - - -
-
- -
+
+
+ +
+
+ }
-
+ }
breakpoint < breakpoints.SMALL ? 'main-window-mobile' : 'main-window' " > -
-
- + @if ( + (browses$ | async)?.length > 1 && + (searchType$ | async) !== searchTypes.SARVIEWS_EVENTS + ) { +
+ @for (browse of browses$ | async; track browse) { +
+ +
+ }
-
+ }
-
- -
- - -
-
-
{{ 'SCENE_DETAIL' | translate }}
-
    -
  • - {{ 'REFERENCE' | translate }}: {{ (scene$ | async).name }} -
    • -
- - -
-
    -
  • - {{ 'Secondary:' | translate }} - {{ (scene$ | async).metadata?.job?.scenes[1].name }} -
    • -
- - -
-
- -
{{ 'PRODUCT_DETAILS' | translate }}
-
    -
  • - {{ 'PROJECT_NAME' | translate }}: - {{ scene.metadata.job.name }} -
    • -
  • - {{ param.name }}: {{ param.val }} -
    • -
-
- - -
- {{ products?.length }} {{ 'FILES' | translate }} -
- - - - - -
- -
-
{{ 'EVENT_DETAIL' | translate }}
- - -
- - -
{{ 'SCENE_DETAIL' | translate }}
-
- - -
-
- + @if (isImageLoading) { +
+ +
+ } - -
{{ 'PRODUCT_DETAILS' | translate }}
-
-
    -
  • - {{ 'PRODUCT_FILENAME' | translate }} - {{ currentSarviewsProduct.files.product_name }} -
    • -
  • - {{ 'PROCESSING_DATE' | translate }} - {{ currentSarviewsProduct.processing_date | shortDateTime }} -
    • - -
+ @if (breakpoint > breakpoints.MOBILE) { + @if (!isShow) { +
+ @if ((searchType$ | async) !== searchTypes.SARVIEWS_EVENTS) { +
+
{{ 'SCENE_DETAIL' | translate }}
+ @if ((searchType$ | async) === searchTypes.CUSTOM_PRODUCTS) { +
    +
  • + {{ 'REFERENCE' | translate }}: + {{ (scene$ | async).name }} +
    • +
+ } + + + @if ((scene$ | async).metadata?.job?.scenes?.length > 1) { +
+
    +
  • + {{ 'Secondary:' | translate }} + {{ (scene$ | async).metadata?.job?.scenes[1].name }} +
    • +
+ + +
+ } +
+ @if ((searchType$ | async) === searchTypes.CUSTOM_PRODUCTS) { +
+ {{ 'PRODUCT_DETAILS' | translate }} +
+
    + @if (scene.metadata.job.name) { +
  • + {{ 'PROJECT_NAME' | translate }}: + {{ scene.metadata.job.name }} +
    • + } + @for (param of paramsList; track param) { +
  • + {{ param.name }}: {{ param.val }} +
    • + } +
+
+ } +
+ {{ products?.length }} {{ 'FILES' | translate }} +
+ + @for (product of products; track product) { + + + + } +
-
- - - -
{{ 'FILE' | translate }}
- - - - - - - - - - + • + {{ + currentSarviewsProduct.job_type.replace('_', ' ') + }} + + } + + @if (!!currentSarviewsProduct) { + + } + @if (!!currentSarviewsProduct) { + + } + + + + + +
+ }
-
- + } + }
- + @if (breakpoint > breakpoints.MOBILE) {
- -
-
+ @if ( breakpoint > breakpoints.MOBILE && (searchType$ | async) !== searchTypes.SARVIEWS_EVENTS - " - class="fx-empty" - > - - - - {{ 'ONLY_DISPLAY_SCENES_WITH_A_BROWSE_IMAGE' | translate }} - - - {{ 'W_BROWSE_IMAGES' | translate }} - -
- -
- + ) { +
+ + + @if (breakpoint > breakpoints.MOBILE) { + + {{ 'ONLY_DISPLAY_SCENES_WITH_A_BROWSE_IMAGE' | translate }} + + } + @if (breakpoint === breakpoints.MOBILE) { + + {{ 'W_BROWSE_IMAGES' | translate }} + + } +
+ } +
+ +
-
+ }
diff --git a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.ts b/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.ts index 90907253c..75434566f 100644 --- a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.ts +++ b/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.component.ts @@ -40,13 +40,66 @@ import { } from '@models'; import { ClipboardService } from 'ngx-clipboard'; import { PinnedProduct } from '@services/browse-map.service'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { MatCardSmImage } from '@angular/material/card'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { SceneMetadataComponent } from '@components/shared/scene-metadata/scene-metadata.component'; +import { MatActionList, MatListItem } from '@angular/material/list'; +import { + MatMenuTrigger, + MatMenu, + MatMenuItem, + MatMenuContent, +} from '@angular/material/menu'; +import { DownloadFileButtonComponent } from '@components/shared/download-file-button/download-file-button.component'; +import { EventMetadataComponent } from '@components/shared/event-metadata/event-metadata.component'; +import { EventProductMetadataComponent } from '@components/shared/event-product-metadata/event-product-metadata.component'; +import { BrowseListComponent } from './browse-list/browse-list.component'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; +import { + ShortDatePipe, + ShortDateTimePipe, + FullDatePipe, +} from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-image-dialog', templateUrl: './image-dialog.component.html', styleUrls: ['./image-dialog.component.scss'], providers: [BrowseMapService], - standalone: false, + imports: [ + NgClass, + MatTooltip, + MatIconButton, + MatIcon, + + MatCardSmImage, + MatProgressSpinner, + SceneMetadataComponent, + MatActionList, + MatListItem, + MatMenuTrigger, + MatMenu, + DownloadFileButtonComponent, + MatMenuItem, + EventMetadataComponent, + EventProductMetadataComponent, + MatMenuContent, + BrowseListComponent, + MatCheckbox, + MatButton, + AsyncPipe, + ReadableSizeFromBytesPipe, + ShortDatePipe, + ShortDateTimePipe, + FullDatePipe, + TranslateModule, + ], }) export class ImageDialogComponent implements OnInit, AfterViewInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.module.ts b/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.module.ts deleted file mode 100644 index 742c5113a..000000000 --- a/src/app/components/results-menu/scene-detail/image-dialog/image-dialog.module.ts +++ /dev/null @@ -1,53 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatBadgeModule } from '@angular/material/badge'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { DragDropModule } from '@angular/cdk/drag-drop'; - -import { MatDialogModule } from '@angular/material/dialog'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatListModule } from '@angular/material/list'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatSharedModule } from '@shared/mat-shared.module'; -import { MatCheckboxModule } from '@angular/material/checkbox'; - -import { PipesModule } from '@pipes'; -import { SceneMetadataModule } from '@components/shared/scene-metadata'; -import { EventMetadataModule } from '@components/shared/event-metadata'; -import { EventProductMetadataModule } from '@components/shared/event-product-metadata'; -import { ImageDialogComponent } from './image-dialog.component'; -import { BrowseListComponent } from './browse-list/browse-list.component'; -import { DownloadFileButtonModule } from '@components/shared/download-file-button/download-file-button.module'; -import { MatSliderModule } from '@angular/material/slider'; -import { EventProductSortSelectorModule } from '@components/shared/event-product-sort-selector'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ImageDialogComponent, BrowseListComponent], - imports: [ - CommonModule, - ScrollingModule, - DragDropModule, - MatBadgeModule, - MatButtonModule, - MatIconModule, - MatProgressSpinnerModule, - MatSharedModule, - MatCheckboxModule, - MatListModule, - MatDialogModule, - MatMenuModule, - PipesModule, - SceneMetadataModule, - EventMetadataModule, - EventProductMetadataModule, - DownloadFileButtonModule, - MatSliderModule, - EventProductSortSelectorModule, - SharedModule, - ], - exports: [ImageDialogComponent], -}) -export class ImageDialogModule {} diff --git a/src/app/components/results-menu/scene-detail/image-dialog/index.ts b/src/app/components/results-menu/scene-detail/image-dialog/index.ts index f9542362e..f498d5f79 100644 --- a/src/app/components/results-menu/scene-detail/image-dialog/index.ts +++ b/src/app/components/results-menu/scene-detail/image-dialog/index.ts @@ -1,2 +1 @@ export { ImageDialogComponent } from './image-dialog.component'; -export { ImageDialogModule } from './image-dialog.module'; diff --git a/src/app/components/results-menu/scene-detail/scene-detail.component.html b/src/app/components/results-menu/scene-detail/scene-detail.component.html index a6afd8c95..9ccadaddd 100644 --- a/src/app/components/results-menu/scene-detail/scene-detail.component.html +++ b/src/app/components/results-menu/scene-detail/scene-detail.component.html @@ -1,454 +1,473 @@ -
-
- - - - - {{ - sarviewEvent.description[0].toUpperCase() + - sarviewEvent.description.slice(1) - }} - - - - - {{ sarviewEvent.event_type[0].toLocaleUpperCase() - }}{{ sarviewEvent.event_type.slice(1) }} {{ 'EVENT' | translate }}: - {{ sarviewEvent.processing_timeframe.start | shortDate }} - - - - - - - - - {{ 'SARVIEWS_EVENT' | translate }} - - • - {{ sarviewEvent.event_type }} - - - -
- -
- - - - - -
- -
- - - - - - {{ - scene.metadata.productType === 'BURST' || - scene.metadata.job?.job_type === 'ARIA_S1_GUNW' - ? scene.id - : scene.name - }} - - - - - - {{ dataset.name }} - V{{ scene.name.slice(-1) }} + @if (sarviewEvent) { +
+ + + @if (!!sarviewEvent.description) { + + {{ + sarviewEvent.description[0].toUpperCase() + + sarviewEvent.description.slice(1) + }} + + } @else { + + {{ sarviewEvent.event_type[0].toLocaleUpperCase() + }}{{ sarviewEvent.event_type.slice(1) }} + {{ 'EVENT' | translate }}: + {{ sarviewEvent.processing_timeframe.start | shortDate }} + + } + - - • - {{ - dataset.frequency - }} - - - -
-

- - {{ - 'ACCESSING_THIS_DATA_REQUIRES_YOU_TO_LOG_IN' - | translate - | titlecase - }} - - - - {{ 'JERS_1_REQUIRES_A' | translate }} - - {{ 'RESTRICTED_DATA_USE_AGREEMENT' | translate }} - - - - {{ 'RADARSAT_IS_AVAILABLE_THROUGH' | translate }} + + + + + {{ 'SARVIEWS_EVENT' | translate }} + + • + {{ sarviewEvent.event_type }} + + +

+ +
+ + + + +
+ +
+ } + @if (searchType !== searchTypes.SARVIEWS_EVENTS) { + @if (scene) { + + + {{ + scene.metadata.productType === 'BURST' || + scene.metadata.job?.job_type === 'ARIA_S1_GUNW' + ? scene.id + : scene.name + }} + + + - {{ 'CANADAS_OPEN_LICENSE' | translate }} + {{ dataset.name }} + @if (dataset.name === 'SMAP') { + V{{ scene.name.slice(-1) }} + } - -

-
- -
-
- @if ( - scene.metadata.job?.job_type === 'ARIA_S1_GUNW' && - scene.file === '' - ) { -

{{ 'JOB_INGEST_PROCESSING' | translate }}

- - - } @else { -
- - - -
+ • + {{ + dataset.frequency + }} + + +
+

+ @if (!isLoggedIn) { + + {{ + 'ACCESSING_THIS_DATA_REQUIRES_YOU_TO_LOG_IN' + | translate + | titlecase + }} + } -

-
-
- - {{ scene.metadata.job.scenes[1].name }} - ({{ 'SECONDARY_SCENE' | translate }}) - - - - -
- -
-
-
- -
- - - - -
- +} -
-
- {{ 'NO_SCENE_SELECTED' | translate }} +@if (!scene && !sarviewEvent) { +
+
+ {{ 'NO_SCENE_SELECTED' | translate }} +
-
+} diff --git a/src/app/components/results-menu/scene-detail/scene-detail.component.ts b/src/app/components/results-menu/scene-detail/scene-detail.component.ts index 5e1e970c3..f4f8c325d 100644 --- a/src/app/components/results-menu/scene-detail/scene-detail.component.ts +++ b/src/app/components/results-menu/scene-detail/scene-detail.component.ts @@ -31,13 +31,56 @@ import { ImageDialogComponent } from './image-dialog'; import { DatasetForProductService } from '@services'; import { PinnedProduct } from '@services/browse-map.service'; import { Observable } from 'rxjs'; +import { + NgStyle, + NgClass, + AsyncPipe, + UpperCasePipe, + TitleCasePipe, +} from '@angular/common'; +import { + MatCardHeader, + MatCardTitle, + MatCardSubtitle, + MatCardContent, +} from '@angular/material/card'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { EventMetadataComponent } from '@components/shared/event-metadata/event-metadata.component'; +import { EventPolygonSliderComponent } from './event-polygon-slider/event-polygon-slider.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { SceneMetadataComponent } from '@components/shared/scene-metadata/scene-metadata.component'; +import { MatIcon } from '@angular/material/icon'; +import { MatButton } from '@angular/material/button'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scene-detail', templateUrl: './scene-detail.component.html', styleUrls: ['./scene-detail.component.scss'], providers: [DatasetForProductService], - standalone: false, + imports: [ + MatCardHeader, + MatCardTitle, + CopyToClipboardComponent, + MatCardSubtitle, + MatTooltip, + MatCardContent, + EventMetadataComponent, + EventPolygonSliderComponent, + DocsModalComponent, + SceneMetadataComponent, + MatIcon, + NgStyle, + NgClass, + MatButton, + AsyncPipe, + UpperCasePipe, + TitleCasePipe, + ShortDatePipe, + TranslateModule, + ], }) export class SceneDetailComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-detail/scene-detail.module.ts b/src/app/components/results-menu/scene-detail/scene-detail.module.ts deleted file mode 100644 index 2e88b3a8f..000000000 --- a/src/app/components/results-menu/scene-detail/scene-detail.module.ts +++ /dev/null @@ -1,45 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatBadgeModule } from '@angular/material/badge'; -import { MatButtonModule } from '@angular/material/button'; -import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; -import { TruncateModule } from '@yellowspot/ng-truncate'; - -import { PipesModule } from '@pipes'; -import { MatSharedModule } from '@shared'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { SceneMetadataModule } from '@components/shared/scene-metadata'; -import { EventMetadataModule } from '@components/shared/event-metadata'; -import { ImageDialogModule } from './image-dialog'; -import { SceneDetailComponent } from './scene-detail.component'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { EventPolygonSliderModule } from './event-polygon-slider'; -import { SharedModule } from '@shared'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -@NgModule({ - declarations: [SceneDetailComponent], - imports: [ - CommonModule, - MatBadgeModule, - MatButtonModule, - MatIconModule, - MatMenuModule, - TruncateModule, - MatSharedModule, - PipesModule, - CopyToClipboardModule, - ImageDialogModule, - SceneMetadataModule, - EventMetadataModule, - MatButtonToggleModule, - MatSliderModule, - EventPolygonSliderModule, - DocsModalModule, - SharedModule, - ], - exports: [SceneDetailComponent], -}) -export class SceneDetailModule {} diff --git a/src/app/components/results-menu/scene-files/file-contents/file-contents.component.ts b/src/app/components/results-menu/scene-files/file-contents/file-contents.component.ts index 05be33e3b..1071f4dd6 100644 --- a/src/app/components/results-menu/scene-files/file-contents/file-contents.component.ts +++ b/src/app/components/results-menu/scene-files/file-contents/file-contents.component.ts @@ -3,6 +3,11 @@ import { FlatTreeControl } from '@angular/cdk/tree'; import { MatTreeFlatDataSource, MatTreeFlattener, + MatTree, + MatTreeNodeDef, + MatTreeNode, + MatTreeNodePadding, + MatTreeNodeToggle, } from '@angular/material/tree'; import { SubSink } from 'subsink'; @@ -15,6 +20,12 @@ import * as queueStore from '@store/queue'; import { ScreenSizeService } from '@services'; import { UnzippedFolder, CMRProduct } from '@models'; +import { FileNameComponent } from '@components/shared/file-name/file-name.component'; +import { DownloadFileButtonComponent } from '@components/shared/download-file-button/download-file-button.component'; +import { CartToggleComponent } from '@components/shared/cart-toggle/cart-toggle.component'; +import { MatIconButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; interface ExampleFlatNode { expandable: boolean; @@ -28,7 +39,19 @@ interface ExampleFlatNode { selector: 'app-file-contents', templateUrl: './file-contents.component.html', styleUrls: ['./file-contents.component.scss'], - standalone: false, + imports: [ + MatTree, + MatTreeNodeDef, + MatTreeNode, + MatTreeNodePadding, + FileNameComponent, + DownloadFileButtonComponent, + CartToggleComponent, + MatIconButton, + MatTreeNodeToggle, + MatIcon, + ReadableSizeFromBytesPipe, + ], }) export class FileContentsComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scene-files/file-contents/file-contents.module.ts b/src/app/components/results-menu/scene-files/file-contents/file-contents.module.ts deleted file mode 100644 index 406d60f47..000000000 --- a/src/app/components/results-menu/scene-files/file-contents/file-contents.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatTreeModule } from '@angular/material/tree'; -import { PipesModule } from '@pipes'; -import { TruncateModule } from '@yellowspot/ng-truncate'; - -import { MatSharedModule } from '@shared'; -import { FileNameModule } from '@components/shared/file-name'; -import { CartToggleModule } from '@components/shared/cart-toggle'; - -import { FileContentsComponent } from './file-contents.component'; -import { DownloadFileButtonModule } from '@components/shared/download-file-button/download-file-button.module'; - -@NgModule({ - declarations: [FileContentsComponent], - imports: [ - CommonModule, - MatTreeModule, - MatSharedModule, - PipesModule, - TruncateModule, - FileNameModule, - CartToggleModule, - DownloadFileButtonModule, - ], - exports: [FileContentsComponent], -}) -export class FileContentsModule {} diff --git a/src/app/components/results-menu/scene-files/file-contents/index.ts b/src/app/components/results-menu/scene-files/file-contents/index.ts index 5aecf14a6..78be80795 100644 --- a/src/app/components/results-menu/scene-files/file-contents/index.ts +++ b/src/app/components/results-menu/scene-files/file-contents/index.ts @@ -1,2 +1 @@ export * from './file-contents.component'; -export * from './file-contents.module'; diff --git a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.html b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.html index 6d428b7ef..0864bb883 100644 --- a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.html +++ b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.html @@ -1,143 +1,130 @@ - - - keyboard_arrow_right - - - keyboard_arrow_down - -
- -
- -
@if ((searchType$ | async) !== searchTypes.CUSTOM_PRODUCTS) { - {{ product.productTypeDisplay | truncate: 36 + @if (product.productTypeDisplay.length > 40) { + {{ product.productTypeDisplay | truncate: 36 + }}{{ product.productTypeDisplay | truncate: -4 : '' }} + + } + @if (product.productTypeDisplay.length <= 40) { + {{ product.productTypeDisplay }} + } + @if (product.metadata.job && product.metadata.job.expiration_time) { + + {{ expirationBadge(product.metadata.job.expiration_time) }} + + } + + } @else { + @if (product.productTypeDisplay.length > 40) { + + {{ 'TYPE' | translate }}: + {{ product.productTypeDisplay | truncate: 36 }}{{ product.productTypeDisplay | truncate: -4 : '' }} - {{ product.productTypeDisplay }} + } + @if (product.productTypeDisplay.length <= 40) { + + {{ 'TYPE' | translate }}: + {{ product.productTypeDisplay }} - + } + @if (product.metadata.job && product.metadata.job.expiration_time) { + {{ expirationBadge(product.metadata.job.expiration_time) }} - - } @else { - - {{ 'TYPE' | translate }}: - {{ product.productTypeDisplay | truncate: 36 - }}{{ product.productTypeDisplay | truncate: -4 : '' }} - - - {{ 'TYPE' | translate }}: - {{ product.productTypeDisplay }} - - - {{ expirationBadge(product.metadata.job.expiration_time) }} - + } } - - - - - - + @if (!product.metadata.job) { + + + + + + }
- - - + + } + @if (loadingHyp3JobName === product.name) { + + } + + @for (jobType of validHyp3JobTypes; track jobType) { + + } + + + }
- {{ - 'VIRTUAL' | translate - }} - {{ - product.bytes.toString() | readableSizeFromBytes - }} + @if (product.bytes === 0 && !product?.id?.startsWith('OPERA')) { + {{ 'VIRTUAL' | translate }} + } + @if (isDownloadable(product) && product.bytes !== 0) { + {{ product.bytes.toString() | readableSizeFromBytes }} + }
@if (product.metadata.job) { -
- {{ 'PROJECT_NAME' | translate }}: {{ product.metadata.job.name }} +
+ {{ 'PROJECT_NAME' | translate }}: + @if (product.metadata.job.name) { + {{ product.metadata.job.name }} + } @else { +  {{ + 'PROJECT_NAME_UNNAMED' | translate + }} + } +
@@ -145,26 +132,31 @@ {{ product.metadata.job.request_time | fullDate }}
-
- {{ 'CREDIT_COST' | translate }}: - {{ product.metadata.job.credit_cost }} -
- -
- {{ 'JOB_ID' | translate }} + @if (product.metadata.job.credit_cost) { +
+ {{ 'CREDIT_COST' | translate }}: + {{ product.metadata.job.credit_cost }} +
+ } - - -
+ @if (product.metadata.job.job_id) { +
+ {{ 'JOB_ID' | translate }} + + +
+ } } -
- {{ param.name }}: {{ param.val }} -
+ @for (param of paramsList; track param; let first = $first) { +
+ {{ param.name }}: {{ param.val }} +
+ } - - - - - - - - - - - - + + } + + @if (!isDownloadable(product)) { + + + } + + @if ((searchType$ | async) === searchTypes.CUSTOM_PRODUCTS) { + + @if (isExpired(product.metadata.job)) { + + } + + + + + } diff --git a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.scss b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.scss index 2a83b459f..44f72b67f 100644 --- a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.scss +++ b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.scss @@ -2,9 +2,10 @@ .icon-margin { margin-left: 5px; + span { margin: 0 5px; -} + } } .disabled-cursor { @@ -34,3 +35,16 @@ color: themed('light-black'); } } + +.unnamed-project { + font-style: italic; + opacity: 0.7; +} + +.job-metadata-first { + margin-top: -18px; +} + +.params-first { + margin-top: -8px; +} diff --git a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.ts b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.ts index 44a43e612..aeb606cd2 100644 --- a/src/app/components/results-menu/scene-files/scene-file/scene-file.component.ts +++ b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.ts @@ -26,18 +26,73 @@ import { AppState } from '@store'; import { Store } from '@ngrx/store'; import { SearchType } from '@models'; import * as filterStore from '@store/filters'; +import { + MatListItem, + MatListItemIcon, + MatListItemTitle, + MatListItemMeta, + MatListItemLine, +} from '@angular/material/list'; +import { AsyncPipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { + FaIconLibrary, + FontAwesomeModule, +} from '@fortawesome/angular-fontawesome'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { MatIconButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatDialog } from '@angular/material/dialog'; +import { + ProjectNameDialogComponent, + ProjectNameDialogData, +} from '@components/shared/project-name-dialog'; +import { DownloadFileButtonComponent } from '@components/shared/download-file-button/download-file-button.component'; +import { CartToggleComponent } from '@components/shared/cart-toggle/cart-toggle.component'; +import { Hyp3JobStatusBadgeComponent } from '@components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component'; +import { TruncateModule } from '@yellowspot/ng-truncate'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; +import { FullDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; +import { fas, faSpinner } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-scene-file', templateUrl: './scene-file.component.html', styleUrls: ['./scene-file.component.scss'], - standalone: false, + imports: [ + MatListItem, + + MatListItemIcon, + MatIcon, + MatTooltip, + FontAwesomeModule, + MatListItemTitle, + CopyToClipboardComponent, + MatIconButton, + MatListItemMeta, + MatMenuTrigger, + MatMenu, + + MatMenuItem, + MatListItemLine, + DownloadFileButtonComponent, + CartToggleComponent, + Hyp3JobStatusBadgeComponent, + AsyncPipe, + TruncateModule, + ReadableSizeFromBytesPipe, + FullDatePipe, + TranslateModule, + ], }) export class SceneFileComponent implements OnInit, OnDestroy { private hyp3JobStatus = inject(Hyp3JobStatusService); private store$ = inject>(Store); env = inject(EnvironmentService); private onDemand = inject(OnDemandService); + private dialog = inject(MatDialog); @Input() product: models.CMRProduct; @Input() isQueued: boolean; @@ -53,6 +108,7 @@ export class SceneFileComponent implements OnInit, OnDestroy { @Output() unzip = new EventEmitter(); @Output() closeProduct = new EventEmitter(); @Output() queueHyp3Job = new EventEmitter(); + @Output() renameJobProjectName = new EventEmitter(); public searchType$ = this.store$.select(searchStore.getSearchType); public searchTypes = SearchType; @@ -61,7 +117,12 @@ export class SceneFileComponent implements OnInit, OnDestroy { public copyIcons = models.CopyIcons; private subs = new SubSink(); + constructor() { + const library = inject(FaIconLibrary); + library.addIconPacks(fas); + library.addIcons(faSpinner); + } ngOnInit() { this.subs.add( of(this.product) @@ -155,6 +216,25 @@ export class SceneFileComponent implements OnInit, OnDestroy { ); } + public onEditProjectName(oldProjectName: string): void { + const dialogRef = this.dialog.open< + ProjectNameDialogComponent, + ProjectNameDialogData, + string + >(ProjectNameDialogComponent, { + width: '400px', + data: { + currentName: oldProjectName, + }, + }); + + dialogRef.afterClosed().subscribe((result) => { + if (result !== undefined) { + this.renameJobProjectName.emit(result); + } + }); + } + private expirationDays(expiration_time: moment.Moment): number { const current = moment.utc(); @@ -175,8 +255,9 @@ export class SceneFileComponent implements OnInit, OnDestroy { return false; } - public prodDownloaded(_product) { - // Do nothing + // Event handler required by template but no action needed + public prodDownloaded(_product: models.CMRProduct): void { + // Intentionally empty - event binding required but no action needed } public onSearchProduct() { diff --git a/src/app/components/results-menu/scene-files/scene-file/scene-file.module.ts b/src/app/components/results-menu/scene-files/scene-file/scene-file.module.ts deleted file mode 100644 index 1b48cdb9b..000000000 --- a/src/app/components/results-menu/scene-files/scene-file/scene-file.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NgModule, inject } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatMenuModule } from '@angular/material/menu'; - -import { - FontAwesomeModule, - FaIconLibrary, -} from '@fortawesome/angular-fontawesome'; -import { faSpinner, fas } from '@fortawesome/free-solid-svg-icons'; -import { MatSharedModule } from '@shared'; -import { Hyp3JobStatusBadgeModule } from '@components/shared/hyp3-job-status-badge'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { CartToggleModule } from '@components/shared/cart-toggle'; -import { TruncateModule } from '@yellowspot/ng-truncate'; -import { PipesModule } from '@pipes'; - -import { SceneFileComponent } from './scene-file.component'; -import { DownloadFileButtonModule } from '@components/shared/download-file-button/download-file-button.module'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SceneFileComponent], - imports: [ - CommonModule, - FontAwesomeModule, - MatSharedModule, - MatMenuModule, - MatChipsModule, - CopyToClipboardModule, - Hyp3JobStatusBadgeModule, - CartToggleModule, - TruncateModule, - PipesModule, - DownloadFileButtonModule, - SharedModule, - ], - exports: [SceneFileComponent], -}) -export class SceneFileModule { - constructor() { - const library = inject(FaIconLibrary); - - library.addIconPacks(fas); - library.addIcons(faSpinner); - } -} diff --git a/src/app/components/results-menu/scene-files/scene-files.component.html b/src/app/components/results-menu/scene-files/scene-files.component.html index 31263457c..72491bb0e 100644 --- a/src/app/components/results-menu/scene-files/scene-files.component.html +++ b/src/app/components/results-menu/scene-files/scene-files.component.html @@ -1,174 +1,191 @@ -
- {{ 'RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING' | translate }} - - Read this first - -
- -
- - - - + {{ 'RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING' | translate }} + - - -
+ Read this first + +
+} - -
-
- - + + @for (product of products; track product) { + - + } + @for (product of dynamicallySearchedProduct$ | async; track product) { + + + } + +
+} + +@if (breakpoint$ | async; as breakpoint) { + + @if (selectedSarviewEventID && !!sarviewsProducts) { +
+
+ -
- -
-
- {{ formatProductName(prod.files.product_name) }} -
-
- {{ - prod.files.product_size.toString() | readableSizeFromBytes - }}, - {{ prod.job_type.replace('_', ' ') }} + + +
+ @if (breakpoint > breakpoints.MOBILE) { + + } +
+
+ {{ formatProductName(prod.files.product_name) }} +
+
+ {{ + prod.files.product_size.toString() + | readableSizeFromBytes + }}, + {{ prod.job_type.replace('_', ' ') }} +
+
+ @if (hyp3ableByProduct[prod.product_id]; as byJobType) { +
+ + + + + + + +
+ }
-
-
- - + + + +
+
+ } + +} - - - - - - -
-
- - - +@if (showUnzippedProductScreen) { +
+ + @for (product of beforeWithUnzip; track product) { + + + } + +
+
+ + @for (product of afterUnzip; track product) { + + + } +
- - -
- - - - -
- -
- - - - -
+} diff --git a/src/app/components/results-menu/scene-files/scene-files.component.scss b/src/app/components/results-menu/scene-files/scene-files.component.scss index 325deb6a3..fff03b4ac 100644 --- a/src/app/components/results-menu/scene-files/scene-files.component.scss +++ b/src/app/components/results-menu/scene-files/scene-files.component.scss @@ -4,7 +4,7 @@ $prod-row-height: 58px; $thumb-size: 50px; .products-list { - padding-top: 0; + padding-top: 8px; padding-bottom: 0; overflow-y: auto; } diff --git a/src/app/components/results-menu/scene-files/scene-files.component.ts b/src/app/components/results-menu/scene-files/scene-files.component.ts index 485c2ed39..6bcf4c930 100644 --- a/src/app/components/results-menu/scene-files/scene-files.component.ts +++ b/src/app/components/results-menu/scene-files/scene-files.component.ts @@ -47,20 +47,57 @@ import { ClipboardService } from 'ngx-clipboard'; import moment from 'moment'; import { faCopy } from '@fortawesome/free-solid-svg-icons'; -import { MatSelectionListChange } from '@angular/material/list'; +import { + MatSelectionListChange, + MatList, + MatSelectionList, + MatListOption, +} from '@angular/material/list'; import { PinnedProduct } from '@services/browse-map.service'; import { ImageDialogComponent } from '../scene-detail/image-dialog'; import { MatDialog } from '@angular/material/dialog'; import { ScreenSizeService } from '@services'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, +} from '@angular/cdk/scrolling'; import * as filterStore from '@store/filters'; import { L1L2BrowseCollectionMapping } from '@models/datasets/nisar'; +import { AsyncPipe } from '@angular/common'; +import { SceneFileComponent } from './scene-file/scene-file.component'; +import { MatIconButton } from '@angular/material/button'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import { DownloadFileButtonComponent } from '@components/shared/download-file-button/download-file-button.component'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { FileContentsComponent } from './file-contents/file-contents.component'; +import { ReadableSizeFromBytesPipe } from '@pipes/readable-size-from-bytes.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scene-files', templateUrl: './scene-files.component.html', styleUrls: ['./scene-files.component.scss'], - standalone: false, + imports: [ + MatList, + + SceneFileComponent, + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + MatSelectionList, + CdkVirtualForOf, + MatListOption, + MatIconButton, + MatMenuTrigger, + MatIcon, + DownloadFileButtonComponent, + OnDemandAddMenuComponent, + FileContentsComponent, + AsyncPipe, + ReadableSizeFromBytesPipe, + TranslateModule, + ], }) export class SceneFilesComponent implements OnInit, OnDestroy, AfterContentInit @@ -328,6 +365,20 @@ export class SceneFilesComponent this.store$.dispatch(new queueStore.AddJob(job)); } + public onRenameJobProjectName( + product: models.CMRProduct, + newProjectName: string, + ) { + const job = product.metadata.job; + this.hyp3.updateJobName$(job.job_id, newProjectName).subscribe((job) => { + const action = new scenesStore.UpdateProductWithNewProjectName({ + productId: product.id, + name: job.name, + }); + this.store$.dispatch(action); + }); + } + public formatProductName(product_name: string, desiredLen?: number) { const extrasWidthPx = 260; const charWidthPx = 10; diff --git a/src/app/components/results-menu/scene-files/scene-files.module.ts b/src/app/components/results-menu/scene-files/scene-files.module.ts deleted file mode 100644 index 8634d4c0b..000000000 --- a/src/app/components/results-menu/scene-files/scene-files.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { MatSharedModule } from '@shared'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { SceneFilesComponent } from './scene-files.component'; -import { SceneFileModule } from './scene-file'; -import { FileContentsModule } from './file-contents'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { FormsModule } from '@angular/forms'; -import { MatInputModule } from '@angular/material/input'; -import { MatButtonModule } from '@angular/material/button'; -import { MatMenuModule } from '@angular/material/menu'; -import { PipesModule } from '@pipes'; -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { OnDemandAddMenuModule } from '@components/shared/on-demand-add-menu'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { DownloadFileButtonModule } from '@components/shared/download-file-button/download-file-button.module'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SceneFilesComponent], - imports: [ - CommonModule, - MatSharedModule, - SceneFileModule, - FileContentsModule, - MatExpansionModule, - MatFormFieldModule, - FormsModule, - MatInputModule, - MatButtonModule, - MatMenuModule, - ScrollingModule, - PipesModule, - CopyToClipboardModule, - FontAwesomeModule, - OnDemandAddMenuModule, - MatButtonToggleModule, - DownloadFileButtonModule, - SharedModule, - ], - exports: [SceneFilesComponent], -}) -export class SceneFilesModule {} diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index b3832c2b2..07cb4584e 100644 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html +++ b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html @@ -1,7 +1,5 @@ - - +@if ((numberOfScenes$ | async) > 0 || (numSarviewsScenes$ | async) > 0) { + @if (breakpoint$ | async; as breakpoint) {
-
- {{ numberOfScenes$ | async }} {{ 'SCENE' | translate - }}{{ (numberOfScenes$ | async) === 1 ? '' : 's' }} - -
- @let virtualCount = totalVirtualProducts$ | async; - {{ (numberOfProducts$ | async) - virtualCount }} - @if (virtualCount > 0) { - ({{ virtualCount }} {{ 'ADDITIONAL' | translate }}) + @if ( + searchType === SearchTypes.DATASET || searchType === SearchTypes.LIST + ) { +
+ {{ numberOfScenes$ | async }} {{ 'SCENE' | translate + }}{{ (numberOfScenes$ | async) === 1 ? '' : 's' }} + @if (breakpoint > breakpoints.MOBILE) { + +
+ @let virtualCount = totalVirtualProducts$ | async; + {{ (numberOfProducts$ | async) - virtualCount }} + @if (virtualCount > 0) { + ({{ virtualCount }} {{ 'ADDITIONAL' | translate }}) + } + {{ 'OF' | translate }} + {{ formatNumber(totalResultCount$ | async) }} + {{ 'FILE' | translate + }}{{ (numberOfProducts$ | async) === 1 ? '' : 's' }} + } - {{ 'OF' | translate }} - {{ formatNumber(totalResultCount$ | async) }} - {{ 'FILE' | translate - }}{{ (numberOfProducts$ | async) === 1 ? '' : 's' }} - -
- -
- {{ numberOfFilteredEvents$ | async }} {{ 'EVENT' | translate - }}{{ (numSarviewsScenes$ | async) === 1 ? '' : 's' }} -
- -
- {{ numPairs$ | async }} {{ 'PAIR' | translate - }}{{ (numPairs$ | async) === 1 ? '' : 's' }} - info - + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { +
-
- ({{ sbasProducts.length }} {{ 'SCENE' | translate - }}{{ sbasProducts.length === 1 ? '' : 's' }}) - -
- -
- {{ numBaselineScenes$ | async }} {{ 'OF' | translate }} - {{ numUnfilteredBaselineScenes$ | async }} {{ 'SCENE' | translate - }}{{ (numBaselineScenes$ | async) === 1 ? '' : 's' }} -
- + {{ numberOfFilteredEvents$ | async }} {{ 'EVENT' | translate + }}{{ (numSarviewsScenes$ | async) === 1 ? '' : 's' }} +
+ } + @if (searchType === SearchTypes.SBAS) { +
+ {{ numPairs$ | async }} {{ 'PAIR' | translate + }}{{ (numPairs$ | async) === 1 ? '' : 's' }} + info + @if (!!sbasProducts && breakpoint > breakpoints.MEDIUM) { + +
+ ({{ sbasProducts.length }} {{ 'SCENE' | translate + }}{{ sbasProducts.length === 1 ? '' : 's' }}) + + } +
+ } + @if (searchType === SearchTypes.BASELINE) { +
+ {{ numBaselineScenes$ | async }} {{ 'OF' | translate }} + {{ numUnfilteredBaselineScenes$ | async }} {{ 'SCENE' | translate + }}{{ (numBaselineScenes$ | async) === 1 ? '' : 's' }} +
+ } @if (searchType === SearchTypes.CUSTOM_PRODUCTS) {
{{ numBaselineScenes$ | async }}{{ moreHyp3JobsToLoad ? '+' : '' }} @@ -87,662 +78,691 @@ }}{{ (numBaselineScenes$ | async) === 1 ? '' : 's' }}
} - -
- -
-
-
- -
-
-
- - -
+ } + @if (products) { +
+ @if (canHideRawData) { +
+
+ +
+
+
+ - remove_red_eye - - - + + + remove_red_eye + + + +
+
-
-
- -
-
- -
-
-
- - - +
+ +
+
+
+ - remove_red_eye - - - + + + remove_red_eye + + + +
+
-
-
- -
-
- -
-
-
- - - settings_overscan - - + } + @if (searchType !== SearchTypes.DISPLACEMENT) { +
+
+ +
+
+
+ + + + settings_overscan + + + +
+
-
-
- -
-
- -
-
-
- - - add_shopping_cart - - + ) { +
+
+ +
+
+
+ + + + add_shopping_cart + + + +
+
-
-
- -
-
- -
-
-
- - - add_shopping_cart - - + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { +
+
+ +
+
+
+ + + + add_shopping_cart + + + +
+
-
-
- -
-
- -
-
-
- - - - - - - -
-
-
- - @if (searchType === SearchTypes.CUSTOM_PRODUCTS) { -
-
- + ) { +
+
+ +
+
+
+ + + + + + +
+
-
-
- - +
+ +
+
+
+ - get_app - - + + get_app + + +
-
- - -
- + +
+ +
+ +
+
+ +
+
+
+ + + edit + + +
+
- - } -
-
- -
-
-
- - - get_app - - + +
+ +
+ + } + @if (searchType === SearchTypes.BASELINE) { +
+
+ +
+
+
+ + + get_app + + +
+
-
-
- -
-
- -
-
-
- - - get_app - - + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { +
+
+ +
+
+
+ + + get_app + + +
+
-
-
- -
-
- -
-
-
- - - - - - - - - - - - - - - - - + + + + + + + + @for (t of jobTypes; track t) { + + } + + + + + + + +
+
-
-
- -
-
- -
-
-
- - - - - + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { +
+
+ +
+
+
+ + + + + +
+
-
-
- -
-
- -
-
-
- - - get_app - - + } + @if (searchType === SearchTypes.SBAS) { +
+
+ +
+
+
+ + + get_app + + +
+
-
-
- - - - - + } + @if ( searchType === SearchTypes.SBAS && !(isBurstStack$ | async) - " - (click)="queueSBASProducts(sbasProducts)" - mat-menu-item - > - {{ 'ADD' | translate }} {{ sbasProducts.length }} - {{ 'FILE' | translate }}{{ sbasProducts.length === 1 ? '' : 's' }} - {{ 'TO_DOWNLOADS' | translate }} - - - + } + @if ( ((currentDatasetID$ | async) === 'SENTINEL-1 BURSTS' && searchType === SearchTypes.DATASET) || (isBurstStack$ | async) - " - mat-menu-item - [matMenuTriggerFor]="addAllBurstProducts" - [matMenuTriggerData]="{ - burstData: - searchType === SearchTypes.SBAS - ? (SBASburstDataProducts$ | async) - : (burstDataProducts$ | async), - burstMetadata: - searchType === SearchTypes.SBAS - ? (SBASburstMetadataProducts$ | async) - : (burstMetadataProducts$ | async), - }" - > - {{ isBurstStack$ | async }} - {{ - searchType !== SearchTypes.SBAS - ? downloadableProds.length - : (SBASBurstProductsLength$ | async) - }} - BURST {{ 'FILE' | translate - }}{{ downloadableProds.length === 1 ? '' : 's' }} - - - @let currentDatasetID = currentDatasetID$ | async; - @if ( - searchType === SearchTypes.DATASET && - (currentDatasetID === 'OPERA-S1' || - currentDatasetID === 'NISAR' || - currentDatasetID === 'SEASAT') - ) { - - } - - - - - + } + @let currentDatasetID = currentDatasetID$ | async; + @if ( + searchType === SearchTypes.DATASET && + (currentDatasetID === 'OPERA-S1' || + currentDatasetID === 'NISAR' || + currentDatasetID === 'SEASAT') + ) { + + } + + + + @for (item of productData | keyvalue; track item) { + + } + + + + - {{ 'ADD' | translate }} {{ item.value }} {{ item.key }} - {{ 'FILE' | translate }}{{ item.value === 1 ? '' : 's' }} - {{ 'TO_DOWNLOADS' | translate }} - - - - - - - + + + + + - - - - - - - - -
+ +
+ }
- -
- - - -
+ @if (products) { +
+ + + +
+ } - -
- - - -
+ @if (products) { +
+ + +
+ } - -
- -
+ @if (sarviewsEventProducts) { +
+ +
+ } - -
- - -
- - - -
-
- {{ 'METERS' | translate }} - unfold_more - keyboard_arrow_up - keyboard_arrow_down + +
-
- {{ 'DAYS' | translate }} - unfold_more - keyboard_arrow_up + @if (searchType === SearchTypes.BASELINE) { + @if (breakpoint > breakpoints.MOBILE) { +
+
- keyboard_arrow_downunfold_more + } + @if (perpendicularSort === SortDirection.INCREASING) { + keyboard_arrow_up + } + @if (perpendicularSort === SortDirection.DECREASING) { + keyboard_arrow_down + } +
+
+ {{ 'DAYS' | translate }} + @if (temporalSort === SortDirection.NONE) { + unfold_more + } + @if (temporalSort === SortDirection.INCREASING) { + keyboard_arrow_up + } + @if (temporalSort === SortDirection.DECREASING) { + keyboard_arrow_down + } +
+
-
-
- + } + }
- - + } +} diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.ts b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.ts index e0148df73..7ecc22dd7 100644 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.ts +++ b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.ts @@ -44,13 +44,56 @@ import { CodeExportComponent, CodeExportType, } from '@components/shared/code-export'; +import { + ProjectNameDialogComponent, + ProjectNameDialogData, + ProjectNameDialogResult, +} from '@components/shared/project-name-dialog'; import { MatDialog } from '@angular/material/dialog'; +import { + NgClass, + AsyncPipe, + TitleCasePipe, + KeyValuePipe, +} from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { + MatMenuTrigger, + MatMenu, + MatMenuItem, + MatMenuContent, +} from '@angular/material/menu'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scenes-list-header', templateUrl: './scenes-list-header.component.html', styleUrls: ['./scenes-list-header.component.scss'], - standalone: false, + imports: [ + NgClass, + MatIcon, + MatTooltip, + MatButtonToggleGroup, + MatButtonToggle, + MatMenuTrigger, + OnDemandAddMenuComponent, + MatMenu, + MatMenuItem, + MatMenuContent, + + FontAwesomeModule, + AsyncPipe, + TitleCasePipe, + KeyValuePipe, + TranslateModule, + ], }) export class ScenesListHeaderComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -640,6 +683,41 @@ export class ScenesListHeaderComponent implements OnInit, OnDestroy { }); } + public onBulkProjectNameUpdate(): void { + combineLatest([ + this.store$.select(hyp3Store.getHyp3User), + this.store$.select(hyp3Store.getOnDemandUserId), + ]) + .pipe(take(1)) + .subscribe(([hyp3User, filterUserId]) => { + const dialogRef = this.dialog.open< + ProjectNameDialogComponent, + ProjectNameDialogData, + ProjectNameDialogResult + >(ProjectNameDialogComponent, { + width: '400px', + data: { + currentName: '', + products: this.products, + loggedInUserId: hyp3User?.user_id, + filterUserId: filterUserId || undefined, + }, + }); + + dialogRef.afterClosed().subscribe((result) => { + if (result !== undefined) { + // Dialog handles the rename operation and shows progress + // We just need to update the filter and refresh search + this.store$.dispatch(new searchStore.ClearSearch()); + this.store$.dispatch( + new filtersStore.SetProjectName(result.newName), + ); + this.store$.dispatch(new searchStore.MakeSearch()); + } + }); + }); + } + ngOnDestroy(): void { this.subs.unsubscribe(); } diff --git a/src/app/components/results-menu/scenes-list-header/scenes-list-header.module.ts b/src/app/components/results-menu/scenes-list-header/scenes-list-header.module.ts deleted file mode 100644 index 32275a50b..000000000 --- a/src/app/components/results-menu/scenes-list-header/scenes-list-header.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; - -import { MatSharedModule } from '@shared'; -import { OnDemandAddMenuModule } from '@components/shared/on-demand-add-menu'; -import { ScenesListHeaderComponent } from './scenes-list-header.component'; -import { SharedModule } from '@shared'; -import { MatIconModule } from '@angular/material/icon'; - -@NgModule({ - declarations: [ScenesListHeaderComponent], - imports: [ - CommonModule, - MatMenuModule, - MatIconModule, - MatSharedModule, - MatButtonToggleModule, - FontAwesomeModule, - OnDemandAddMenuModule, - SharedModule, - ], - exports: [ScenesListHeaderComponent], -}) -export class ScenesListHeaderModule {} diff --git a/src/app/components/results-menu/scenes-list/pair/pair.component.html b/src/app/components/results-menu/scenes-list/pair/pair.component.html index 31a85482b..b6989ef1b 100644 --- a/src/app/components/results-menu/scenes-list/pair/pair.component.html +++ b/src/app/components/results-menu/scenes-list/pair/pair.component.html @@ -19,27 +19,29 @@
{{ pairPerpBaseline(pair) }}m
{{ pairTempBaseline(pair) }}d
- - + @if (hyp3able.total > 0) { + + + } - - + @if (hyp3able.total < 1) { + + + } diff --git a/src/app/components/results-menu/scenes-list/pair/pair.component.ts b/src/app/components/results-menu/scenes-list/pair/pair.component.ts index 1baae19d0..daf2c5b14 100644 --- a/src/app/components/results-menu/scenes-list/pair/pair.component.ts +++ b/src/app/components/results-menu/scenes-list/pair/pair.component.ts @@ -15,12 +15,34 @@ import * as scenesStore from '@store/scenes'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { + MatListItem, + MatListItemTitle, + MatListItemMeta, +} from '@angular/material/list'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-pair', templateUrl: './pair.component.html', styleUrls: ['./pair.component.scss'], - standalone: false, + imports: [ + MatListItem, + MatListItemTitle, + MatListItemMeta, + + MatIcon, + MatTooltip, + MatMenuTrigger, + OnDemandAddMenuComponent, + ShortDatePipe, + TranslateModule, + ], }) export class PairComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.html b/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.html index 019316af5..7479ce839 100644 --- a/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.html +++ b/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.html @@ -1,63 +1,65 @@ - + + settings_overscans + +
+ +} diff --git a/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.ts b/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.ts index 358bcdbb1..5c21404cb 100644 --- a/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.ts +++ b/src/app/components/results-menu/scenes-list/sarview-event/sarviews-event.component.ts @@ -12,12 +12,36 @@ import { MapService, ScreenSizeService } from '@services'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import moment from 'moment'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { + MatListItem, + MatListItemAvatar, + MatListItemTitle, + MatListItemLine, + MatListItemMeta, +} from '@angular/material/list'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-event', templateUrl: './sarviews-event.component.html', styleUrls: ['./sarviews-event.component.scss'], - standalone: false, + imports: [ + MatListItem, + NgClass, + MatListItemAvatar, + MatListItemTitle, + MatListItemLine, + MatListItemMeta, + MatIcon, + MatTooltip, + AsyncPipe, + ShortDatePipe, + TranslateModule, + ], }) export class SarviewsEventComponent { private mapService = inject(MapService); diff --git a/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.html b/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.html index 734d7481e..0d18ae0b9 100644 --- a/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.html +++ b/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.html @@ -22,35 +22,38 @@
- - - - - - {{ isQueued ? 'shopping_cart' : 'add_shopping_cart' }} - + @if ((hyp3ableByJobType?.total ?? 0) > 0) { + + + } + @if (hyp3ableByJobType.total < 1) { + + + } + @if (isDownloadable(scene)) { + + {{ isQueued ? 'shopping_cart' : 'add_shopping_cart' }} + + }
diff --git a/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.ts b/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.ts index 51cd69b6a..015d2e8ad 100644 --- a/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.ts +++ b/src/app/components/results-menu/scenes-list/scene/baseline-scene-controls/baseline-scene-controls.component.ts @@ -9,12 +9,28 @@ import { import * as services from '@services'; import * as models from '@models'; +import { NgClass } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { MatListItemMeta } from '@angular/material/list'; +import { MatTooltip } from '@angular/material/tooltip'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-baseline-scene-controls', templateUrl: './baseline-scene-controls.component.html', styleUrls: ['./baseline-scene-controls.component.scss'], - standalone: false, + imports: [ + NgClass, + + MatIcon, + MatMenuTrigger, + MatListItemMeta, + MatTooltip, + OnDemandAddMenuComponent, + TranslateModule, + ], }) export class BaselineSceneControlsComponent implements OnInit { private screenSize = inject(services.ScreenSizeService); diff --git a/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.html b/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.html index 87529d3e1..8e52e861e 100644 --- a/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.html +++ b/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.html @@ -1,69 +1,75 @@
- - settings_overscan - - - @if (!scene.isDummyProduct) { + @if (!!scene.metadata.polygon) { + settings_overscan } - - {{ isQueued ? 'shopping_cart' : 'add_shopping_cart' }} - -
- -
- {{ numQueued }} -
- -
@if (!scene.isDummyProduct) { + @if (!!hyp3ableByJobType && hyp3ableByJobType?.total > 0) { + + + } + } + + @if (isDownloadable(scene)) { + {{ isQueued ? 'shopping_cart' : 'add_shopping_cart' }} }
-
- - -
+ @if (isDownloadable(scene)) { +
+ {{ numQueued }} +
+ } + + @if (searchType === SearchTypes.CUSTOM_PRODUCTS) { +
+ @if (!scene.isDummyProduct) { + @if (isExpired(scene.metadata.job)) { + + + } + } +
+ } + + @if (!isDownloadable(scene)) { +
+ + +
+ }
-
- -
+ @if ( + searchType !== SearchTypes.BASELINE || breakpoint > breakpoints.SMALL + ) { +
+ +
+ }
- - - - + @if (hovered) { + + + } @else { - + }
@@ -78,53 +76,52 @@
@if (scene.metadata.job) { {{ scene.metadata.job.job_type }} -
+ @if ( + breakpoint === breakpoints.MOBILE && + searchType === SearchTypes.CUSTOM_PRODUCTS + ) { +
+ } - } @if (!scene.isDummyProduct) { - - {{ scene.metadata.opera.validityStartDate | fullDate }} - + @if ( + breakpoint > breakpoints.MOBILE && + searchType !== SearchTypes.BASELINE && + !!scene.metadata?.opera?.validityStartDate + ) { + + {{ scene.metadata.opera.validityStartDate | fullDate }} + + } - - {{ scene.metadata.date | fullDate }} - + @if ( + breakpoint > breakpoints.MOBILE && + searchType !== SearchTypes.BASELINE && + !scene.metadata?.opera?.validityStartDate + ) { + + {{ scene.metadata.date | fullDate }} + + } - - {{ scene.metadata.date | shortDate }} - + @if ( + breakpoint === breakpoints.MOBILE || + searchType === SearchTypes.BASELINE + ) { + + {{ scene.metadata.date | shortDate }} + + } + } + @if (scene.isDummyProduct) { + Loading... } - Loading...
- + @if (searchType !== SearchTypes.BASELINE) { - + } - + @if (searchType === SearchTypes.BASELINE) { - + }
diff --git a/src/app/components/results-menu/scenes-list/scene/scene.component.ts b/src/app/components/results-menu/scenes-list/scene/scene.component.ts index f23b8a864..0476e18b1 100644 --- a/src/app/components/results-menu/scenes-list/scene/scene.component.ts +++ b/src/app/components/results-menu/scenes-list/scene/scene.component.ts @@ -10,12 +10,36 @@ import { faCopy } from '@fortawesome/free-solid-svg-icons'; import * as services from '@services'; import * as models from '@models'; +import { MatListItem } from '@angular/material/list'; +import { NgStyle, NgClass } from '@angular/common'; +import { FileNameComponent } from '@components/shared/file-name/file-name.component'; +import { CopyToClipboardComponent } from '@components/shared/copy-to-clipboard/copy-to-clipboard.component'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { MatTooltip } from '@angular/material/tooltip'; +import { SceneControlsComponent } from './scene-controls/scene-controls.component'; +import { BaselineSceneControlsComponent } from './baseline-scene-controls/baseline-scene-controls.component'; +import { ShortDatePipe, FullDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scene', templateUrl: './scene.component.html', styleUrls: ['./scene.component.scss'], - standalone: false, + imports: [ + MatListItem, + NgStyle, + + NgClass, + FileNameComponent, + CopyToClipboardComponent, + FontAwesomeModule, + MatTooltip, + SceneControlsComponent, + BaselineSceneControlsComponent, + ShortDatePipe, + FullDatePipe, + TranslateModule, + ], }) export class SceneComponent implements OnInit { env = inject(services.EnvironmentService); diff --git a/src/app/components/results-menu/scenes-list/scene/scene.module.ts b/src/app/components/results-menu/scenes-list/scene/scene.module.ts deleted file mode 100644 index c5adf14b1..000000000 --- a/src/app/components/results-menu/scenes-list/scene/scene.module.ts +++ /dev/null @@ -1,41 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatMenuModule } from '@angular/material/menu'; - -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; - -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; - -import { SceneComponent } from './scene.component'; -import { SceneControlsComponent } from './scene-controls/scene-controls.component'; -import { BaselineSceneControlsComponent } from './baseline-scene-controls/baseline-scene-controls.component'; - -import { CopyToClipboardModule } from '@components/shared/copy-to-clipboard'; -import { FileNameModule } from '@components/shared/file-name'; -import { OnDemandAddMenuModule } from '@components/shared/on-demand-add-menu'; -import { Hyp3JobStatusBadgeModule } from '@components/shared/hyp3-job-status-badge'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ - SceneControlsComponent, - BaselineSceneControlsComponent, - SceneComponent, - ], - imports: [ - CommonModule, - MatMenuModule, - MatSharedModule, - - PipesModule, - FontAwesomeModule, - CopyToClipboardModule, - FileNameModule, - OnDemandAddMenuModule, - Hyp3JobStatusBadgeModule, - SharedModule, - ], - exports: [SceneComponent], -}) -export class SceneModule {} diff --git a/src/app/components/results-menu/scenes-list/scenes-list.component.html b/src/app/components/results-menu/scenes-list/scenes-list.component.html index f87652aeb..4795df26d 100644 --- a/src/app/components/results-menu/scenes-list/scenes-list.component.html +++ b/src/app/components/results-menu/scenes-list/scenes-list.component.html @@ -16,16 +16,14 @@ class="list-viewport h100" [itemSize]="searchType === SearchTypes.SBAS ? 48 : 58" > - - + @if (breakpoint$ | async; as breakpoint) { + @if ( + searchType === SearchTypes.DATASET || + searchType === SearchTypes.BASELINE || + searchType === SearchTypes.LIST || + searchType === SearchTypes.CUSTOM_PRODUCTS || + searchType === SearchTypes.DISPLACEMENT + ) {
@@ -45,21 +43,20 @@ >
- - - - - - + @if ( + searchType === SearchTypes.CUSTOM_PRODUCTS && + numberProductsInList < scenes?.length + ) { + + + } + } + @if (searchType === SearchTypes.SARVIEWS_EVENTS) { - - - + } + @if (searchType === SearchTypes.SBAS) { - - + } + } 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 b1c4082bf..9f3e5bf95 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 @@ -29,12 +29,22 @@ import * as scenesStore from '@store/scenes'; import * as queueStore from '@store/queue'; import * as hyp3Store from '@store/hyp3'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, +} from '@angular/cdk/scrolling'; import * as services from '@services'; import * as models from '@models'; import { CMRProduct, QueuedHyp3Job, SarviewsEvent } from '@models'; import { ActiveToast } from 'ngx-toastr'; +import { MatActionList, MatListItem } from '@angular/material/list'; +import { NgClass, AsyncPipe, SlicePipe } from '@angular/common'; +import { SceneComponent } from './scene/scene.component'; +import { MatButton } from '@angular/material/button'; +import { SarviewsEventComponent } from './sarview-event/sarviews-event.component'; +import { PairComponent } from './pair/pair.component'; const INFINITY = 2e10; @@ -43,7 +53,21 @@ const INFINITY = 2e10; templateUrl: './scenes-list.component.html', styleUrls: ['./scenes-list.component.scss'], encapsulation: ViewEncapsulation.None, - standalone: false, + imports: [ + MatActionList, + NgClass, + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + + CdkVirtualForOf, + SceneComponent, + MatListItem, + MatButton, + SarviewsEventComponent, + PairComponent, + AsyncPipe, + SlicePipe, + ], }) export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit diff --git a/src/app/components/results-menu/scenes-list/scenes-list.module.ts b/src/app/components/results-menu/scenes-list/scenes-list.module.ts deleted file mode 100644 index 1ba776d23..000000000 --- a/src/app/components/results-menu/scenes-list/scenes-list.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { ScrollingModule } from '@angular/cdk/scrolling'; - -import { TruncateModule } from '@yellowspot/ng-truncate'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; -import { MatBadgeModule } from '@angular/material/badge'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatMenuModule } from '@angular/material/menu'; - -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; - -import { OnDemandAddMenuModule } from '@components/shared/on-demand-add-menu'; - -import { ScenesListComponent } from './scenes-list.component'; -import { SceneModule } from './scene/scene.module'; -import { PairComponent } from './pair/pair.component'; -import { SarviewsEventComponent } from './sarview-event/sarviews-event.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ScenesListComponent, PairComponent, SarviewsEventComponent], - imports: [ - CommonModule, - ScrollingModule, - MatBadgeModule, - MatChipsModule, - TruncateModule, - FontAwesomeModule, - MatSharedModule, - MatMenuModule, - PipesModule, - OnDemandAddMenuModule, - SharedModule, - SceneModule, - ], - exports: [ScenesListComponent], -}) -export class ScenesListModule {} diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component.ts b/src/app/components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component.ts new file mode 100644 index 000000000..1d741fe9d --- /dev/null +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component.ts @@ -0,0 +1,67 @@ +import { Component, inject, OnDestroy, OnInit } from '@angular/core'; +import { MatButton } from '@angular/material/button'; +import { + MatDialogActions, + MatDialogClose, + MatDialogContent, + MatDialogRef, +} from '@angular/material/dialog'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; + +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { SubSink } from 'subsink'; +@Component({ + selector: 'app-disp-disclaimer-dialog', + template: ` +

+ {{ 'DISPLACEMENT_DATA_DISCLAIMER' | translate }} +

+ +

+ {{ 'DISPLACEMENT_DATA_DISCLAIMER_TEXT' | translate }} +

+ + + + + + + `, + styleUrls: ['./timeseries-results-menu.component.scss'], + imports: [ + MatDialogActions, + MatDialogContent, + MatButton, + MatDialogClose, + DocsModalComponent, + TranslateModule, + ], + standalone: true, +}) +export class DispDataDisclaimerComponent implements OnInit, OnDestroy { + dialogRef = inject>(MatDialogRef); + translate = inject(TranslateService); + subs = new SubSink(); + + public FAQText = 'OPEN_FAQ'; + + ngOnInit(): void { + this.subs.add( + this.translate + .get('OPEN_FAQ') + .subscribe((translatedText) => (this.FAQText = translatedText)), + ); + } + + ngOnDestroy(): void { + this.subs.unsubscribe(); + } +} diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html index a1025eb51..65b24fd1f 100644 --- a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html @@ -1,288 +1,270 @@ - - - - - - -
-
- - - {{ 'ALL_AOIS' | translate }} - - - - - -
    - @for (point of chartStates; track point.uuidSeries) { - @for ( - frame of point.frames; - track frame.uuid; - let count = $count, idx = $index - ) { - +@if (breakpoint > breakpoints.MOBILE) { + + + + + +
    +
    + + + {{ 'ALL_AOIS' | translate }} + + + + +
      + @for (point of chartStates; track point.uuidSeries) { + @for ( + frame of point.frames; + track frame.uuid; + let count = $count, idx = $index + ) { + @if (count > 1 && idx === 0) { + +
    • + + + +
      • +       + }
    • - + @if (frame.valid === true) { - -
      • - -
    • - @if (frame.valid === true) { - - } @else { -
      - @if (frame.valid === false) { + } @else { +
      + @if (frame.valid === false) { + block + } @else { + + } block{{ point.drawMode | aoiIcon }} - } @else { - - } - {{ point.drawMode | aoiIcon }} + + +
      + + } +
      • + +
      + + {{ point.drawMode | aoiIcon }} + + +
      - - } - - - -
      - - {{ point.drawMode | aoiIcon }} - - - - - - - -
      -       - - - - - {{ point.drawMode | aoiIcon }} - - - - + delete + + } + + + + @if (point.seriesName.toLowerCase().trim() === 'series') { + {{ 'SERIES' | translate }} + } @else { + {{ point.seriesName }} + } - - - - - - - {{ 'SERIES' | translate }} - - - {{ point.seriesName }} + {{ point.seriesNumber }} - {{ point.seriesNumber }} - - - - - {{ 'SERIES' | translate }} {{ point.seriesNumber }} -
      - {{ 'FRAME' | translate }}: {{ point.frames[0].number }} -
      - .{{ idx + 1 }} -       - - {{ point.seriesName }} - {{ point.seriesNumber - }}.{{ idx + 1 }} + + + @if (point.seriesName.toLowerCase().trim() === 'series') { + {{ 'SERIES' | translate }} {{ point.seriesNumber }} + @if (point.frames[0].number !== '') { +
      + {{ 'FRAME' | translate }}: + {{ point.frames[0].number }} +
      + } + @if ((point.frames | keyvalue).length > 1) { + .{{ idx + 1 }} + } + } @else { + {{ point.seriesName }} + {{ point.seriesNumber }} + @if ((point.frames | keyvalue).length > 1) { + .{{ idx + 1 }} + } + } +       -       + } } - } -
    -     -
    -
    -     - - -
    - -
    - - +     +
+
+ + -
- -
- - - - {{ isJobFilterOptionsOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} - + {{ isJobFilterOptionsOpen ? 'arrow_drop_up' : 'arrow_drop_down' }} + + } - -
- -
- + @for (fileName of filteredOptions | async; track fileName) { + +
+ +
+ + }
- - - {{ 'OPTIONS' | translate }} - - - - - - - - - + @if (isJobFilterOptionsOpen) { + + + {{ 'OPTIONS' | translate }} + + + + + + + + + + }
diff --git a/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.component.ts b/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.component.ts index e3b200435..e13248e20 100644 --- a/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.component.ts +++ b/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.component.ts @@ -12,19 +12,58 @@ import * as filtersStore from '@store/filters'; import { AppState } from '@store'; import { Store } from '@ngrx/store'; import { debounceTime, map } from 'rxjs/operators'; -import { UntypedFormControl } from '@angular/forms'; +import { + UntypedFormControl, + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; import { ScenesService, ScreenSizeService } from '@services'; import { getScenes } from '@store/scenes'; import { combineLatest } from 'rxjs'; import { Breakpoints, menuAnimation } from '@models'; -import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { + MatAutocompleteSelectedEvent, + MatAutocompleteTrigger, + MatAutocomplete, +} from '@angular/material/autocomplete'; +import { + MatFormField, + MatLabel, + MatInput, + MatSuffix, +} from '@angular/material/input'; +import { AsyncPipe } from '@angular/common'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatOption } from '@angular/material/select'; +import { MatCard, MatCardHeader, MatCardContent } from '@angular/material/card'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-job-product-name-selector', templateUrl: './job-product-name-selector.component.html', styleUrls: ['./job-product-name-selector.component.scss'], animations: menuAnimation, - standalone: false, + imports: [ + FormsModule, + MatFormField, + MatLabel, + + MatInput, + MatAutocompleteTrigger, + ReactiveFormsModule, + MatTooltip, + MatIcon, + MatSuffix, + MatAutocomplete, + + MatOption, + MatCard, + MatCardHeader, + MatCardContent, + AsyncPipe, + TranslateModule, + ], }) export class JobProductNameSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.module.ts b/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.module.ts deleted file mode 100644 index c92557095..000000000 --- a/src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { BrowserAnimationsModule } from '@angular/platform-browser/animations'; -import { CommonModule } from '@angular/common'; -import { MatInputModule } from '@angular/material/input'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatIconModule } from '@angular/material/icon'; -import { MatCardModule } from '@angular/material/card'; -import { JobProductNameSelectorComponent } from './job-product-name-selector.component'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [JobProductNameSelectorComponent], - imports: [ - BrowserAnimationsModule, - CommonModule, - MatAutocompleteModule, - MatCardModule, - MatInputModule, - MatIconModule, - MatTooltipModule, - ReactiveFormsModule, - FormsModule, - SharedModule, - ], - exports: [JobProductNameSelectorComponent], -}) -export class JobProductNameSelectorModule {} diff --git a/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.html b/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.html index 2dd23f8ea..9366c907b 100644 --- a/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.html +++ b/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.html @@ -5,8 +5,10 @@ placeholder="{{ 'JOB_STATUS' | translate }}" multiple > - - {{ upperCaseFirst(jobStatus | translate, true) }} - + @for (jobStatus of jobStatuses; track jobStatus) { + + {{ upperCaseFirst(jobStatus | translate, true) }} + + } diff --git a/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.ts b/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.ts index 69a8ea94d..de3179418 100644 --- a/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.ts +++ b/src/app/components/shared/selectors/job-status-selector/job-status-selector.component.ts @@ -6,12 +6,17 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; import { SubSink } from 'subsink'; +import { MatFormField } from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; +import {} from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-job-status-selector', templateUrl: './job-status-selector.component.html', styleUrls: ['./job-status-selector.component.scss'], - standalone: false, + imports: [MatFormField, MatSelect, FormsModule, MatOption, TranslateModule], }) export class JobStatusSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/job-status-selector/job-status-selector.module.ts b/src/app/components/shared/selectors/job-status-selector/job-status-selector.module.ts deleted file mode 100644 index 020f62df0..000000000 --- a/src/app/components/shared/selectors/job-status-selector/job-status-selector.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSharedModule } from '@shared'; -import { MatSelectModule } from '@angular/material/select'; - -import { JobStatusSelectorComponent } from './job-status-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [JobStatusSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSharedModule, - MatSelectModule, - SharedModule, - ], - exports: [JobStatusSelectorComponent], -}) -export class JobStatusSelectorModule {} diff --git a/src/app/components/shared/selectors/language-selector/language-selector.component.html b/src/app/components/shared/selectors/language-selector/language-selector.component.html index 026e4727f..675cd661b 100644 --- a/src/app/components/shared/selectors/language-selector/language-selector.component.html +++ b/src/app/components/shared/selectors/language-selector/language-selector.component.html @@ -19,9 +19,9 @@ - + @for (lang of language.translate.getLangs(); track lang) { - + } diff --git a/src/app/components/shared/selectors/language-selector/language-selector.component.ts b/src/app/components/shared/selectors/language-selector/language-selector.component.ts index 2b7e73555..e268a61d3 100644 --- a/src/app/components/shared/selectors/language-selector/language-selector.component.ts +++ b/src/app/components/shared/selectors/language-selector/language-selector.component.ts @@ -5,12 +5,16 @@ import '@formatjs/intl-displaynames/locale-data/es'; import { Component, Input, OnInit, inject } from '@angular/core'; import { TranslateService } from '@ngx-translate/core'; import { AsfLanguageService } from '@services/asf-language.service'; +import { MatMiniFabButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import {} from '@angular/common'; @Component({ selector: 'app-language-selector', templateUrl: './language-selector.component.html', styleUrls: ['./language-selector.component.scss'], - standalone: false, + imports: [MatMiniFabButton, MatMenuTrigger, MatIcon, MatMenu, MatMenuItem], }) export class LanguageSelectorComponent implements OnInit { translate = inject(TranslateService); diff --git a/src/app/components/shared/selectors/language-selector/language-selector.module.ts b/src/app/components/shared/selectors/language-selector/language-selector.module.ts deleted file mode 100644 index 608ef441b..000000000 --- a/src/app/components/shared/selectors/language-selector/language-selector.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { LanguageSelectorComponent } from './language-selector.component'; -import { MatSharedModule, SharedModule } from '@shared'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatSelectModule } from '@angular/material/select'; -import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; - -@NgModule({ - declarations: [LanguageSelectorComponent], - imports: [ - CommonModule, - SharedModule, - MatFormFieldModule, - MatSelectModule, - MatIconModule, - MatSharedModule, - MatMenuModule, - ], - exports: [LanguageSelectorComponent], -}) -export class LanguageSelectorModule {} diff --git a/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.component.ts b/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.component.ts index 814939849..f663f2a11 100644 --- a/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.component.ts +++ b/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.component.ts @@ -9,11 +9,14 @@ import * as filtersStore from '@store/filters'; import { getSearchType } from '@store/search'; import { SearchType } from '@models'; import { beta } from '@models'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-master-scene-selector', templateUrl: './master-scene-selector.component.html', styleUrls: ['./master-scene-selector.component.css'], - standalone: false, + imports: [FormsModule, MatFormField, MatLabel, MatInput, TranslateModule], }) export class MasterSceneSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.module.ts b/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.module.ts deleted file mode 100644 index eee5389d5..000000000 --- a/src/app/components/shared/selectors/master-scene-selector/master-scene-selector.module.ts +++ /dev/null @@ -1,25 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatInputModule } from '@angular/material/input'; -import { FormsModule } from '@angular/forms'; - -import { MatSharedModule } from '@shared'; -import { MasterSceneSelectorComponent } from './master-scene-selector.component'; -import { SharedModule } from '@shared'; -import { DatasetSelectorModule } from '../dataset-selector'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; - -@NgModule({ - declarations: [MasterSceneSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatInputModule, - MatSharedModule, - SharedModule, - DatasetSelectorModule, - MatSlideToggleModule, - ], - exports: [MasterSceneSelectorComponent], -}) -export class MasterSceneSelectorModule {} diff --git a/src/app/components/shared/selectors/mission-selector/index.ts b/src/app/components/shared/selectors/mission-selector/index.ts index 49d4754a1..6e2417a2a 100644 --- a/src/app/components/shared/selectors/mission-selector/index.ts +++ b/src/app/components/shared/selectors/mission-selector/index.ts @@ -1,2 +1 @@ -export * from './mission-selector.module'; export * from './mission-selector.component'; diff --git a/src/app/components/shared/selectors/mission-selector/mission-selector.component.html b/src/app/components/shared/selectors/mission-selector/mission-selector.component.html index 05778ad22..b3f795e6b 100644 --- a/src/app/components/shared/selectors/mission-selector/mission-selector.component.html +++ b/src/app/components/shared/selectors/mission-selector/mission-selector.component.html @@ -3,13 +3,13 @@ - +@if (!!selectedMission) {
@@ -24,14 +24,14 @@ style="margin-right: 10px" class="clickable v-mid" mat-list-icon - matTooltip="Clear selected mission" + matTooltip="{{ 'CLEAR_SELECTED_MISSION' | translate }}" >{{ 'CLEAR' | translate }}
- +} { selector: 'app-mission-selector', templateUrl: './mission-selector.component.html', styleUrls: ['./mission-selector.component.css'], - standalone: false, + imports: [ + FormsModule, + ReactiveFormsModule, + MatFormField, + MatInput, + + MatIcon, + MatTooltip, + MatDivider, + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + MatNavList, + CdkVirtualForOf, + MatListItem, + TranslateModule, + ], }) export class MissionSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/mission-selector/mission-selector.module.ts b/src/app/components/shared/selectors/mission-selector/mission-selector.module.ts deleted file mode 100644 index 739d8834e..000000000 --- a/src/app/components/shared/selectors/mission-selector/mission-selector.module.ts +++ /dev/null @@ -1,43 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { MatSharedModule } from '@shared'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatChipsModule } from '@angular/material/chips'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatPaginatorModule } from '@angular/material/paginator'; -import { SharedModule } from '@shared'; - -import { MissionSelectorComponent } from './mission-selector.component'; - -@NgModule({ - declarations: [MissionSelectorComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - ScrollingModule, - - MatDividerModule, - MatChipsModule, - MatCheckboxModule, - MatFormFieldModule, - MatButtonToggleModule, - MatAutocompleteModule, - MatListModule, - MatInputModule, - MatPaginatorModule, - - MatSharedModule, - SharedModule, - ], - exports: [MissionSelectorComponent], -}) -export class MissionSelectorModule {} diff --git a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.html b/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.html index b20d2d0e9..50a8e1d32 100644 --- a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.html +++ b/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.html @@ -14,20 +14,26 @@ {{ polarizations | join: ' ' }} - - {{ pol }} -   {{ pol | polarizationCount }} - + @for (pol of dataset.polarizations; track pol) { + + {{ pol }} +   {{ pol | polarizationCount }} + + } - - {{ polarizations?.length || 0 }}/{{ dataset.polarizations.length }} - {{ 'POLARIZATIONS_SELECTED' | translate }} - - - {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.POLARIZATION)) { + + {{ polarizations?.length || 0 }}/{{ dataset.polarizations.length }} + {{ 'POLARIZATIONS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.POLARIZATION)) { + + {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} + + } @@ -44,20 +50,26 @@ {{ sidePolarizations | join: ' ' }} - - {{ pol }} -   {{ pol | polarizationCount }} - + @for (pol of dataset.sidepolarizations; track pol) { + + {{ pol }} +   {{ pol | polarizationCount }} + + } - - {{ sidePolarizations?.length || 0 }}/{{ dataset.polarizations.length }} - {{ 'POLARIZATIONS_SELECTED' | translate }} - - - {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.POLARIZATION)) { + + {{ sidePolarizations?.length || 0 }}/{{ dataset.polarizations.length }} + {{ 'POLARIZATIONS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.POLARIZATION)) { + + {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} + + } @@ -68,44 +80,54 @@ placeholder="{{ 'DIRECTION' | translate }}" multiple > - - {{ direction.toUpperCase() | translate }} - + @for (direction of flightDirectionTypes; track direction) { + + {{ direction.toUpperCase() | translate }} + + } - - {{ flightDirections?.length || 0 }}/{{ flightDirectionTypes.length }} - {{ 'FLIGHT_DIRECTIONS_SELECTED' | translate }} - - - {{ 'NO_FLIGHT_DIRECTIONS_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.FLIGHT_DIRECTION)) { + + {{ flightDirections?.length || 0 }}/{{ flightDirectionTypes.length }} + {{ 'FLIGHT_DIRECTIONS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.FLIGHT_DIRECTION)) { + + {{ 'NO_FLIGHT_DIRECTIONS_TO_SELECT' | translate }} + + } - - - - {{ subtype.apiValue }} - - - - - {{ subtypes?.length || 0 }}/{{ dataset.subtypes?.length }} - {{ 'SUBTYPES_SELECTED' | translate }} - - - {{ 'NO_SUBTYPES_TO_SELECT' | translate }} - - + @if (prop.isRelevant(p.SUBTYPE)) { + + + @for (subtype of dataset.subtypes; track subtype) { + + {{ subtype.apiValue }} + + } + + @if (prop.isRelevant(p.SUBTYPE)) { + + {{ subtypes?.length || 0 }}/{{ dataset.subtypes?.length }} + {{ 'SUBTYPES_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.SUBTYPE)) { + + {{ 'NO_SUBTYPES_TO_SELECT' | translate }} + + } + + } - - {{ instrument.displayName }} - + @for (instrument of dataset.instruments; track instrument) { + + {{ instrument.displayName }} + + } - - {{ instruments?.length || 0 }}/{{ dataset.instruments.length }} - {{ 'INSTRUMENTS_SELECTED' | translate }} - - - {{ 'NO_INSTRUMENTS_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.INSTRUMENT)) { + + {{ instruments?.length || 0 }}/{{ dataset.instruments.length }} + {{ 'INSTRUMENTS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.INSTRUMENT)) { + + {{ 'NO_INSTRUMENTS_TO_SELECT' | translate }} + + } @@ -147,13 +172,17 @@ - - {{ frameCoverage?.length || 0 }}/2 - {{ 'FRAMES_SELECTED' | translate }} - - - {{ 'NO_FRAMES_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.FRAME)) { + + {{ frameCoverage?.length || 0 }}/2 + {{ 'FRAMES_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.FRAME)) { + + {{ 'NO_FRAMES_TO_SELECT' | translate }} + + } @@ -172,13 +201,17 @@ } - - {{ rangeBandwidth?.length || 0 }}/{{ totalBandwithCount }} - {{ 'RANGE_BANDWITH_SELECTED' | translate }} - - - {{ 'NO_BANDWITH_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.RANGE_BANDWIDTH)) { + + {{ rangeBandwidth?.length || 0 }}/{{ totalBandwithCount }} + {{ 'RANGE_BANDWITH_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.RANGE_BANDWIDTH)) { + + {{ 'NO_BANDWITH_TO_SELECT' | translate }} + + } + class="short-name-selector" + (shortNamesChange)="onNewShortNames($event)" + *ngIf="dataset.id === 'NISAR'"> -->
diff --git a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.ts b/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.ts index 84218597e..779dbff3b 100644 --- a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.ts +++ b/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.component.ts @@ -8,11 +8,39 @@ import * as filtersStore from '@store/filters'; import { PropertyService } from '@services'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { MatFormField, MatHint } from '@angular/material/input'; +import { + MatSelect, + MatSelectTrigger, + MatOption, +} from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; +import { KeyValuePipe } from '@angular/common'; +import { MatSlideToggle } from '@angular/material/slide-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; +import { JoinPipe } from '@pipes/join.pipe'; +import { PolarizationCountPipe } from '@pipes/polarization.pipe'; @Component({ selector: 'app-observation-panel-selector', templateUrl: './observation-panel-selector.component.html', styleUrl: './observation-panel-selector.component.scss', - standalone: false, + imports: [ + MatFormField, + MatSelect, + FormsModule, + MatSelectTrigger, + + MatOption, + + MatHint, + MatSlideToggle, + MatTooltip, + KeyValuePipe, + TranslateModule, + JoinPipe, + PolarizationCountPipe, + ], }) export class ObservationPanelSelectorComponent implements OnDestroy, OnInit { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.module.ts b/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.module.ts deleted file mode 100644 index a58a5b7c1..000000000 --- a/src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.module.ts +++ /dev/null @@ -1,39 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; - -import { ProductTypeSelectorModule } from '@components/shared/selectors/product-type-selector'; -import { ShortNameSelectorModule } from '@components/shared/selectors/short-name-selector'; - -import { ObservationPanelSelectorComponent } from './observation-panel-selector.component'; -import { BurstSelectorModule } from '../burst-selector'; -import { SharedModule } from '@shared'; -import { MatInputModule } from '@angular/material/input'; -import { OperaCalibrationDataSelectorModule } from '../opera-calibration-data-selector'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { PipesModule } from '@pipes'; - -@NgModule({ - declarations: [ObservationPanelSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSelectModule, - MatButtonToggleModule, - MatSharedModule, - MatSlideToggleModule, - ProductTypeSelectorModule, - ShortNameSelectorModule, - BurstSelectorModule, - SharedModule, - MatInputModule, - OperaCalibrationDataSelectorModule, - PipesModule, - ], - exports: [ObservationPanelSelectorComponent], -}) -export class ObservationPanelSelectorModule {} diff --git a/src/app/components/shared/selectors/on-demand-user-selector/index.ts b/src/app/components/shared/selectors/on-demand-user-selector/index.ts index 34cd7bd24..51f7c5c40 100644 --- a/src/app/components/shared/selectors/on-demand-user-selector/index.ts +++ b/src/app/components/shared/selectors/on-demand-user-selector/index.ts @@ -1,2 +1 @@ -export * from './on-demand-user-selector.module'; export * from './on-demand-user-selector.component'; diff --git a/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.component.ts b/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.component.ts index 6d853ac76..42cbd9834 100644 --- a/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.component.ts +++ b/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.component.ts @@ -4,12 +4,15 @@ import { SubSink } from 'subsink'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as hyp3Store from '@store/hyp3'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-on-demand-user-selector', templateUrl: './on-demand-user-selector.component.html', styleUrls: ['./on-demand-user-selector.component.scss'], - standalone: false, + imports: [MatFormField, MatInput, FormsModule, TranslateModule], }) export class OnDemandUserSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.module.ts b/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.module.ts deleted file mode 100644 index 0c669e9f6..000000000 --- a/src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { TranslateModule } from '@ngx-translate/core'; -import { MatInputModule } from '@angular/material/input'; - -import { MatSharedModule } from '@shared'; - -import { OnDemandUserSelectorComponent } from './on-demand-user-selector.component'; - -@NgModule({ - declarations: [OnDemandUserSelectorComponent], - imports: [ - CommonModule, - MatSharedModule, - MatInputModule, - FormsModule, - TranslateModule, - ], - exports: [OnDemandUserSelectorComponent], -}) -export class OnDemandUserSelectorModule {} diff --git a/src/app/components/shared/selectors/opera-calibration-data-selector/index.ts b/src/app/components/shared/selectors/opera-calibration-data-selector/index.ts index e1d1ef1a0..f143cb1f0 100644 --- a/src/app/components/shared/selectors/opera-calibration-data-selector/index.ts +++ b/src/app/components/shared/selectors/opera-calibration-data-selector/index.ts @@ -1,2 +1 @@ -export * from './opera-calibration-data-selector.module'; export * from './opera-calibration-data-selector.component'; diff --git a/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.component.ts b/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.component.ts index 2dfa1c095..7855c81fe 100644 --- a/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.component.ts +++ b/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.component.ts @@ -3,13 +3,18 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SubSink } from 'subsink'; import * as filterStore from '@store/filters'; -import { MatRadioChange } from '@angular/material/radio'; +import { + MatRadioChange, + MatRadioGroup, + MatRadioButton, +} from '@angular/material/radio'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-opera-calibration-data-selector', templateUrl: './opera-calibration-data-selector.component.html', styleUrls: ['./opera-calibration-data-selector.component.scss'], - standalone: false, + imports: [MatRadioGroup, MatRadioButton, TranslateModule], }) export class OperaCalibrationDataSelectorComponent implements OnInit, OnDestroy diff --git a/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.module.ts b/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.module.ts deleted file mode 100644 index e3dff4afa..000000000 --- a/src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { OperaCalibrationDataSelectorComponent } from './opera-calibration-data-selector.component'; -import { MatRadioModule } from '@angular/material/radio'; -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - declarations: [OperaCalibrationDataSelectorComponent], - imports: [CommonModule, MatRadioModule, TranslateModule], - exports: [OperaCalibrationDataSelectorComponent], -}) -export class OperaCalibrationDataSelectorModule {} diff --git a/src/app/components/shared/selectors/opera-s1-selector/index.ts b/src/app/components/shared/selectors/opera-s1-selector/index.ts index 01e2d818e..532b4d42e 100644 --- a/src/app/components/shared/selectors/opera-s1-selector/index.ts +++ b/src/app/components/shared/selectors/opera-s1-selector/index.ts @@ -1,2 +1 @@ -export * from './opera-s1-selector.module'; export * from './opera-s1-selector.component'; diff --git a/src/app/components/shared/selectors/opera-s1-selector/opera-burst-id-selector/opera-burst-id-selector.component.ts b/src/app/components/shared/selectors/opera-s1-selector/opera-burst-id-selector/opera-burst-id-selector.component.ts index 94dab2955..77bf70a06 100644 --- a/src/app/components/shared/selectors/opera-s1-selector/opera-burst-id-selector/opera-burst-id-selector.component.ts +++ b/src/app/components/shared/selectors/opera-s1-selector/opera-burst-id-selector/opera-burst-id-selector.component.ts @@ -11,11 +11,13 @@ import { SubSink } from 'subsink'; import * as filtersStore from '@store/filters'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-opera-burst-id-selector', templateUrl: './opera-burst-id-selector.component.html', styleUrls: ['./opera-burst-id-selector.component.scss'], - standalone: false, + imports: [MatFormField, MatLabel, MatInput, TranslateModule], }) export class OperaBurstIdSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.component.ts b/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.component.ts index 116434539..138d099fa 100644 --- a/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.component.ts +++ b/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; +import { OperaBurstIdSelectorComponent } from './opera-burst-id-selector/opera-burst-id-selector.component'; @Component({ selector: 'app-opera-s1-selector', templateUrl: './opera-s1-selector.component.html', styleUrls: ['./opera-s1-selector.component.scss'], - standalone: false, + imports: [OperaBurstIdSelectorComponent], }) export class OperaS1SelectorComponent {} diff --git a/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.module.ts b/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.module.ts deleted file mode 100644 index 2b4faa7c1..000000000 --- a/src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { OperaBurstIdSelectorComponent } from './opera-burst-id-selector/opera-burst-id-selector.component'; -import { OperaS1SelectorComponent } from './opera-s1-selector.component'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { FormsModule } from '@angular/forms'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatInputModule } from '@angular/material/input'; -import { MatSharedModule, SharedModule } from '@shared'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; - -@NgModule({ - declarations: [OperaS1SelectorComponent, OperaBurstIdSelectorComponent], - imports: [ - CommonModule, - MatFormFieldModule, - MatExpansionModule, - MatInputModule, - FormsModule, - MatSharedModule, - SharedModule, - MatSlideToggleModule, - ], - exports: [OperaS1SelectorComponent, OperaBurstIdSelectorComponent], -}) -export class OperaS1SelectorModule {} diff --git a/src/app/components/shared/selectors/other-selector/index.ts b/src/app/components/shared/selectors/other-selector/index.ts index 752b969d5..67cce7557 100644 --- a/src/app/components/shared/selectors/other-selector/index.ts +++ b/src/app/components/shared/selectors/other-selector/index.ts @@ -1,2 +1 @@ export * from './other-selector.component'; -export * from './other-selector.module'; diff --git a/src/app/components/shared/selectors/other-selector/other-selector.component.html b/src/app/components/shared/selectors/other-selector/other-selector.component.html index 0a0c4a1b7..a80d4f0ce 100644 --- a/src/app/components/shared/selectors/other-selector/other-selector.component.html +++ b/src/app/components/shared/selectors/other-selector/other-selector.component.html @@ -1,32 +1,40 @@
- - - - - - - {{ mode }} - - - - {{ beamModes?.length || 0 }}/{{ dataset.beamModes.length }} - {{ 'BEAM_MODES_SELECTED' | translate }} - + + } - - {{ 'NO_BEAM_MODES_TO_SELECT' | translate }} - - + @if (prop.isRelevant(p.BEAM_MODE)) { + + + @for (mode of dataset.beamModes; track mode) { + + {{ mode }} + + } + + @if (prop.isRelevant(p.BEAM_MODE)) { + + {{ beamModes?.length || 0 }}/{{ dataset.beamModes.length }} + {{ 'BEAM_MODES_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.BEAM_MODE)) { + + {{ 'NO_BEAM_MODES_TO_SELECT' | translate }} + + } + + } - - {{ pol }} - + @for (pol of dataset.polarizations; track pol) { + + {{ pol }} + + } - - {{ polarizations?.length || 0 }}/{{ dataset.polarizations.length }} - {{ 'POLARIZATIONS_SELECTED' | translate }} - - - {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.POLARIZATION)) { + + {{ polarizations?.length || 0 }}/{{ dataset.polarizations.length }} + {{ 'POLARIZATIONS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.POLARIZATION)) { + + {{ 'NO_POLARIZATIONS_TO_SELECT' | translate }} + + } @@ -57,70 +71,80 @@ placeholder="{{ 'DIRECTION' | translate }}" multiple > - - {{ direction.toUpperCase() | translate }} - - - - - {{ flightDirections?.length || 0 }}/{{ flightDirectionTypes.length }} - {{ 'FLIGHT_DIRECTIONS_SELECTED' | translate }} - - - {{ 'NO_FLIGHT_DIRECTIONS_TO_SELECT' | translate }} - - - - - - - {{ subtype.apiValue }} - + @for (direction of flightDirectionTypes; track direction) { + + {{ direction.toUpperCase() | translate }} + + } - - {{ subtypes?.length || 0 }}/{{ dataset.subtypes?.length }} - {{ 'SUBTYPES_SELECTED' | translate }} - - - {{ 'NO_SUBTYPES_TO_SELECT' | translate }} - + @if (prop.isRelevant(p.FLIGHT_DIRECTION)) { + + {{ flightDirections?.length || 0 }}/{{ flightDirectionTypes.length }} + {{ 'FLIGHT_DIRECTIONS_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.FLIGHT_DIRECTION)) { + + {{ 'NO_FLIGHT_DIRECTIONS_TO_SELECT' | translate }} + + } - - + @if (prop.isRelevant(p.SUBTYPE)) { + + + @for (subtype of dataset.subtypes; track subtype) { + + {{ subtype.apiValue }} + + } + + @if (prop.isRelevant(p.SUBTYPE)) { + + {{ subtypes?.length || 0 }}/{{ dataset.subtypes?.length }} + {{ 'SUBTYPES_SELECTED' | translate }} + + } + @if (!prop.isRelevant(p.SUBTYPE)) { + + {{ 'NO_SUBTYPES_TO_SELECT' | translate }} + + } + + } - - + + } - + @if (dataset.id === 'NISAR') { + + }
diff --git a/src/app/components/shared/selectors/other-selector/other-selector.component.ts b/src/app/components/shared/selectors/other-selector/other-selector.component.ts index 60bd6ef2a..51bfce092 100644 --- a/src/app/components/shared/selectors/other-selector/other-selector.component.ts +++ b/src/app/components/shared/selectors/other-selector/other-selector.component.ts @@ -8,12 +8,29 @@ import * as filtersStore from '@store/filters'; import { PropertyService } from '@services'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { ProductTypeSelectorComponent } from '../product-type-selector/product-type-selector.component'; +import { MatFormField, MatHint, MatInput } from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; +import { ShortNameSelectorComponent } from '../short-name-selector/short-name-selector.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-other-selector', templateUrl: './other-selector.component.html', styleUrls: ['./other-selector.component.scss'], - standalone: false, + imports: [ + ProductTypeSelectorComponent, + MatFormField, + MatSelect, + FormsModule, + + MatOption, + MatHint, + MatInput, + ShortNameSelectorComponent, + TranslateModule, + ], }) export class OtherSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/other-selector/other-selector.module.ts b/src/app/components/shared/selectors/other-selector/other-selector.module.ts deleted file mode 100644 index c510f3619..000000000 --- a/src/app/components/shared/selectors/other-selector/other-selector.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; - -import { ProductTypeSelectorModule } from '@components/shared/selectors/product-type-selector'; -import { ShortNameSelectorModule } from '@components/shared/selectors/short-name-selector'; - -import { OtherSelectorComponent } from './other-selector.component'; -import { BurstSelectorModule } from '../burst-selector'; -import { SharedModule } from '@shared'; -import { MatInputModule } from '@angular/material/input'; -import { OperaCalibrationDataSelectorModule } from '../opera-calibration-data-selector'; - -@NgModule({ - declarations: [OtherSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSelectModule, - MatButtonToggleModule, - MatSharedModule, - ProductTypeSelectorModule, - ShortNameSelectorModule, - BurstSelectorModule, - SharedModule, - MatInputModule, - OperaCalibrationDataSelectorModule, - ], - exports: [OtherSelectorComponent], -}) -export class OtherSelectorModule {} diff --git a/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.html b/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.html index d808dc50c..fc1939274 100644 --- a/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.html +++ b/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.html @@ -1,17 +1,17 @@ - +@if (!!polygon && (searchType$ | async) !== searchTypes.SARVIEWS_EVENTS) { + +} - +@if (!!savedPolygon) { + +} diff --git a/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.ts b/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.ts index f14076a8e..ae243b623 100644 --- a/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.ts +++ b/src/app/components/shared/selectors/path-selector/aoi-clear/aoi-clear.component.ts @@ -10,12 +10,16 @@ import * as filtersStore from '@store/filters'; import { MapService, WktService } from '@services'; import { getSearchType } from '@store/search'; import { SearchType } from '@models'; +import { AsyncPipe } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-aoi-clear', templateUrl: './aoi-clear.component.html', styleUrls: ['./aoi-clear.component.scss'], - standalone: false, + imports: [MatButton, MatIcon, AsyncPipe, TranslateModule], }) export class AoiClearComponent implements OnInit, OnDestroy { private mapService = inject(MapService); diff --git a/src/app/components/shared/selectors/path-selector/index.ts b/src/app/components/shared/selectors/path-selector/index.ts index bc88983b7..e18744dda 100644 --- a/src/app/components/shared/selectors/path-selector/index.ts +++ b/src/app/components/shared/selectors/path-selector/index.ts @@ -1,2 +1 @@ export * from './path-selector.component'; -export * from './path-selector.module'; diff --git a/src/app/components/shared/selectors/path-selector/path-selector.component.html b/src/app/components/shared/selectors/path-selector/path-selector.component.html index 91118bec2..1c96a51bb 100644 --- a/src/app/components/shared/selectors/path-selector/path-selector.component.html +++ b/src/app/components/shared/selectors/path-selector/path-selector.component.html @@ -1,81 +1,85 @@
- - - + @if (prop.isRelevant(p.PATH)) { + + + + } - - - + @if (prop.isRelevant(p.PATH)) { + + + + }
- - - + @if (prop.isRelevant(p.FRAME)) { + + + + } - - - + @if (prop.isRelevant(p.FRAME)) { + + + + }
diff --git a/src/app/components/shared/selectors/path-selector/path-selector.component.ts b/src/app/components/shared/selectors/path-selector/path-selector.component.ts index 0b64c8de3..395ace1eb 100644 --- a/src/app/components/shared/selectors/path-selector/path-selector.component.ts +++ b/src/app/components/shared/selectors/path-selector/path-selector.component.ts @@ -1,5 +1,5 @@ import { Component, OnInit, ViewChild, OnDestroy, inject } from '@angular/core'; -import { NgForm } from '@angular/forms'; +import { NgForm, FormsModule } from '@angular/forms'; import { Subject } from 'rxjs'; import { tap, map, delay } from 'rxjs/operators'; @@ -11,6 +11,10 @@ import * as filtersStore from '@store/filters'; import { Props } from '@models'; import { PropertyService } from '@services'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { AoiClearComponent } from './aoi-clear/aoi-clear.component'; +import { TranslateModule } from '@ngx-translate/core'; enum PathFormInputType { PATH_START = 'Path Start', @@ -23,7 +27,15 @@ enum PathFormInputType { selector: 'app-path-selector', templateUrl: './path-selector.component.html', styleUrls: ['./path-selector.component.scss'], - standalone: false, + imports: [ + FormsModule, + + MatFormField, + MatInput, + MatButton, + AoiClearComponent, + TranslateModule, + ], }) export class PathSelectorComponent implements OnInit, OnDestroy { prop = inject(PropertyService); diff --git a/src/app/components/shared/selectors/path-selector/path-selector.module.ts b/src/app/components/shared/selectors/path-selector/path-selector.module.ts deleted file mode 100644 index 72140944d..000000000 --- a/src/app/components/shared/selectors/path-selector/path-selector.module.ts +++ /dev/null @@ -1,27 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSharedModule } from '@shared'; - -import { PathSelectorComponent } from './path-selector.component'; -import { AoiClearComponent } from './aoi-clear/aoi-clear.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [PathSelectorComponent, AoiClearComponent], - imports: [ - CommonModule, - FormsModule, - MatSharedModule, - MatSlideToggleModule, - MatFormFieldModule, - MatInputModule, - SharedModule, - ], - exports: [PathSelectorComponent], -}) -export class PathSelectorModule {} diff --git a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.html b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.html index 61d322708..e14357fbd 100644 --- a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.html +++ b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.html @@ -17,13 +17,16 @@ class="sci-prod-optgroup" > @for (sciProd of group.sciProd; track sciProd) { - {{ - sciProd.viewValue - }} + {{ sciProd.viewValue }} + } } } + *{{ 'RECOMMENDED_PRODUCT' | translate }}
diff --git a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.scss b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.scss index a0f8e68fd..ddcccf546 100644 --- a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.scss +++ b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.scss @@ -1,3 +1,6 @@ +@use "@angular/material" as mat; +@use "asf-theme-variables" as *; + div.cdk-overlay-pane:has(>.sci-prod-select) { min-width: fit-content !important; //width: fit-content !important; @@ -29,3 +32,10 @@ div.cdk-overlay-pane:has(>.sci-prod-select) { .sci-prod-optgroup { font-weight: bold; } + +.sci-prod-recommended { + font-style: italic; + font-weight: 400; + font-size: small; + margin-left: 18px; +} diff --git a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.ts b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.ts index 4b246ebeb..18cab8aa8 100644 --- a/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.ts +++ b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.ts @@ -3,11 +3,11 @@ import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { SharedModule } from '@shared'; import { SubSink } from 'subsink'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; +import { TranslateModule } from '@ngx-translate/core'; interface sciProd { value: string; @@ -30,7 +30,7 @@ interface sciProdGroup { FormsModule, ReactiveFormsModule, MatInputModule, - SharedModule, + TranslateModule, ], }) export class ProductScienceSelectorComponent implements OnInit, OnDestroy { @@ -51,7 +51,10 @@ export class ProductScienceSelectorComponent implements OnInit, OnDestroy { disabled: false, sciProd: [ { value: 'GSLC', viewValue: 'GSLC (Geocoded Single Look Complex)' }, - { value: 'GCOV', viewValue: 'GCOV (Geocoded Polarimetric Covariance)' }, + { + value: 'GCOV', + viewValue: '*GCOV (Geocoded Polarimetric Covariance)', + }, { value: 'GUNW', viewValue: 'GUNW (Geocoded Interferogram)' }, { value: 'GOFF', viewValue: 'GOFF (Geocoded Pixel Offsets)' }, ], diff --git a/src/app/components/shared/selectors/product-science-selector/product-science-selector.module.ts b/src/app/components/shared/selectors/product-science-selector/product-science-selector.module.ts deleted file mode 100644 index 02d9a71bb..000000000 --- a/src/app/components/shared/selectors/product-science-selector/product-science-selector.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -@NgModule({ - declarations: [], - imports: [CommonModule], -}) -export class ProductScienceSelectorModule {} diff --git a/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.html b/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.html index 28f4258b0..23144a8ac 100644 --- a/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.html +++ b/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.html @@ -7,21 +7,23 @@ placeholder="{{ 'FILE_TYPE' | translate }}" multiple > - - {{ type.displayName }} - + @for (type of selectableProductTypes; track type) { + + {{ type.displayName }} + + } - - {{ productTypesList?.length || 0 }}/{{ selectableProductTypes.length }} - {{ 'FILE_TYPES_SELECTED' | translate }} - + @if (selectableProductTypes.length >= 1) { + + {{ productTypesList?.length || 0 }}/{{ selectableProductTypes.length }} + {{ 'FILE_TYPES_SELECTED' | translate }} + + } - - {{ 'NO_FILE_TYPES_TO_SELECT' | translate }} - + @if (selectableProductTypes.length < 1) { + + {{ 'NO_FILE_TYPES_TO_SELECT' | translate }} + + } diff --git a/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.ts b/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.ts index a592cc39c..c93058404 100644 --- a/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.ts +++ b/src/app/components/shared/selectors/product-type-selector/product-type-selector.component.ts @@ -13,14 +13,30 @@ import * as filtersStore from '@store/filters'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SubSink } from 'subsink'; -import { MatSelectChange } from '@angular/material/select'; +import { + MatSelectChange, + MatSelect, + MatOption, +} from '@angular/material/select'; import { combineLatest } from 'rxjs'; +import { MatFormField, MatHint } from '@angular/material/input'; +import { MatTooltip } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-product-type-selector', templateUrl: './product-type-selector.component.html', styleUrls: ['./product-type-selector.component.css'], - standalone: false, + imports: [ + MatFormField, + MatSelect, + + MatOption, + MatTooltip, + + MatHint, + TranslateModule, + ], }) export class ProductTypeSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/product-type-selector/product-type-selector.module.ts b/src/app/components/shared/selectors/product-type-selector/product-type-selector.module.ts deleted file mode 100644 index c75e1fc44..000000000 --- a/src/app/components/shared/selectors/product-type-selector/product-type-selector.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; - -import { ProductTypeSelectorComponent } from './product-type-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ProductTypeSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSelectModule, - MatSharedModule, - SharedModule, - ], - exports: [ProductTypeSelectorComponent], -}) -export class ProductTypeSelectorModule {} diff --git a/src/app/components/shared/selectors/production-config-selector/production-config-selector.component.ts b/src/app/components/shared/selectors/production-config-selector/production-config-selector.component.ts index 0ca6a51d4..0bd47b816 100644 --- a/src/app/components/shared/selectors/production-config-selector/production-config-selector.component.ts +++ b/src/app/components/shared/selectors/production-config-selector/production-config-selector.component.ts @@ -3,12 +3,12 @@ import { FormControl, FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatInputModule } from '@angular/material/input'; import { MatSelectModule } from '@angular/material/select'; import { MatFormFieldModule } from '@angular/material/form-field'; -import { SharedModule } from '@shared'; import { SubSink } from 'subsink'; import { AppState } from '@store'; import { Store } from '@ngrx/store'; import * as filtersStore from '@store/filters'; import { MatTooltip } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; interface prodConfig { value: string; @@ -25,7 +25,7 @@ interface prodConfig { FormsModule, ReactiveFormsModule, MatInputModule, - SharedModule, + TranslateModule, MatTooltip, ], }) diff --git a/src/app/components/shared/selectors/production-config-selector/production-config-selector.module.ts b/src/app/components/shared/selectors/production-config-selector/production-config-selector.module.ts deleted file mode 100644 index 2fe432a09..000000000 --- a/src/app/components/shared/selectors/production-config-selector/production-config-selector.module.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -@NgModule({ - declarations: [], - imports: [CommonModule], -}) -export class ProductionConfigSelectorModule {} diff --git a/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.html b/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.html index 00db857a1..36ead9af4 100644 --- a/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.html +++ b/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.html @@ -20,12 +20,11 @@ (optionSelected)="onPNameChange($event.option.value)" #projectNameAuto="matAutocomplete" > - - {{ projectName }} - + @for (projectName of projectNamesFiltered; track projectName) { + + {{ projectName }} + + } diff --git a/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.ts b/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.ts index 0279700ec..33cbcd21e 100644 --- a/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.ts +++ b/src/app/components/shared/selectors/project-name-selector/project-name-selector.component.ts @@ -6,7 +6,7 @@ import { OnDestroy, inject, } from '@angular/core'; -import { NgForm } from '@angular/forms'; +import { NgForm, FormsModule } from '@angular/forms'; import { SubSink } from 'subsink'; import { combineLatest, Subject } from 'rxjs'; @@ -18,12 +18,29 @@ import * as hyp3Store from '@store/hyp3'; import * as filtersStore from '@store/filters'; import { NotificationService } from '@services/notification.service'; import { ScenesService } from '@services'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { + MatAutocompleteTrigger, + MatAutocomplete, +} from '@angular/material/autocomplete'; +import {} from '@angular/common'; +import { MatOption } from '@angular/material/select'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-project-name-selector', templateUrl: './project-name-selector.component.html', styleUrls: ['./project-name-selector.component.scss'], - standalone: false, + imports: [ + FormsModule, + MatFormField, + MatInput, + MatAutocompleteTrigger, + MatAutocomplete, + + MatOption, + TranslateModule, + ], }) export class ProjectNameSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/project-name-selector/project-name-selector.module.ts b/src/app/components/shared/selectors/project-name-selector/project-name-selector.module.ts deleted file mode 100644 index 59acf4ee1..000000000 --- a/src/app/components/shared/selectors/project-name-selector/project-name-selector.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSharedModule } from '@shared'; -import { MatInputModule } from '@angular/material/input'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; - -import { ProjectNameSelectorComponent } from './project-name-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ProjectNameSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSharedModule, - MatInputModule, - MatAutocompleteModule, - SharedModule, - ], - exports: [ProjectNameSelectorComponent], -}) -export class ProjectNameSelectorModule {} diff --git a/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.component.ts b/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.component.ts index 8594634e5..fc045b91b 100644 --- a/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.component.ts +++ b/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.component.ts @@ -1,16 +1,21 @@ import { Component, OnDestroy, OnInit, inject } from '@angular/core'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { + MatSlideToggleChange, + MatSlideToggle, +} from '@angular/material/slide-toggle'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; import { SubSink } from 'subsink'; +import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-event-active-selector', templateUrl: './sarviews-event-active-selector.component.html', styleUrls: ['./sarviews-event-active-selector.component.scss'], - standalone: false, + imports: [MatSlideToggle, FormsModule, TranslateModule], }) export class SarviewsEventActiveSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.module.ts b/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.module.ts deleted file mode 100644 index af9edba81..000000000 --- a/src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatButtonModule } from '@angular/material/button'; -import { SarviewsEventActiveSelectorComponent } from './sarviews-event-active-selector.component'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SarviewsEventActiveSelectorComponent], - imports: [ - CommonModule, - MatButtonModule, - MatSlideToggleModule, - FormsModule, - SharedModule, - ], - exports: [SarviewsEventActiveSelectorComponent], -}) -export class SarviewsEventActiveSelectorModule {} diff --git a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/index.ts b/src/app/components/shared/selectors/sarviews-event-magnitude-selector/index.ts index 1e897e7a2..497399c27 100644 --- a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/index.ts +++ b/src/app/components/shared/selectors/sarviews-event-magnitude-selector/index.ts @@ -1,2 +1 @@ export { SarviewsEventMagnitudeSelectorComponent } from './sarviews-event-magnitude-selector.component'; -export { SarviewsEventMagnitudeSelectorModule } from './sarviews-event-magnitude-selector.module'; diff --git a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.component.ts b/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.component.ts index 6a41510b4..b079f784b 100644 --- a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.component.ts +++ b/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.component.ts @@ -31,7 +31,6 @@ import { Breakpoints, SarviewsEventType } from '@models'; selector: 'app-sarviews-event-magnitude-selector', templateUrl: './sarviews-event-magnitude-selector.component.html', styleUrls: ['./sarviews-event-magnitude-selector.component.scss'], - standalone: false, }) export class SarviewsEventMagnitudeSelectorComponent implements OnInit, OnDestroy diff --git a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.module.ts b/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.module.ts deleted file mode 100644 index 9905a2dbd..000000000 --- a/src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.module.ts +++ /dev/null @@ -1,11 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SarviewsEventMagnitudeSelectorComponent } from './sarviews-event-magnitude-selector.component'; -import { MatSliderModule } from '@angular/material/slider'; - -@NgModule({ - declarations: [SarviewsEventMagnitudeSelectorComponent], - imports: [CommonModule, MatSliderModule], - exports: [SarviewsEventMagnitudeSelectorComponent], -}) -export class SarviewsEventMagnitudeSelectorModule {} diff --git a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.html b/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.html index bec303bd4..f94719aa1 100644 --- a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.html +++ b/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.html @@ -15,25 +15,22 @@ (optionSelected)="onMatAutoCompleteSelect($event)" #jobNameSelector="matAutocomplete" > - -
- - - {{ event.description }} - - - - - - {{ event.event_type[0].toLocaleUpperCase() - }}{{ event.event_type.slice(1) }} {{ 'EVENT' | translate }}: - {{ event.processing_timeframe.start | shortDate }} - - -
- + @for (event of filteredEvents$ | async; track event) { + +
+ @if (!!event.description) { + + {{ event.description }} + + } @else { + + {{ event.event_type[0].toLocaleUpperCase() + }}{{ event.event_type.slice(1) }} {{ 'EVENT' | translate }}: + {{ event.processing_timeframe.start | shortDate }} + + } +
+ + } diff --git a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.ts b/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.ts index 0ce60a413..29ae6b41d 100644 --- a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.ts +++ b/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.component.ts @@ -1,6 +1,10 @@ import { Component, OnDestroy, OnInit, ViewChild, inject } from '@angular/core'; -import { NgForm } from '@angular/forms'; -import { MatAutocompleteSelectedEvent } from '@angular/material/autocomplete'; +import { NgForm, FormsModule } from '@angular/forms'; +import { + MatAutocompleteSelectedEvent, + MatAutocompleteTrigger, + MatAutocomplete, +} from '@angular/material/autocomplete'; import { Store } from '@ngrx/store'; import { NotificationService, SarviewsEventsService } from '@services'; import { AppState } from '@store'; @@ -11,11 +15,30 @@ import { getIsResultsMenuOpen } from '@store/ui'; import { combineLatest } from 'rxjs'; import { map, withLatestFrom } from 'rxjs/operators'; import { SubSink } from 'subsink'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { AsyncPipe } from '@angular/common'; +import { MatOption } from '@angular/material/select'; +import { MatTooltip } from '@angular/material/tooltip'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-event-search-selector', templateUrl: './sarviews-event-search-selector.component.html', styleUrls: ['./sarviews-event-search-selector.component.scss'], - standalone: false, + imports: [ + FormsModule, + MatFormField, + MatInput, + MatAutocompleteTrigger, + MatAutocomplete, + + MatOption, + MatTooltip, + + AsyncPipe, + ShortDatePipe, + TranslateModule, + ], }) export class SarviewsEventSearchSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.module.ts b/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.module.ts deleted file mode 100644 index 458f27bd0..000000000 --- a/src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSharedModule } from '@shared'; -import { MatInputModule } from '@angular/material/input'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; - -import { SarviewsEventSearchSelectorComponent } from './sarviews-event-search-selector.component'; -import { PipesModule } from '@pipes'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SarviewsEventSearchSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSharedModule, - MatInputModule, - MatAutocompleteModule, - PipesModule, - SharedModule, - ], - exports: [SarviewsEventSearchSelectorComponent], -}) -export class SarviewsEventSearchSelectorModule {} diff --git a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.html b/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.html index 637b62d6a..339672926 100644 --- a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.html +++ b/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.html @@ -5,8 +5,10 @@ [(value)]="selectedTypesList" (selectionChange)="onNewEventTypes($event)" > - - {{ type[0].toUpperCase() + type.slice(1) }} - + @for (type of eventTypes; track type) { + + {{ type[0].toUpperCase() + type.slice(1) }} + + } diff --git a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.ts b/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.ts index c5432daef..0e019a127 100644 --- a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.ts +++ b/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.component.ts @@ -2,16 +2,23 @@ import { Component, OnInit, OnDestroy, inject } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SarviewsEventType } from '@models'; -import { MatSelectChange } from '@angular/material/select'; +import { + MatSelectChange, + MatSelect, + MatOption, +} from '@angular/material/select'; import * as filterStore from '@store/filters'; import { SubSink } from 'subsink'; +import { MatFormField } from '@angular/material/input'; +import {} from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sarviews-event-type-selector', templateUrl: './sarviews-event-type-selector.component.html', styleUrls: ['./sarviews-event-type-selector.component.scss'], - standalone: false, + imports: [MatFormField, MatSelect, MatOption, TranslateModule], }) export class SarviewsEventTypeSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.module.ts b/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.module.ts deleted file mode 100644 index 42f00a3c9..000000000 --- a/src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatSelectModule } from '@angular/material/select'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { FormsModule } from '@angular/forms'; -import { SarviewsEventTypeSelectorComponent } from './sarviews-event-type-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SarviewsEventTypeSelectorComponent], - imports: [ - CommonModule, - MatSelectModule, - MatFormFieldModule, - FormsModule, - SharedModule, - ], - exports: [SarviewsEventTypeSelectorComponent], -}) -export class SarviewsEventTypeSelectorModule {} diff --git a/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.component.ts b/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.component.ts index e4a506672..ddfcb5594 100644 --- a/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.component.ts +++ b/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.component.ts @@ -4,12 +4,25 @@ import { AppState } from '@store'; import { SubSink } from 'subsink'; import * as filtersStore from '@store/filters'; import { SBASOverlap } from '@models'; +import { MatFormField, MatLabel } from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { FormsModule } from '@angular/forms'; +import { UpperCasePipe } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sbas-overlap-selector', templateUrl: './sbas-overlap-selector.component.html', styleUrls: ['./sbas-overlap-selector.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatSelect, + FormsModule, + MatOption, + UpperCasePipe, + TranslateModule, + ], }) export class SbasOverlapSelectorComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.module.ts b/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.module.ts deleted file mode 100644 index 8d8fcda5e..000000000 --- a/src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { MatSharedModule } from '@shared'; -import { MatSelectModule } from '@angular/material/select'; - -import { SbasOverlapSelectorComponent } from './sbas-overlap-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SbasOverlapSelectorComponent], - imports: [ - CommonModule, - FormsModule, - - MatSharedModule, - MatSlideToggleModule, - MatSliderModule, - MatSelectModule, - SharedModule, - ], - exports: [SbasOverlapSelectorComponent], -}) -export class SbasOverlapSelectorModule {} diff --git a/src/app/components/shared/selectors/search-selector/search-selector.component.ts b/src/app/components/shared/selectors/search-selector/search-selector.component.ts index 580467874..2d0533e3d 100644 --- a/src/app/components/shared/selectors/search-selector/search-selector.component.ts +++ b/src/app/components/shared/selectors/search-selector/search-selector.component.ts @@ -1,12 +1,23 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; import * as models from '@models'; +import { MatCard } from '@angular/material/card'; +import { MatDivider, MatList, MatListItem } from '@angular/material/list'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-search-selector', templateUrl: './search-selector.component.html', styleUrls: ['./search-selector.component.scss'], - standalone: false, + imports: [ + MatCard, + MatDivider, + MatList, + MatListItem, + MatIcon, + TranslateModule, + ], }) export class SearchSelectorComponent { @Input() selectedSearchType: models.SearchType; diff --git a/src/app/components/shared/selectors/search-selector/search-selector.module.ts b/src/app/components/shared/selectors/search-selector/search-selector.module.ts deleted file mode 100644 index 059d625f4..000000000 --- a/src/app/components/shared/selectors/search-selector/search-selector.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SearchSelectorComponent } from './search-selector.component'; - -import { MatExpansionModule } from '@angular/material/expansion'; - -import { MatSharedModule } from '@shared'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SearchSelectorComponent], - imports: [CommonModule, MatExpansionModule, MatSharedModule, SharedModule], - exports: [SearchSelectorComponent], -}) -export class SearchSelectorModule {} diff --git a/src/app/components/shared/selectors/search-type-selector/index.ts b/src/app/components/shared/selectors/search-type-selector/index.ts index 0a37f7046..835c0e193 100644 --- a/src/app/components/shared/selectors/search-type-selector/index.ts +++ b/src/app/components/shared/selectors/search-type-selector/index.ts @@ -1,2 +1 @@ -export * from './search-type-selector.module'; export * from './search-type-selector.component'; diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index f5aa521e8..a4f8c9fe7 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html @@ -1,218 +1,232 @@ -
-
- {{ 'SEARCH_TYPE' | translate }} -
- +
+
- -
-
+ @if (searchType === searchTypes.DISPLACEMENT) { + + *{{ 'DISCLAIMER' | translate }} + + }
-
- -
- - - + + @for ( + type of searchTypeSelectors.search; + track type; + let last = $last + ) { + @if ( !( type.nameKey === 'DISPLACEMENT' && breakpoint === breakpoints.MOBILE ) - " - > - + @if (!last) { +
+ } + } + } +
+ -
- - -
- - -
- - - - - +
+ - -
-
- +
+ {{ + 'DATASET_LINKED' | translate + }}
-
-
- - + + + + @for (dataset of datasets; track dataset; let isLast = $last) { + + + +
+
+ +
+
+
+ @if (!isLast) { +
+ } + + } + +
-
+} diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss index 921cdaf94..91134370a 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.scss @@ -232,22 +232,6 @@ top: 3px; } -.badge-new { - color: #236192; - font-style: italic; - font-size: 15px; - padding: 3px 8px; - border-radius: 12px; - font-weight: bold; - animation: fadeInUp 1.5s ease-out forwards; - position: absolute; - margin-left: 3px; - margin-top: -2px; - text-shadow: 0.3px 0.3px 1.5px rgba(35, 97, 146, 0.2); - filter: brightness(1.05); -} - - @keyframes fadeInUp { 0% { opacity: 0; @@ -258,3 +242,20 @@ transform: translateY(0); } } + +.disclaimer-link { + display: inline-block; + font-size: 12px; + font-style: italic; + color: grey; + cursor: pointer; + pointer-events: auto; + margin-left: 10px; + position: relative; + top: 2px; + z-index: 10; + + &:hover { + text-decoration: underline; + } +} diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts index cb0f81adf..d73513a10 100644 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts +++ b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts @@ -9,7 +9,7 @@ import { } from '@angular/core'; import { SubSink } from 'subsink'; -import { MatMenu, MatMenuTrigger } from '@angular/material/menu'; +import { MatMenu, MatMenuTrigger, MatMenuItem } from '@angular/material/menu'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; @@ -18,9 +18,19 @@ import * as userStore from '@store/user'; import * as models from '@models'; -import { EnvironmentService, ScreenSizeService } from '@services'; +import { + DisplacementDisclaimerService, + EnvironmentService, + ScreenSizeService, +} from '@services'; import { AnalyticsEvent, Breakpoints, derivedDatasets } from '@models'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { MatLabel, MatSuffix } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { DocsModalComponent } from '../../docs-modal/docs-modal.component'; +import { MatCardActions } from '@angular/material/card'; // Declare GTM dataLayer array. declare global { @@ -33,12 +43,27 @@ declare global { selector: 'app-search-type-selector', templateUrl: './search-type-selector.component.html', styleUrls: ['./search-type-selector.component.scss'], - standalone: false, + imports: [ + MatLabel, + MatButton, + MatMenuTrigger, + MatTooltip, + MatMenu, + + MatMenuItem, + NgClass, + DocsModalComponent, + MatSuffix, + MatCardActions, + AsyncPipe, + TranslateModule, + ], }) export class SearchTypeSelectorComponent implements OnInit, OnDestroy { translate = inject(TranslateService); private store$ = inject>(Store); private screenSize = inject(ScreenSizeService); + private disclaimerService = inject(DisplacementDisclaimerService); env = inject(EnvironmentService); @ViewChild(MatMenuTrigger) trigger: MatMenuTrigger; @@ -221,7 +246,9 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { event.stopPropagation(); } - public onSearchTypeMenuOpen() {} + public onOpenDisclaimer(): void { + this.disclaimerService.open(); + } ngOnDestroy() { this.subs.unsubscribe(); diff --git a/src/app/components/shared/selectors/search-type-selector/search-type-selector.module.ts b/src/app/components/shared/selectors/search-type-selector/search-type-selector.module.ts deleted file mode 100644 index 53280d655..000000000 --- a/src/app/components/shared/selectors/search-type-selector/search-type-selector.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { FormsModule } from '@angular/forms'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { MatSelectModule } from '@angular/material/select'; - -import { SearchTypeSelectorComponent } from './search-type-selector.component'; -import { MatMenuModule } from '@angular/material/menu'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { TranslateModule } from '@ngx-translate/core'; - -@NgModule({ - declarations: [SearchTypeSelectorComponent], - imports: [ - CommonModule, - MatSharedModule, - FormsModule, - MatSelectModule, - MatMenuModule, - DocsModalModule, - TranslateModule, - ], - exports: [SearchTypeSelectorComponent], -}) -export class SearchTypeSelectorModule {} diff --git a/src/app/components/shared/selectors/season-selector/index.ts b/src/app/components/shared/selectors/season-selector/index.ts index 3643abed2..0eef8549a 100644 --- a/src/app/components/shared/selectors/season-selector/index.ts +++ b/src/app/components/shared/selectors/season-selector/index.ts @@ -1,2 +1 @@ export * from './season-selector.component'; -export * from './season-selector.module'; diff --git a/src/app/components/shared/selectors/season-selector/season-selector.component.html b/src/app/components/shared/selectors/season-selector/season-selector.component.html index ae6a48032..d4871a100 100644 --- a/src/app/components/shared/selectors/season-selector/season-selector.component.html +++ b/src/app/components/shared/selectors/season-selector/season-selector.component.html @@ -6,40 +6,50 @@ {{ 'SEASONAL_SEARCH' | translate }} -
- - -
-
- {{ 'SEASON_START_DAY' | translate }} -
-
{{ this.start | shortDateSeason }}
- - +@if (isSeasonalSearch) { +
+ + +
+
+ {{ 'SEASON_START_DAY' | translate }} +
+ @if (start) { +
{{ this.start | shortDateSeason }}
+ } + + +
-
-
- {{ 'SEASON_END_DAY' | translate }} -
-
{{ end | shortDateSeason }}
- - +
+ {{ 'SEASON_END_DAY' | translate }} +
+ @if (end) { +
{{ end | shortDateSeason }}
+ } + + +
-
+} diff --git a/src/app/components/shared/selectors/season-selector/season-selector.component.ts b/src/app/components/shared/selectors/season-selector/season-selector.component.ts index ac929eaa7..c15d115e4 100644 --- a/src/app/components/shared/selectors/season-selector/season-selector.component.ts +++ b/src/app/components/shared/selectors/season-selector/season-selector.component.ts @@ -7,13 +7,29 @@ import { SubSink } from 'subsink'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; -import { MatSlideToggleChange } from '@angular/material/slide-toggle'; +import { + MatSlideToggleChange, + MatSlideToggle, +} from '@angular/material/slide-toggle'; +import { FormsModule } from '@angular/forms'; +import { CircleSliderComponent } from '../circle-slider/circle-slider.component'; +import { MatButton } from '@angular/material/button'; +import { ShortDateSeasonPipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-season-selector', templateUrl: './season-selector.component.html', styleUrls: ['./season-selector.component.scss'], - standalone: false, + imports: [ + MatSlideToggle, + FormsModule, + + CircleSliderComponent, + MatButton, + ShortDateSeasonPipe, + TranslateModule, + ], }) export class SeasonSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -64,7 +80,8 @@ export class SeasonSelectorComponent implements OnInit, OnDestroy { setTimeout(() => { this.store$.dispatch(new filtersStore.SetSeasonStart(1)); this.store$.dispatch(new filtersStore.SetSeasonEnd(180)); - }, 0); } + }, 0); + } } public onSeasonStartChange(dayOfYear: number): void { diff --git a/src/app/components/shared/selectors/season-selector/season-selector.module.ts b/src/app/components/shared/selectors/season-selector/season-selector.module.ts deleted file mode 100644 index 13ac953d8..000000000 --- a/src/app/components/shared/selectors/season-selector/season-selector.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { MatSharedModule } from '@shared'; - -import { SeasonSelectorComponent } from './season-selector.component'; -import { CircleSliderModule } from '@components/shared/selectors/circle-slider/circle-slider.module'; -import { DateRangeModule } from '../date-range/date-range.module'; -import { MatButtonModule } from '@angular/material/button'; -import { PipesModule } from '@pipes'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SeasonSelectorComponent], - imports: [ - CommonModule, - FormsModule, - - MatSharedModule, - MatSlideToggleModule, - MatSliderModule, - CircleSliderModule, - DateRangeModule, - MatButtonModule, - PipesModule, - SharedModule, - ], - exports: [SeasonSelectorComponent], -}) -export class SeasonSelectorModule {} diff --git a/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.html b/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.html index f37078478..2f2609732 100644 --- a/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.html +++ b/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.html @@ -8,17 +8,17 @@ placeholder="{{ 'SHORT_NAME' | translate }}" multiple > - - {{ type.displayName }} - + @for (type of selectableShortNames; track type) { + + {{ type.displayName }} + + } - - {{ shortNamesList?.length || 0 }}/{{ selectableShortNames.length }} - {{ 'SHORT_NAMES_SELECTED' | translate }} - + @if (selectableShortNames.length >= 1) { + + {{ shortNamesList?.length || 0 }}/{{ selectableShortNames.length }} + {{ 'SHORT_NAMES_SELECTED' | translate }} + + } diff --git a/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.ts b/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.ts index 2b8be526c..e04c16ef4 100644 --- a/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.ts +++ b/src/app/components/shared/selectors/short-name-selector/short-name-selector.component.ts @@ -11,13 +11,29 @@ import * as filtersStore from '@store/filters'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SubSink } from 'subsink'; -import { MatSelectChange } from '@angular/material/select'; +import { + MatSelectChange, + MatSelect, + MatOption, +} from '@angular/material/select'; +import { MatFormField, MatHint } from '@angular/material/input'; +import { MatTooltip } from '@angular/material/tooltip'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-short-name-selector', templateUrl: './short-name-selector.component.html', styleUrl: './short-name-selector.component.scss', - standalone: false, + imports: [ + MatFormField, + MatSelect, + + MatOption, + MatTooltip, + + MatHint, + TranslateModule, + ], }) export class ShortNameSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/short-name-selector/short-name-selector.module.ts b/src/app/components/shared/selectors/short-name-selector/short-name-selector.module.ts deleted file mode 100644 index 6394b8557..000000000 --- a/src/app/components/shared/selectors/short-name-selector/short-name-selector.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; - -import { ShortNameSelectorComponent } from './short-name-selector.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ShortNameSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatSelectModule, - MatSharedModule, - SharedModule, - ], - exports: [ShortNameSelectorComponent], -}) -export class ShortNameSelectorModule {} diff --git a/src/app/components/sidebar/index.ts b/src/app/components/sidebar/index.ts index c7d0be9fc..075e62390 100644 --- a/src/app/components/sidebar/index.ts +++ b/src/app/components/sidebar/index.ts @@ -1,2 +1 @@ -export * from './sidebar.module'; export * from './sidebar.component'; diff --git a/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.html b/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.html index 0fdf10536..0dcad9179 100644 --- a/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.html +++ b/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.html @@ -1,46 +1,49 @@
- keyboard_arrow_right - keyboard_arrow_down + @if (!expanded) { + keyboard_arrow_right + } + @if (expanded) { + keyboard_arrow_down + }
- - {{ filterPreset.name }} edit - + @if (!isEditingName) { + + {{ filterPreset.name }} + edit + + } - -
- - - -
- + @if (isEditingName) { + +
+ + + +
+ + } {{ filterPreset.searchType | uppercase | translate }}
- - {{ (filterPreset.filters | geographicFilter).selectedDataset }} - + @if (filterPreset.searchType === SearchType.DATASET) { + + {{ (filterPreset.filters | geographicFilter).selectedDataset }} + + }
@@ -55,24 +58,25 @@
-
-
- - - - - - - - +@if (expanded) { +
+
+ @if (filterPreset.searchType === SearchType.DATASET) { + + + } + @if (filterPreset.searchType === SearchType.BASELINE) { + + + } + @if (filterPreset.searchType === SearchType.SBAS) { + + + } +
-
+} diff --git a/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.ts b/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.ts index 1f9aa91b1..b348e74d0 100644 --- a/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.ts +++ b/src/app/components/sidebar/save-user-filters/save-user-filter/save-user-filter.component.ts @@ -14,12 +14,40 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { timer } from 'rxjs'; import { NotificationService } from '@services'; +import { UpperCasePipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { GeographicSearchFiltersComponent } from '../../saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component'; +import { BaselineSearchFiltersComponent } from '../../saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component'; +import { SbasSearchFiltersComponent } from '../../saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component'; +import { + BaselineFilterPipe, + SBASFilterPipe, + GeographicFilterPipe, +} from '@pipes/filter-type.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-save-user-filter', templateUrl: './save-user-filter.component.html', styleUrls: ['./save-user-filter.component.scss'], - standalone: false, + imports: [ + MatIcon, + FormsModule, + MatFormField, + MatInput, + MatButton, + GeographicSearchFiltersComponent, + BaselineSearchFiltersComponent, + SbasSearchFiltersComponent, + UpperCasePipe, + BaselineFilterPipe, + SBASFilterPipe, + GeographicFilterPipe, + TranslateModule, + ], }) export class SaveUserFilterComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/sidebar/save-user-filters/save-user-filters.component.html b/src/app/components/sidebar/save-user-filters/save-user-filters.component.html index 3aa27ab6d..567a8ec32 100644 --- a/src/app/components/sidebar/save-user-filters/save-user-filters.component.html +++ b/src/app/components/sidebar/save-user-filters/save-user-filters.component.html @@ -11,34 +11,34 @@
-
-
-
- - -
+ @if (searchType$ | async; as searchType) { +
+ @if (displayedFilter.length > 0) { +
+ @for (filterPreset of displayedFilter; track filterPreset) { +
+ + +
+ } +
+ } @else { +
+

{{ 'YOU_HAVE_NO_SAVED_FILTERS' | translate }}

+
+ }
-
- - -
-

{{ 'YOU_HAVE_NO_SAVED_FILTERS' | translate }}

-
- + }
>(Store); diff --git a/src/app/components/sidebar/save-user-filters/save-user-filters.module.ts b/src/app/components/sidebar/save-user-filters/save-user-filters.module.ts deleted file mode 100644 index 4e3385840..000000000 --- a/src/app/components/sidebar/save-user-filters/save-user-filters.module.ts +++ /dev/null @@ -1,34 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatInputModule } from '@angular/material/input'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatSharedModule } from '@shared'; -import { PipesModule } from '@pipes'; -import { FormsModule } from '@angular/forms'; -import { MatExpansionModule } from '@angular/material/expansion'; - -import { SaveUserFiltersComponent } from './save-user-filters.component'; -import { SearchFiltersModule } from '../saved-searches/saved-search/search-filters'; -import { SaveUserFilterComponent } from './save-user-filter/save-user-filter.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SaveUserFiltersComponent, SaveUserFilterComponent], - imports: [ - CommonModule, - MatSharedModule, - MatButtonToggleModule, - MatInputModule, - FormsModule, - PipesModule, - MatMenuModule, - MatDialogModule, - MatExpansionModule, - SearchFiltersModule, - SharedModule, - ], - exports: [SaveUserFiltersComponent], -}) -export class SaveUserFiltersModule {} diff --git a/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.html b/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.html index eb6248098..247dae2c2 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.html @@ -1,61 +1,72 @@
- keyboard_arrow_right - keyboard_arrow_down + @if (!isExpanded) { + keyboard_arrow_right + } + @if (isExpanded) { + keyboard_arrow_down + }
- - {{ formatName(search.name) }} - edit - - - -
- - - -
- + {{ formatName(search.name) }} + @if (isSavedSearch) { + edit + } + + } + + @if (isEditingName) { + +
+ + + +
+ + } {{ search.searchType | uppercase | translate }}
-
- - {{ (search.filters | geographicFilter).selectedDataset }} - {{ formatDatesFor(search.filters | geographicFilter) }} - - - {{ listPreview(search.filters | listFilter) }} - -
+ @if (!isEditingName) { +
+ @if (search.searchType === SearchType.DATASET) { + + {{ (search.filters | geographicFilter).selectedDataset }} + {{ formatDatesFor(search.filters | geographicFilter) }} + + } + @if (search.searchType === SearchType.LIST) { + + {{ listPreview(search.filters | listFilter) }} + + } +
+ }
@@ -64,36 +75,35 @@ image_search - + @if (isSavedSearch) { + + }
-
- - -
- +@if (isExpanded) { +
+ + @if (isSavedSearch) { +
+ +
+ }
-
+} diff --git a/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.ts b/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.ts index 2c7af2f2b..8c729cc36 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/saved-search.component.ts @@ -16,13 +16,34 @@ import * as moment from 'moment'; import * as models from '@models'; import { AsfLanguageService } from '@services/asf-language.service'; +import { UpperCasePipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { SearchFiltersComponent } from './search-filters/search-filters.component'; +import { GeographicFilterPipe, ListFilterPipe } from '@pipes/filter-type.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-saved-search', templateUrl: './saved-search.component.html', styleUrls: ['./saved-search.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: false, + imports: [ + MatIcon, + MatTooltip, + FormsModule, + MatFormField, + MatInput, + MatButton, + SearchFiltersComponent, + UpperCasePipe, + GeographicFilterPipe, + ListFilterPipe, + TranslateModule, + ], }) export class SavedSearchComponent implements OnInit { private language = inject(AsfLanguageService); diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.html index 6f18ea1ba..363058870 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.html @@ -1,33 +1,42 @@
-
- {{ 'REFERENCE' | translate }}: {{ filters.filterMaster }} -
-
- {{ 'START' | translate }}: {{ filters.dateRange.start | shortDate }} -
-
- {{ 'END' | translate }}: {{ filters.dateRange.end | shortDate }} -
-
- {{ 'TEMPORAL' | translate }}: {{ filters.temporalRange.start }} - {{ 'TO' | translate }} {{ filters.temporalRange.end }} -
-
- {{ 'PERPENDICULAR' | translate }}: - {{ filters.perpendicularRange.start }} {{ 'TO' | translate }} - {{ filters.perpendicularRange.end }} -
-
- {{ 'SEASON' | translate }}: {{ filters.season.start }} - {{ 'TO' | translate }} {{ filters.season.end }} -
+ @if (!!filters.filterMaster) { +
+ {{ 'REFERENCE' | translate }}: {{ filters.filterMaster }} +
+ } + @if (!!filters.dateRange.start) { +
+ {{ 'START' | translate }}: + {{ filters.dateRange.start | shortDate }} +
+ } + @if (!!filters.dateRange.end) { +
+ {{ 'END' | translate }}: {{ filters.dateRange.end | shortDate }} +
+ } + @if ( + filters.temporalRange.start !== null || filters.temporalRange.end !== null + ) { +
+ {{ 'TEMPORAL' | translate }}: {{ filters.temporalRange.start }} + {{ 'TO' | translate }} {{ filters.temporalRange.end }} +
+ } + @if ( + filters.perpendicularRange.start !== null || + filters.perpendicularRange.end !== null + ) { +
+ {{ 'PERPENDICULAR' | translate }}: + {{ filters.perpendicularRange.start }} {{ 'TO' | translate }} + {{ filters.perpendicularRange.end }} +
+ } + @if (filters.season.start !== null || filters.season.end !== null) { +
+ {{ 'SEASON' | translate }}: {{ filters.season.start }} + {{ 'TO' | translate }} {{ filters.season.end }} +
+ }
diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.ts index da7c50e0f..c7d7401ea 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/baseline-search-filters/baseline-search-filters.component.ts @@ -1,13 +1,15 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; import { BaselineFiltersType } from '@models'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-baseline-search-filters', templateUrl: './baseline-search-filters.component.html', styleUrls: ['./baseline-search-filters.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: false, + imports: [ShortDatePipe, TranslateModule], }) export class BaselineSearchFiltersComponent { @Input() filters: BaselineFiltersType; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts index af8df0308..bf156b982 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/displacement-filters/displacement-filters.component.ts @@ -1,11 +1,14 @@ import { Component, Input } from '@angular/core'; import { DisplacementFiltersType } from '@models'; +import { KeyValuePipe } from '@angular/common'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-displacement-filters', templateUrl: './displacement-filters.component.html', styleUrl: './displacement-filters.component.scss', - standalone: false, + imports: [KeyValuePipe, ShortDatePipe, TranslateModule], }) export class DisplacementFiltersComponent { @Input() filters: DisplacementFiltersType; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.html index eb9cf4ad0..ded225085 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.html @@ -1,102 +1,163 @@ -
-
- {{ 'DATASET' | translate }}: {{ filters.selectedDataset }} -
-
- {{ 'SEARCH_AREA' | translate }}: - {{ showSearchAreaType(filters.polygon) }} -
-
- {{ 'START' | translate }}: {{ filters.dateRange.start | shortDate }} -
-
- {{ 'END' | translate }}: {{ filters.dateRange.end | shortDate }} -
-
- {{ 'PATH' | translate }}: {{ filters.pathRange.start }} - - {{ filters.pathRange.end }} -
-
- {{ 'FRAME' | translate }}: {{ filters.frameRange.start }} - - {{ filters.frameRange.end }} -
-
- {{ 'SEASON' | translate }}: {{ filters.season.start }} - - {{ filters.season.end }} -
-
- {{ 'FILE_TYPES' | translate }}: - {{ formatTypesList(filters.productTypes) }} -
-
- {{ 'BEAM_MODES' | translate }}: {{ filters.beamModes }} -
-
- {{ 'POLARIZATIONS' | translate }}: {{ filters.polarizations }} -
-
- {{ 'FLIGHT_DIR' | translate }}: {{ filters.flightDirections }} -
-
- {{ 'DATASET_SUBTYPES' | translate }}: - {{ formatTypesList(filters.subtypes) }} -
-
- {{ 'CAMPAIGN' | translate }}: {{ filters.selectedMission }} -
-
- {{ 'CAMPAIGN' | translate }}: {{ filters.selectedMission }} -
-
- {{ 'FULL_BURST_ID' | translate }}: {{ filters.fullBurstIDs }} -
-
- {{ 'OPERA_BURST_ID' | translate }}: {{ filters.operaBurstIDs }} -
-
- {{ 'DATA_TYPE' | translate }}: {{ 'CALIBRATION' | translate }} -
-
- {{ 'SHORT_NAMES' | translate }}: {{ filters.shortNames }} -
-
- {{ 'SCIENCE_PRODUCT' | translate }}: - {{ filters.scienceProduct | join: ', ' }} -
-
- {{ 'PRODUCTION_CONFIGURATION' | translate }}: - {{ filters.productionConfig }} -
-
- {{ 'SIDE_POLARIZATIONS' | translate }}: - {{ filters.sidePolarizations }} -
-
- {{ 'FRAME_COVERAGE' | translate }}: {{ filters.frameCoverage }} -
-
- {{ 'RANGE_BANDWIDTH' | translate }}: {{ filters.rangeBandwidth }} -
-
- {{ 'GROUP_ID_INFO_BAR' | translate }}: {{ filters.groupID }} -
-
- {{ 'INSTRUMENTS' | translate }}: {{ filters.instrument }} -
-
- {{ 'FRAME_COVERAGE' | translate }}: {{ filters.frameCoverage }} -
-
- {{ 'RANGE_BANDWIDTH' | translate }}: {{ filters.rangeBandwidth }} -
-
- {{ 'DATA_TYPE' | translate }}: - {{ 'JOINT_OBSERVATION_ONLY' | translate }} -
-
+@if (!noFilters(filters)) { +
+ @if (!!filters.selectedDataset) { +
+ {{ 'DATASET' | translate }}: {{ filters.selectedDataset }} +
+ } + @if (!!filters.polygon) { +
+ {{ 'SEARCH_AREA' | translate }}: + {{ showSearchAreaType(filters.polygon) }} +
+ } + @if (!!filters.dateRange.start) { +
+ {{ 'START' | translate }}: + {{ filters.dateRange.start | shortDate }} +
+ } + @if (!!filters.dateRange.end) { +
+ {{ 'END' | translate }}: {{ filters.dateRange.end | shortDate }} +
+ } + @if (filters.pathRange.start || filters.pathRange.end) { +
+ {{ 'PATH' | translate }}: {{ filters.pathRange.start }} - + {{ filters.pathRange.end }} +
+ } + @if (filters.frameRange.start || filters.frameRange.end) { +
+ {{ 'FRAME' | translate }}: {{ filters.frameRange.start }} - + {{ filters.frameRange.end }} +
+ } + @if (filters.season.start || filters.season.end) { +
+ {{ 'SEASON' | translate }}: {{ filters.season.start }} - + {{ filters.season.end }} +
+ } + @if (filters.productTypes.length) { +
+ {{ 'FILE_TYPES' | translate }}: + {{ formatTypesList(filters.productTypes) }} +
+ } + @if (filters.beamModes.length) { +
+ {{ 'BEAM_MODES' | translate }}: {{ filters.beamModes }} +
+ } + @if (filters.polarizations.length) { +
+ {{ 'POLARIZATIONS' | translate }}: {{ filters.polarizations }} +
+ } + @if (filters.flightDirections.length) { +
+ {{ 'FLIGHT_DIR' | translate }}: {{ filters.flightDirections }} +
+ } + @if (filters.subtypes.length) { +
+ {{ 'DATASET_SUBTYPES' | translate }}: + {{ formatTypesList(filters.subtypes) }} +
+ } + @if (filters.selectedMission) { +
+ {{ 'CAMPAIGN' | translate }}: {{ filters.selectedMission }} +
+ } + @if (filters.selectedMission) { +
+ {{ 'CAMPAIGN' | translate }}: {{ filters.selectedMission }} +
+ } + @if (filters.fullBurstIDs.length) { +
+ {{ 'FULL_BURST_ID' | translate }}: {{ filters.fullBurstIDs }} +
+ } + @if (filters.operaBurstIDs.length) { +
+ {{ 'OPERA_BURST_ID' | translate }}: {{ filters.operaBurstIDs }} +
+ } + @if (filters.useCalibrationData) { +
+ {{ 'DATA_TYPE' | translate }}: {{ 'CALIBRATION' | translate }} +
+ } + @if (!!filters.shortNames.length) { +
+ {{ 'SHORT_NAMES' | translate }}: {{ filters.shortNames }} +
+ } + @if (filters.scienceProduct.length) { +
+ {{ 'SCIENCE_PRODUCT' | translate }}: + {{ filters.scienceProduct | join: ', ' }} +
+ } + @if (filters.productionConfig.length) { +
+ {{ 'PRODUCTION_CONFIGURATION' | translate }}: + {{ filters.productionConfig }} +
+ } + @if (filters.sidePolarizations.length) { +
+ {{ 'SIDE_POLARIZATIONS' | translate }}: + {{ filters.sidePolarizations }} +
+ } + @if (filters.frameCoverage.length) { +
+ {{ 'FRAME_COVERAGE' | translate }}: {{ filters.frameCoverage }} +
+ } + @if (filters.rangeBandwidth.length) { +
+ {{ 'RANGE_BANDWIDTH' | translate }}: {{ filters.rangeBandwidth }} +
+ } + @if (!!filters.groupID) { +
+ {{ 'GROUP_ID_INFO_BAR' | translate }}: {{ filters.groupID }} +
+ } + @if (filters.instrument.length) { +
+ {{ 'INSTRUMENTS' | translate }}: {{ filters.instrument }} +
+ } + @if (filters.frameCoverage.length) { +
+ {{ 'FRAME_COVERAGE' | translate }}: {{ filters.frameCoverage }} +
+ } + @if (filters.rangeBandwidth.length) { +
+ {{ 'RANGE_BANDWIDTH' | translate }}: {{ filters.rangeBandwidth }} +
+ } + @if (filters.jointObservation) { +
+ {{ 'DATA_TYPE' | translate }}: + {{ 'JOINT_OBSERVATION_ONLY' | translate }} +
+ } +
+} -
- - {{ 'NO_FILTERS' | translate }} - -
+@if (noFilters(filters)) { +
+ + {{ 'NO_FILTERS' | translate }} + +
+} diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.ts index 5615f07ca..eb922106c 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/geographic-search-filters/geographic-search-filters.component.ts @@ -1,13 +1,16 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; import { GeographicFiltersType, ProductType } from '@models'; +import { ShortDatePipe } from '@pipes/short-date.pipe'; +import { JoinPipe } from '@pipes/join.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-geographic-search-filters', templateUrl: './geographic-search-filters.component.html', styleUrls: ['./geographic-search-filters.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: false, + imports: [ShortDatePipe, JoinPipe, TranslateModule], }) export class GeographicSearchFiltersComponent { @Input() filters: GeographicFiltersType; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.html index 3954bcb4b..ca0a91d49 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.html @@ -1,11 +1,17 @@
-
- {{ 'LIST_TYPE' | translate }} {{ filters.listType }} -
+ @if (filters.listType) { +
+ {{ 'LIST_TYPE' | translate }} {{ filters.listType }} +
+ } -
-
- {{ item }} + @if (filters.listType) { +
+ @for (item of filters.list; track item) { +
+ {{ item }} +
+ }
-
+ }
diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.ts index a703ed1d3..8464f903d 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/list-search-filters/list-search-filters.component.ts @@ -1,13 +1,14 @@ import { Component, Input, ChangeDetectionStrategy } from '@angular/core'; import { ListFiltersType } from '@models'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-list-search-filters', templateUrl: './list-search-filters.component.html', styleUrls: ['./list-search-filters.component.scss'], changeDetection: ChangeDetectionStrategy.OnPush, - standalone: false, + imports: [TranslateModule], }) export class ListSearchFiltersComponent { @Input() filters: ListFiltersType; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.html index 2053a1b7e..2efa9f750 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.html @@ -1,21 +1,32 @@
-
- {{ 'REFERENCE' | translate }}: {{ filters.reference }} -
-
- {{ 'CUSTOM_PAIRS' | translate }}: {{ filters.customPairIds.length }} -
-
- {{ 'TEMPORAL' | translate }}: {{ filters.temporalRange.start }} - {{ 'TO' | translate }} {{ filters.temporalRange.end }} -
-
- {{ 'PERPENDICULAR' | translate }}: {{ filters.perpendicular }} -
-
- {{ 'SEASON' | translate }}: {{ filters.season.start }} - {{ 'TO' | translate }} {{ filters.season.end }} -
+ @if (!!filters.reference) { +
+ {{ 'REFERENCE' | translate }}: {{ filters.reference }} +
+ } + @if (!!filters.customPairIds && filters.customPairIds.length !== 0) { +
+ {{ 'CUSTOM_PAIRS' | translate }}: + {{ filters.customPairIds.length }} +
+ } + @if (filters.temporalRange !== null) { +
+ {{ 'TEMPORAL' | translate }}: {{ filters.temporalRange.start }} + {{ 'TO' | translate }} {{ filters.temporalRange.end }} +
+ } + @if (filters.perpendicular !== null) { +
+ {{ 'PERPENDICULAR' | translate }}: {{ filters.perpendicular }} +
+ } + @if (filters.season.start !== null || filters.season.end !== null) { +
+ {{ 'SEASON' | translate }}: {{ filters.season.start }} + {{ 'TO' | translate }} {{ filters.season.end }} +
+ }
{{ 'PAIR_OVERLAP_THRESHOLD' | translate }}: {{ filters.thresholdOverlap }} diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.ts index b8043dbd5..902a5daee 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/sbas-search-filters/sbas-search-filters.component.ts @@ -1,11 +1,12 @@ import { Component, Input } from '@angular/core'; import { SbasFiltersType } from '@models'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-sbas-search-filters', templateUrl: './sbas-search-filters.component.html', styleUrls: ['./sbas-search-filters.component.scss'], - standalone: false, + imports: [TranslateModule], }) export class SbasSearchFiltersComponent { @Input() filters: SbasFiltersType; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html index 84c74a325..ee6e26303 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.html @@ -1,30 +1,27 @@
- - + @if (search.searchType === SearchType.LIST) { + + + } - - + @if (search.searchType === SearchType.DATASET) { + + + } - - + @if (search.searchType === SearchType.BASELINE) { + + + } - - - - + @if (search.searchType === SearchType.SBAS) { + + + } + @if (search.searchType === SearchType.DISPLACEMENT) { + + + }
diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.ts index 073697c11..24273908d 100644 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.component.ts @@ -1,12 +1,35 @@ import { Component, Input } from '@angular/core'; import * as models from '@models'; +import { ListSearchFiltersComponent } from './list-search-filters/list-search-filters.component'; +import { GeographicSearchFiltersComponent } from './geographic-search-filters/geographic-search-filters.component'; +import { BaselineSearchFiltersComponent } from './baseline-search-filters/baseline-search-filters.component'; +import { SbasSearchFiltersComponent } from './sbas-search-filters/sbas-search-filters.component'; +import { DisplacementFiltersComponent } from './displacement-filters/displacement-filters.component'; +import { + DisplacementFilterPipe, + BaselineFilterPipe, + SBASFilterPipe, + GeographicFilterPipe, + ListFilterPipe, +} from '@pipes/filter-type.pipe'; @Component({ selector: 'app-search-filters', templateUrl: './search-filters.component.html', styleUrls: ['./search-filters.component.scss'], - standalone: false, + imports: [ + ListSearchFiltersComponent, + GeographicSearchFiltersComponent, + BaselineSearchFiltersComponent, + SbasSearchFiltersComponent, + DisplacementFiltersComponent, + DisplacementFilterPipe, + BaselineFilterPipe, + SBASFilterPipe, + GeographicFilterPipe, + ListFilterPipe, + ], }) export class SearchFiltersComponent { @Input() search: models.Search; diff --git a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts b/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts deleted file mode 100644 index 74ca48016..000000000 --- a/src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { SearchFiltersComponent } from './search-filters.component'; - -import { PipesModule } from '@pipes'; -import { GeographicSearchFiltersComponent } from './geographic-search-filters/geographic-search-filters.component'; -import { ListSearchFiltersComponent } from './list-search-filters/list-search-filters.component'; -import { BaselineSearchFiltersComponent } from './baseline-search-filters/baseline-search-filters.component'; -import { SbasSearchFiltersComponent } from './sbas-search-filters/sbas-search-filters.component'; -import { DisplacementFiltersComponent } from './displacement-filters/displacement-filters.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ - SearchFiltersComponent, - GeographicSearchFiltersComponent, - ListSearchFiltersComponent, - BaselineSearchFiltersComponent, - SbasSearchFiltersComponent, - DisplacementFiltersComponent, - ], - imports: [CommonModule, PipesModule, SharedModule], - exports: [ - SearchFiltersComponent, - GeographicSearchFiltersComponent, - ListSearchFiltersComponent, - BaselineSearchFiltersComponent, - SbasSearchFiltersComponent, - ], -}) -export class SearchFiltersModule {} diff --git a/src/app/components/sidebar/saved-searches/saved-searches.component.html b/src/app/components/sidebar/saved-searches/saved-searches.component.html index 7bf240c41..b6d151062 100644 --- a/src/app/components/sidebar/saved-searches/saved-searches.component.html +++ b/src/app/components/sidebar/saved-searches/saved-searches.component.html @@ -6,12 +6,12 @@ >
- {{ - 'SAVED_SEARCHES' | translate - }} - {{ - 'SEARCH_HISTORY' | translate - }} + @if (sidebarType === SidebarType.SAVED_SEARCHES) { + {{ 'SAVED_SEARCHES' | translate }} + } + @if (sidebarType === SidebarType.SEARCH_HISTORY) { + {{ 'SEARCH_HISTORY' | translate }} + }
@@ -58,58 +58,60 @@
- + @if ( + sidebarType === SidebarType.SAVED_SEARCHES && + (searchType$ | async) !== SearchType.CUSTOM_PRODUCTS + ) { + + }
-
-
-
-
- - + @if (searchType$ | async; as searchType) { +
+ @if ((searches$ | async).length > 0) { +
+ @for (search of searches$ | async; track search) { +
+ @if (filteredSearches.has(search.id)) { +
+ + +
+ } +
+ }
-
+ } @else { +
+

{{ 'YOU_HAVE_NO_SAVED_SEARCHES' | translate }}

+
+ }
- -
-

{{ 'YOU_HAVE_NO_SAVED_SEARCHES' | translate }}

-
- -
+ }
- - + @if ( + sidebar === SidebarType.SAVED_SEARCHES || + sidebar === SidebarType.SEARCH_HISTORY + ) { + + } - - + @if (sidebar === SidebarType.USER_FILTERS) { + + }
diff --git a/src/app/components/sidebar/sidebar.component.ts b/src/app/components/sidebar/sidebar.component.ts index 33ee50b1c..908d7c61b 100644 --- a/src/app/components/sidebar/sidebar.component.ts +++ b/src/app/components/sidebar/sidebar.component.ts @@ -6,12 +6,14 @@ import { AppState } from '@store'; import * as uiStore from '@store/ui'; import * as models from '@models'; +import { SavedSearchesComponent } from './saved-searches/saved-searches.component'; +import { SaveUserFiltersComponent } from './save-user-filters/save-user-filters.component'; @Component({ selector: 'app-sidebar', templateUrl: './sidebar.component.html', styleUrls: ['./sidebar.component.scss'], - standalone: false, + imports: [SavedSearchesComponent, SaveUserFiltersComponent], }) export class SidebarComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/sidebar/sidebar.module.ts b/src/app/components/sidebar/sidebar.module.ts deleted file mode 100644 index cbf5ca916..000000000 --- a/src/app/components/sidebar/sidebar.module.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { SavedSearchesModule } from './saved-searches'; -import { SaveUserFiltersModule } from './save-user-filters'; - -import { SidebarComponent } from './sidebar.component'; - -@NgModule({ - declarations: [SidebarComponent], - imports: [CommonModule, SavedSearchesModule, SaveUserFiltersModule], - exports: [SidebarComponent], -}) -export class SidebarModule {} diff --git a/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts index db5c46db4..0190a7831 100644 --- a/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts +++ b/src/app/components/timeseries-chart/timeseries-chart-config/timeseries-chart-config.component.ts @@ -16,11 +16,11 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SubSink } from 'subsink'; import * as chartsStore from '@store/charts'; -import { SharedModule } from '@shared'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-timeseries-chart-config', - imports: [MatIconModule, MatButtonModule, MatCheckboxModule, SharedModule], + imports: [MatIconModule, MatButtonModule, MatCheckboxModule, TranslateModule], templateUrl: './timeseries-chart-config.component.html', styleUrl: './timeseries-chart-config.component.scss', }) diff --git a/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts index c09c44644..f97a4711d 100644 --- a/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts +++ b/src/app/components/timeseries-chart/timeseries-chart-export/timeseries-chart-export.component.ts @@ -1,4 +1,3 @@ -import { CommonModule } from '@angular/common'; import { Component, Input, inject } from '@angular/core'; import { MatButtonModule } from '@angular/material/button'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; @@ -14,7 +13,6 @@ import { NetcdfService } from '@services'; @Component({ selector: 'app-timeseries-chart-export', imports: [ - CommonModule, MatDialogModule, MatIconModule, MatIconModule, diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html index fadeb6fce..01034ba55 100644 --- a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.html @@ -9,16 +9,12 @@ mat-button >
- north_west - south_west + @if (flightDirection === FlightDirections.ASCENDING) { + north_west + } + @if (flightDirection === FlightDirections.DESCENDING) { + south_west + } {{ flightDirection.toString() | translate }}
diff --git a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts index c74d6a0fd..ac0f11e0d 100644 --- a/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts +++ b/src/app/components/timeseries-chart/timeseries-chart-flight-direction-toggle/timeseries-chart-flight-direction-toggle.component.ts @@ -10,13 +10,11 @@ import { MatButtonModule } from '@angular/material/button'; import { MatIconModule } from '@angular/material/icon'; import { MatButtonToggleModule } from '@angular/material/button-toggle'; import { MatInputModule } from '@angular/material/input'; -import { DocsModalModule } from '@components/shared/docs-modal'; import { FormsModule } from '@angular/forms'; import { MatMenu, MatMenuItem, MatMenuTrigger } from '@angular/material/menu'; import { MatTooltip } from '@angular/material/tooltip'; import { Breakpoints } from '@models'; import { ScreenSizeService } from '@services'; -import { NgIf } from '@angular/common'; @Component({ selector: 'app-timeseries-chart-flight-direction-toggle', @@ -26,13 +24,11 @@ import { NgIf } from '@angular/common'; MatIconModule, MatButtonToggleModule, MatInputModule, - DocsModalModule, FormsModule, MatMenu, MatMenuItem, MatTooltip, MatMenuTrigger, - NgIf, ], templateUrl: './timeseries-chart-flight-direction-toggle.component.html', styleUrl: './timeseries-chart-flight-direction-toggle.component.scss', diff --git a/src/app/components/timeseries-chart/timeseries-chart.component.html b/src/app/components/timeseries-chart/timeseries-chart.component.html index f4eeb4eb2..0b37fd825 100644 --- a/src/app/components/timeseries-chart/timeseries-chart.component.html +++ b/src/app/components/timeseries-chart/timeseries-chart.component.html @@ -19,14 +19,16 @@ cdkScrollable itemSize="350" > -
-
- {{ item.seriesNumber }} + @for (item of bestFitItems; track item) { +
+
+ {{ item.seriesNumber }} +
+
+
{{ item.formula }}
+
-
-
{{ item.formula }}
-
-
+ }
>(Store); diff --git a/src/app/components/timeseries-chart/timeseries-chart.module.ts b/src/app/components/timeseries-chart/timeseries-chart.module.ts deleted file mode 100644 index f541d5fc4..000000000 --- a/src/app/components/timeseries-chart/timeseries-chart.module.ts +++ /dev/null @@ -1,42 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; - -import { TranslateModule } from '@ngx-translate/core'; -import { TimeseriesChartComponent } from './timeseries-chart.component'; -import { MatIconModule } from '@angular/material/icon'; -import { MatTableModule } from '@angular/material/table'; -import { ResizedEventModule } from '@directives/resized.directive'; -import { TimeseriesChartConfigComponent } from './timeseries-chart-config'; -import { ChartModalComponent } from '@components/shared/chart-modal/chart-modal.component'; -import { TimeseriesChartZoomComponent } from '@components/timeseries-chart/timeseries-chart-zoom/timeseries-chart-zoom.component'; -import { TimeseriesChartExportComponent } from '@components/timeseries-chart/timeseries-chart-export'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatMenuModule } from '@angular/material/menu'; -import { ContextMenuTriggerDirective } from '@directives/context-menu.directive'; -import { ScrollingModule } from '@angular/cdk/scrolling'; -import { TimeseriesChartTemporalSliderComponent } from '@components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component'; - -@NgModule({ - declarations: [TimeseriesChartComponent, ContextMenuTriggerDirective], - imports: [ - CommonModule, - MatSharedModule, - TranslateModule, - MatTableModule, - MatIconModule, - ResizedEventModule, - MatSharedModule, - ChartModalComponent, - TimeseriesChartConfigComponent, - TimeseriesChartZoomComponent, - TimeseriesChartExportComponent, - MatProgressSpinnerModule, - MatMenuModule, - ScrollingModule, - TimeseriesChartTemporalSliderComponent, - ], - exports: [TimeseriesChartComponent], -}) -export class TimeseriesChartModule {} diff --git a/src/app/directives/context-menu.directive.ts b/src/app/directives/context-menu.directive.ts index 525ae3efc..99f7e5642 100644 --- a/src/app/directives/context-menu.directive.ts +++ b/src/app/directives/context-menu.directive.ts @@ -7,10 +7,7 @@ import { OnInit, } from '@angular/core'; -@Directive({ - selector: '[contextMenuTriggerFor]', - standalone: false, -}) +@Directive({ selector: '[contextMenuTriggerFor]' }) export class ContextMenuTriggerDirective extends MatMenuTrigger implements OnInit diff --git a/src/app/directives/file-download.directive.ts b/src/app/directives/file-download.directive.ts index 597110d9e..ba34f9b67 100644 --- a/src/app/directives/file-download.directive.ts +++ b/src/app/directives/file-download.directive.ts @@ -24,7 +24,6 @@ export const SAMEORIGIN = new InjectionToken('asf.sameorigin.regex', { @Directive({ selector: 'a[appFileDownload]', exportAs: 'fileDownload', - standalone: false, }) export class FileDownloadDirective implements OnDestroy { private sameOrigin = inject(SAMEORIGIN); diff --git a/src/app/directives/onlynumber.directive.ts b/src/app/directives/onlynumber.directive.ts index c0d848023..550383254 100644 --- a/src/app/directives/onlynumber.directive.ts +++ b/src/app/directives/onlynumber.directive.ts @@ -1,9 +1,6 @@ import { Directive, ElementRef, HostListener, inject } from '@angular/core'; -@Directive({ - selector: '[appOnlynumber]', - standalone: false, -}) +@Directive({ selector: '[appOnlynumber]' }) export class OnlynumberDirective { el = inject(ElementRef); diff --git a/src/app/directives/resized.directive.ts b/src/app/directives/resized.directive.ts index 1606c4f23..469014083 100644 --- a/src/app/directives/resized.directive.ts +++ b/src/app/directives/resized.directive.ts @@ -1,5 +1,4 @@ import { - NgModule, Directive, ElementRef, EventEmitter, @@ -25,10 +24,7 @@ export class ResizedEvent { } } -@Directive({ - selector: '[resized]', - standalone: false, -}) +@Directive({ selector: '[resized]' }) export class ResizedDirective implements OnInit, OnDestroy { private readonly element = inject(ElementRef); private readonly zone = inject(NgZone); @@ -61,10 +57,3 @@ export class ResizedDirective implements OnInit, OnDestroy { this.resized.emit(resizedEvent); } } - -@NgModule({ - declarations: [ResizedDirective], - imports: [], - exports: [ResizedDirective], -}) -export class ResizedEventModule {} diff --git a/src/app/models/cmr-product.model.ts b/src/app/models/cmr-product.model.ts index 2712df442..932589849 100644 --- a/src/app/models/cmr-product.model.ts +++ b/src/app/models/cmr-product.model.ts @@ -78,7 +78,7 @@ export interface CMRProductMetadata { additionalUrls?: string[] | null; s3URI?: string; s3Urls?: string[] | null; - fileSizes?: {} | null; + fileSizes?: Record | null; parentID: string; // ARIA S1 GUNW diff --git a/src/app/models/hyp3/hyp3-jobs.model.ts b/src/app/models/hyp3/hyp3-jobs.model.ts index 4090f435e..186491ed9 100644 --- a/src/app/models/hyp3/hyp3-jobs.model.ts +++ b/src/app/models/hyp3/hyp3-jobs.model.ts @@ -312,7 +312,8 @@ export const AutoRift: Hyp3JobType = { export const AriaS1GunwJobType = { id: 'ARIA_S1_GUNW', name: 'ARIA_S1_GUNW', - infoUrl: 'https://hyp3-docs.asf.alaska.edu/products/#autorift', + infoUrl: + 'https://hyp3-docs.asf.alaska.edu/guides/gunw_product_guide/#aria-sentinel-1-gunw-product-guide', description: 'ARIAS1GUNW_JOB_TYPE_DESC', numProducts: 2, productTypes: [ diff --git a/src/app/pipes/aoi-icon.pipe.ts b/src/app/pipes/aoi-icon.pipe.ts index 80a726aaa..003698d0d 100644 --- a/src/app/pipes/aoi-icon.pipe.ts +++ b/src/app/pipes/aoi-icon.pipe.ts @@ -4,7 +4,6 @@ import { MapDrawModeType } from '@models'; @Pipe({ name: 'aoiIcon', pure: false, - standalone: false, }) export class AoiIconPipe implements PipeTransform { public icon: string; diff --git a/src/app/pipes/dynamic-moment.ts b/src/app/pipes/dynamic-moment.ts index b5907b3d6..3607036cc 100644 --- a/src/app/pipes/dynamic-moment.ts +++ b/src/app/pipes/dynamic-moment.ts @@ -3,10 +3,7 @@ import { TranslateService } from '@ngx-translate/core'; import moment from 'moment'; import { BehaviorSubject } from 'rxjs'; -@Pipe({ - name: 'dynamicMoment', - standalone: false, -}) +@Pipe({ name: 'dynamicMoment' }) export class MomentPipe implements PipeTransform { private translate = inject(TranslateService); diff --git a/src/app/pipes/filter-extension.pipe.ts b/src/app/pipes/filter-extension.pipe.ts index 21754e4d6..c58ed2d90 100644 --- a/src/app/pipes/filter-extension.pipe.ts +++ b/src/app/pipes/filter-extension.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'filterExtension', - standalone: false, -}) +@Pipe({ name: 'filterExtension' }) export class FilterExtensionPipe implements PipeTransform { transform(input: string): string { return input?.split('.')[0]; diff --git a/src/app/pipes/filter-type.pipe.ts b/src/app/pipes/filter-type.pipe.ts index 3213f3361..acdd21990 100644 --- a/src/app/pipes/filter-type.pipe.ts +++ b/src/app/pipes/filter-type.pipe.ts @@ -5,62 +5,37 @@ import { GeographicFiltersType, ListFiltersType, SbasFiltersType, - TimeseriesFiltersType, DisplacementFiltersType, } from '@models'; -@Pipe({ - name: 'baselineFilter', - standalone: false, -}) +@Pipe({ name: 'baselineFilter' }) export class BaselineFilterPipe implements PipeTransform { transform(input: FilterType): BaselineFiltersType { return input as BaselineFiltersType; } } -@Pipe({ - name: 'SBASFilter', - standalone: false, -}) +@Pipe({ name: 'SBASFilter' }) export class SBASFilterPipe implements PipeTransform { transform(input: FilterType): SbasFiltersType { return input as SbasFiltersType; } } -@Pipe({ - name: 'TimeseriesFilter', - standalone: false, -}) -export class TimeseriesFilterPipe implements PipeTransform { - transform(input: FilterType): TimeseriesFiltersType { - return input as TimeseriesFiltersType; - } -} -@Pipe({ - name: 'geographicFilter', - standalone: false, -}) +@Pipe({ name: 'geographicFilter' }) export class GeographicFilterPipe implements PipeTransform { transform(input: FilterType): GeographicFiltersType { return input as GeographicFiltersType; } } -@Pipe({ - name: 'listFilter', - standalone: false, -}) +@Pipe({ name: 'listFilter' }) export class ListFilterPipe implements PipeTransform { transform(input: FilterType): ListFiltersType { return input as ListFiltersType; } } -@Pipe({ - name: 'displacementFilter', - standalone: false, -}) +@Pipe({ name: 'displacementFilter' }) export class DisplacementFilterPipe implements PipeTransform { transform(input: FilterType): DisplacementFiltersType { return input as DisplacementFiltersType; diff --git a/src/app/pipes/float-precision.pipe.ts b/src/app/pipes/float-precision.pipe.ts index 17afe5494..1df0ed7b7 100644 --- a/src/app/pipes/float-precision.pipe.ts +++ b/src/app/pipes/float-precision.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'floatPrecision', - standalone: false, -}) +@Pipe({ name: 'floatPrecision' }) export class FloatPrecisionPipe implements PipeTransform { transform(input: number, precision = 2): string { return input.toFixed(precision); diff --git a/src/app/pipes/html-input-value.pipe.ts b/src/app/pipes/html-input-value.pipe.ts index c16cf9f4a..e427812a5 100644 --- a/src/app/pipes/html-input-value.pipe.ts +++ b/src/app/pipes/html-input-value.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'htmlInputValue', - standalone: false, -}) +@Pipe({ name: 'htmlInputValue' }) export class HTMLInputValuePipe implements PipeTransform { transform(input: Event): string { return (input.target as HTMLInputElement).value; diff --git a/src/app/pipes/index.ts b/src/app/pipes/index.ts index 382548461..e69de29bb 100644 --- a/src/app/pipes/index.ts +++ b/src/app/pipes/index.ts @@ -1 +0,0 @@ -export { PipesModule } from './pipes.module'; diff --git a/src/app/pipes/join.pipe.ts b/src/app/pipes/join.pipe.ts index 9bb07cf33..e9d834c59 100644 --- a/src/app/pipes/join.pipe.ts +++ b/src/app/pipes/join.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'join', - standalone: false, -}) +@Pipe({ name: 'join' }) export class JoinPipe implements PipeTransform { transform(input: any[], delimiter = ''): string { return input.join(delimiter); diff --git a/src/app/pipes/pipes.module.ts b/src/app/pipes/pipes.module.ts deleted file mode 100644 index c179b8cd6..000000000 --- a/src/app/pipes/pipes.module.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { ReadableSizeFromBytesPipe } from './readable-size-from-bytes.pipe'; -import { - ShortDatePipe, - ShortDateTimePipe, - FullDatePipe, - ShortDateSeasonPipe, -} from './short-date.pipe'; -import { MomentPipe } from '@pipes/dynamic-moment'; -import { JoinPipe } from './join.pipe'; -import { - BaselineFilterPipe, - SBASFilterPipe, - GeographicFilterPipe, - ListFilterPipe, - DisplacementFilterPipe, -} from './filter-type.pipe'; -import { HTMLInputValuePipe } from './html-input-value.pipe'; -import { QuakePipe, VolcanoPipe } from './sarviews-event.pipe'; -import { FilterExtensionPipe } from './filter-extension.pipe'; -import { FloatPrecisionPipe } from './float-precision.pipe'; -import { AoiIconPipe } from './aoi-icon.pipe'; -import { PolarizationCountPipe } from './polarization.pipe'; -@NgModule({ - declarations: [ - ReadableSizeFromBytesPipe, - ShortDatePipe, - ShortDateTimePipe, - ShortDateSeasonPipe, - FullDatePipe, - MomentPipe, - JoinPipe, - BaselineFilterPipe, - SBASFilterPipe, - GeographicFilterPipe, - ListFilterPipe, - DisplacementFilterPipe, - HTMLInputValuePipe, - QuakePipe, - VolcanoPipe, - FilterExtensionPipe, - FloatPrecisionPipe, - AoiIconPipe, - PolarizationCountPipe, - ], - imports: [CommonModule], - exports: [ - ReadableSizeFromBytesPipe, - ShortDatePipe, - ShortDateTimePipe, - ShortDateSeasonPipe, - FullDatePipe, - MomentPipe, - DisplacementFilterPipe, - JoinPipe, - BaselineFilterPipe, - SBASFilterPipe, - GeographicFilterPipe, - ListFilterPipe, - HTMLInputValuePipe, - QuakePipe, - VolcanoPipe, - FilterExtensionPipe, - FloatPrecisionPipe, - AoiIconPipe, - PolarizationCountPipe, - ], -}) -export class PipesModule {} diff --git a/src/app/pipes/polarization.pipe.ts b/src/app/pipes/polarization.pipe.ts index 808e32207..c67ecdf37 100644 --- a/src/app/pipes/polarization.pipe.ts +++ b/src/app/pipes/polarization.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'polarizationCount', - standalone: false, -}) +@Pipe({ name: 'polarizationCount' }) export class PolarizationCountPipe implements PipeTransform { transform(input: string): string { const count = (input.match(/,/g) || []).length; diff --git a/src/app/pipes/readable-size-from-bytes.pipe.ts b/src/app/pipes/readable-size-from-bytes.pipe.ts index c0f5bbb99..ee6d41270 100644 --- a/src/app/pipes/readable-size-from-bytes.pipe.ts +++ b/src/app/pipes/readable-size-from-bytes.pipe.ts @@ -1,9 +1,6 @@ import { Pipe, PipeTransform } from '@angular/core'; -@Pipe({ - name: 'readableSizeFromBytes', - standalone: false, -}) +@Pipe({ name: 'readableSizeFromBytes' }) export class ReadableSizeFromBytesPipe implements PipeTransform { transform(bytes: string | number): string { return this.getReadableSize(+bytes); diff --git a/src/app/pipes/sarviews-event.pipe.ts b/src/app/pipes/sarviews-event.pipe.ts index 1c91782cc..52d80c13c 100644 --- a/src/app/pipes/sarviews-event.pipe.ts +++ b/src/app/pipes/sarviews-event.pipe.ts @@ -5,20 +5,14 @@ import { SarviewsVolcanicEvent, } from '@models'; -@Pipe({ - name: 'quakeEvent', - standalone: false, -}) +@Pipe({ name: 'quakeEvent' }) export class QuakePipe implements PipeTransform { transform(input: SarviewsEvent): SarviewsQuakeEvent { return input as SarviewsQuakeEvent; } } -@Pipe({ - name: 'volcanicEvent', - standalone: false, -}) +@Pipe({ name: 'volcanicEvent' }) export class VolcanoPipe implements PipeTransform { transform(input: SarviewsEvent): SarviewsVolcanicEvent { return input as SarviewsVolcanicEvent; diff --git a/src/app/pipes/short-date.pipe.ts b/src/app/pipes/short-date.pipe.ts index 0cdda251e..6317ca5b5 100644 --- a/src/app/pipes/short-date.pipe.ts +++ b/src/app/pipes/short-date.pipe.ts @@ -5,7 +5,6 @@ import * as moment from 'moment'; @Pipe({ name: 'fullDate', pure: false, - standalone: false, }) export class FullDatePipe implements PipeTransform { private translateService = inject(TranslateService); @@ -20,7 +19,6 @@ export class FullDatePipe implements PipeTransform { @Pipe({ name: 'shortDate', pure: false, - standalone: false, }) export class ShortDatePipe implements PipeTransform { private translateService = inject(TranslateService); @@ -35,7 +33,6 @@ export class ShortDatePipe implements PipeTransform { @Pipe({ name: 'shortDateTime', pure: false, - standalone: false, }) export class ShortDateTimePipe implements PipeTransform { private translateService = inject(TranslateService); @@ -50,7 +47,6 @@ export class ShortDateTimePipe implements PipeTransform { @Pipe({ name: 'shortDateSeason', pure: false, - standalone: false, }) export class ShortDateSeasonPipe implements PipeTransform { private translateService = inject(TranslateService); diff --git a/src/app/services/displacement-disclaimer.service.ts b/src/app/services/displacement-disclaimer.service.ts new file mode 100644 index 000000000..5637611de --- /dev/null +++ b/src/app/services/displacement-disclaimer.service.ts @@ -0,0 +1,20 @@ +import { inject, Injectable } from '@angular/core'; +import { MatDialog } from '@angular/material/dialog'; +import { Observable } from 'rxjs'; +import { DispDataDisclaimerComponent } from '@components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component'; + +@Injectable({ providedIn: 'root' }) +export class DisplacementDisclaimerService { + private dialog = inject(MatDialog); + + open(): Observable { + return this.dialog + .open(DispDataDisclaimerComponent, { + width: '550px', + height: '325px', + maxWidth: '550px', + maxHeight: '500px', + }) + .afterClosed(); + } +} diff --git a/src/app/services/hyp3/hyp3-api.service.ts b/src/app/services/hyp3/hyp3-api.service.ts index 40df86b7e..401cc953f 100644 --- a/src/app/services/hyp3/hyp3-api.service.ts +++ b/src/app/services/hyp3/hyp3-api.service.ts @@ -5,7 +5,17 @@ import { HttpParams, } from '@angular/common/http'; -import { Observable, of, first, catchError, map, forkJoin } from 'rxjs'; +import { + Observable, + of, + first, + catchError, + map, + forkJoin, + from, + Subject, +} from 'rxjs'; +import { mergeMap, toArray, bufferCount, tap, finalize } from 'rxjs/operators'; import * as moment from 'moment'; import * as models from '@models'; @@ -15,6 +25,22 @@ import { NotificationService } from '../notification.service'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; +export interface RenameProgressInfo { + percent: number; + estimatedSecondsRemaining: number | null; +} + +export interface RenameResult { + success: number; + failed: number; + failedProjectNames: string[]; +} + +export interface RenameWithProgressResult { + progress$: Observable; + result$: Observable; +} + @Injectable({ providedIn: 'root', }) @@ -157,6 +183,118 @@ export class Hyp3ApiService { ); } + public updateJobName$( + jobId: string, + newProjectName: string, + ): Observable { + const url = `${this.apiUrl}/jobs/${jobId}`; + + if (!newProjectName) { + newProjectName = null; + } + + return this.http + .patch( + url, + { name: newProjectName }, + { withCredentials: true }, + ) + .pipe(map((resp) => resp as models.Hyp3Job)); + } + + /** + * Updates job names with progress reporting. + * Returns an object with: + * - progress$: Observable that emits progress info (percent and estimated time) as batches complete + * - result$: Observable that emits the final result when all batches are done + */ + public updateJobsNameWithProgress$( + products: models.CMRProduct[], + newProjectName: string, + ): RenameWithProgressResult { + const url = `${this.apiUrl}/jobs`; + const totalJobs = products.length; + const batchSize = 100; + const concurrentBatches = 3; + const totalBatches = Math.ceil(totalJobs / batchSize); + + if (!newProjectName) { + newProjectName = null; + } + + const progressSubject = new Subject(); + let completedBatches = 0; + let successCount = 0; + let failedCount = 0; + const failedProjectNamesSet = new Set(); + const startTime = Date.now(); + + const result$ = from(products).pipe( + bufferCount(batchSize), + mergeMap((productsBatch) => { + const jobIdsBatch = productsBatch.map((p) => p.metadata.job.job_id); + return this.http + .patch( + url, + { name: newProjectName, job_ids: jobIdsBatch }, + { withCredentials: true }, + ) + .pipe( + map(() => ({ + success: jobIdsBatch.length, + failed: 0, + failedProducts: [] as models.CMRProduct[], + })), + catchError(() => + of({ + success: 0, + failed: jobIdsBatch.length, + failedProducts: productsBatch, + }), + ), + tap((batchResult) => { + completedBatches++; + successCount += batchResult.success; + failedCount += batchResult.failed; + // Track failed project names + batchResult.failedProducts.forEach((product) => { + const projectName = product.metadata?.job?.name || '(unnamed)'; + failedProjectNamesSet.add(projectName); + }); + const percent = Math.round( + (completedBatches / totalBatches) * 100, + ); + + // Calculate estimated time remaining + let estimatedSecondsRemaining: number | null = null; + if (completedBatches > 0) { + const elapsedMs = Date.now() - startTime; + const msPerBatch = elapsedMs / completedBatches; + const remainingBatches = totalBatches - completedBatches; + estimatedSecondsRemaining = Math.ceil( + (msPerBatch * remainingBatches) / 1000, + ); + } + + progressSubject.next({ percent, estimatedSecondsRemaining }); + }), + ); + }, concurrentBatches), + toArray(), + map(() => ({ + success: successCount, + failed: failedCount, + failedProjectNames: Array.from(failedProjectNamesSet).sort(), + })), + finalize(() => progressSubject.complete()), + ); + + return { + progress$: progressSubject.asObservable(), + result$, + }; + } + public submitJobBatch$(jobBatch: object) { const submitJobUrl = `${this.apiUrl}/jobs`; diff --git a/src/app/services/hyp3/hyp3-job.service.ts b/src/app/services/hyp3/hyp3-job.service.ts index 217cc2c5d..adf65d60a 100644 --- a/src/app/services/hyp3/hyp3-job.service.ts +++ b/src/app/services/hyp3/hyp3-job.service.ts @@ -195,7 +195,7 @@ export class Hyp3JobService { return newJobProducts; } - private combineJobAndCmrProduct( + public combineJobAndCmrProduct( job: models.Hyp3Job, product: models.CMRProduct, ) { diff --git a/src/app/services/index.ts b/src/app/services/index.ts index f8a99d5da..28be0ca06 100644 --- a/src/app/services/index.ts +++ b/src/app/services/index.ts @@ -43,3 +43,4 @@ export { ExportService } from './export.service'; export { NetcdfService } from './netcdf-service.service'; export { PointHistoryService } from './point-history.service'; export { FrameMapService } from './frame-map.service'; +export { DisplacementDisclaimerService } from './displacement-disclaimer.service'; diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index 919fcac48..a395d915b 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -181,6 +181,8 @@ export class NotificationService { title = '', options: Partial = {}, ): ActiveToast { + // Intentionally uses warning() instead of error() to avoid bright red toast + // which was deemed too visually jarring for the UX return this.toastr.warning(message, title, { ...options, ...this.toastOptions, diff --git a/src/app/shared/index.ts b/src/app/shared/index.ts deleted file mode 100644 index e71c97646..000000000 --- a/src/app/shared/index.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './mat-shared.module'; -export * from './shared.module'; diff --git a/src/app/shared/mat-shared.module.ts b/src/app/shared/mat-shared.module.ts deleted file mode 100644 index 9f17805db..000000000 --- a/src/app/shared/mat-shared.module.ts +++ /dev/null @@ -1,31 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatButtonModule } from '@angular/material/button'; -import { MatCardModule } from '@angular/material/card'; -import { MatDividerModule } from '@angular/material/divider'; -import { MatIconModule } from '@angular/material/icon'; -import { MatListModule } from '@angular/material/list'; -import { MatTooltipModule } from '@angular/material/tooltip'; - -@NgModule({ - declarations: [], - imports: [ - CommonModule, - MatCardModule, - MatButtonModule, - MatIconModule, - MatListModule, - MatTooltipModule, - MatDividerModule, - ], - exports: [ - MatCardModule, - MatButtonModule, - MatIconModule, - MatListModule, - MatTooltipModule, - MatDividerModule, - ], -}) -export class MatSharedModule {} diff --git a/src/app/shared/shared.module.ts b/src/app/shared/shared.module.ts deleted file mode 100644 index 8c20a1393..000000000 --- a/src/app/shared/shared.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import '@formatjs/intl-displaynames/polyfill'; -import '@formatjs/intl-displaynames/locale-data/en'; -import '@formatjs/intl-displaynames/locale-data/es'; - -import { NgModule } from '@angular/core'; -// import { TranslateModule} from '@ngx-translate/core'; -import { CommonModule } from '@angular/common'; - -import { TranslateLoader, TranslateModule } from '@ngx-translate/core'; -import { TranslateHttpLoader } from '@ngx-translate/http-loader'; -import { HttpClient } from '@angular/common/http'; - -export function HttpLoaderFactory(http: HttpClient) { - return new TranslateHttpLoader(http); -} -@NgModule({ - imports: [ - CommonModule, - TranslateModule.forChild({ - loader: { - provide: TranslateLoader, - useFactory: HttpLoaderFactory, - deps: [HttpClient], - }, - }), - ], - exports: [TranslateModule], -}) -export class SharedModule {} diff --git a/src/app/store/scenes/scenes.action.ts b/src/app/store/scenes/scenes.action.ts index 3a9576994..441789bd1 100644 --- a/src/app/store/scenes/scenes.action.ts +++ b/src/app/store/scenes/scenes.action.ts @@ -29,6 +29,7 @@ export enum ScenesActionType { CLOSE_ZIP_CONTENTS = '[Scenes] Close Zip Contents', ADD_CMR_DATA_TO_ON_DEMAND_JOBS = '[Scenes] Add CMR Data to On Demand Jobs', + UPDATE_PRODUCT_WITH_NEW_PROJECT_NAME = '[Scenes] Update product with new project name', SET_SELECTED_SCENE = '[Scenes] Set Selected Scene', SET_SELECTED_PAIR = '[Scenes] Set Selected Pair', @@ -190,6 +191,12 @@ export class AddCmrDataToOnDemandScenes implements Action { constructor(public payload: CMRProductsById) {} } +export class UpdateProductWithNewProjectName implements Action { + public readonly type = ScenesActionType.UPDATE_PRODUCT_WITH_NEW_PROJECT_NAME; + + constructor(public payload: { productId: string; name: string }) {} +} + export type ScenesActions = | SetScenes | ClearScenes @@ -214,4 +221,5 @@ export type ScenesActions = | SetSarviewsEventProducts | SetSelectedSarviewProduct | AddCmrDataToOnDemandScenes + | UpdateProductWithNewProjectName | SetImageBrowseProducts; diff --git a/src/app/store/scenes/scenes.reducer.ts b/src/app/store/scenes/scenes.reducer.ts index f748f132c..4358fe9e1 100644 --- a/src/app/store/scenes/scenes.reducer.ts +++ b/src/app/store/scenes/scenes.reducer.ts @@ -184,6 +184,26 @@ export function scenesReducer( } } + case ScenesActionType.UPDATE_PRODUCT_WITH_NEW_PROJECT_NAME: { + const { productId, name } = action.payload; + const products = { ...state.products }; + + const toUpdate = products[productId]; + + products[productId] = { + ...toUpdate, + metadata: { + ...toUpdate.metadata, + job: { + ...toUpdate.metadata.job, + name, + }, + }, + }; + + return { ...state, products }; + } + case ScenesActionType.SET_SELECTED_SCENE: { return { ...state, diff --git a/src/assets/StoryMaps.png b/src/assets/StoryMaps.png new file mode 100644 index 000000000..34e420bc7 Binary files /dev/null and b/src/assets/StoryMaps.png differ diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index b40865ea1..2849fc25a 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -104,6 +104,9 @@ "CAMPAIGN_NAME": "Name der Kampagne", "CAMPAIGN_SELECTOR": "Kampagnen-Selektor", "CANCEL": "Abbrechen", + "CANNOT_RENAME_PROJECTS_FOR": "Sie können Projekte nicht umbenennen für", + "CONFIRM_RENAME_MULTIPLE": "Ja! Ich möchte wirklich diese {{projectCount}} Projekte ({{jobCount}} Jobs) in \"{{newName}}\" umbenennen.", + "CONFIRM_RENAME_SINGLE": "Ja! Ich möchte wirklich dieses 1 Projekt ({{jobCount}} Jobs) in \"{{newName}}\" umbenennen.", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(mittlere Spalte) und Dateispalte (rechts) werden ausgefüllt.", "CHART": "Diagramm", "CHEVRON_RIGHT": "chevron_right", @@ -230,12 +233,16 @@ "EDIT_FILTERS": "Filter bearbeiten", "EDIT_LIST": "Liste bearbeiten", "EDIT_NAME": "Name bearbeiten", + "EDIT_ALL_PROJECT_NAMES": "Alle Projektnamen bearbeiten", + "EDIT_PROJECT_NAME": "Projektname bearbeiten", "EMAIL": "E-Mail", "END": "Ende", "END_DATE": "Enddatum", "ENTER_A_NAME_FOR_YOUR_SEARCH_IN_THE_SAVE_SEARCH_DIALOG": "Geben Sie im Dialogfeld \"Suche speichern\" einen Namen für Ihre Suche ein.", "ENVIRONMENT_FILE": "Umgebungsdatei", "EQUATORIAL_MAP_VIEW": "Äquatoriale Kartenansicht", + "ERROR": "Fehler", + "ESTIMATED_TIME_REMAINING": "Geschätzte verbleibende Zeit", "ERS_DESC": "Hauptsächlich SAR-Bilder innerhalb der ASF und der McMurdo-Stationsmasken in der Antarktis. Die Daten sind für die Interferometrie geeignet.", "EVENT": "Ereignis", "EVENT_DATE": "Veranstaltungstermin", @@ -254,6 +261,7 @@ "EXPORT_API": "API exportieren", "EXPORT_PYTHON": "Python exportieren", "FAILED": "Misslungen", + "FAILED_PROJECTS": "Fehlgeschlagene Projekte", "FALSE": "},false);", "FARADAY_ROTATION": "Faraday-Rotation", "FEEDBACK": "Feedback", @@ -555,7 +563,15 @@ "PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT": "Für Produkte in Ihrer Warteschlange ist möglicherweise eine Vereinbarung mit eingeschränkten Datensätzen erforderlich.", "PRODUCTS_TO_DOWNLOADS_FROM_SELECTED_EVENT": "Produkte zum Download von ausgewählten Veranstaltungen", "PROFILE": "Profil", + "PROJECT": "Projekt", "PROJECT_NAME": "Projektname", + "PROJECT_NAME_MAX_LENGTH": "Projektname darf 100 Zeichen nicht überschreiten", + "PROJECT_NAME_REQUIRED": "Projektname ist erforderlich", + "PROJECT_NAME_UNNAMED": "(unbenannt)", + "PROJECT_NAME_UPDATE_ALL_TOOLTIP": "Projektname für alle geladenen Aufträge aktualisieren", + "PROJECT_NAME_UPDATE_FOR_JOBS": "Projektname für {{count}} Aufträge aktualisieren", + "PROJECTS_SELECTED": "Ausgewählte Projekte", + "PROJECTS_TO_RENAME": "Umzubenennende Projekte:", "PUSH_PIN": "push_pin", "PYTHON_PY": "Python (.py)", "QUAKE": "beben", @@ -581,6 +597,8 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Datei aus Downloads entfernen", "REMOVE_FILE_FROM_QUEUE": "Datei aus der Warteschlange entfernen", "REMOVE_JOB": "Job entfernen", + "REMOVE_PROJECT_NAME": "Projektname entfernen", + "REMOVE_PROJECT_NAMES": "{{count}} Projektnamen entfernen", "REMOVE_RED_EYE": "remove_red_eye", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Entfernen von Szenendateien aus Downloads", "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "Resampled DEM (SRTM oder NED), das für die RTC-Verarbeitung verwendet wird.", @@ -590,6 +608,15 @@ "RESTRICTED_DATA_USE_AGREEMENT": "Vereinbarung zur eingeschränkten Datennutzung", "RESUBMIT_JOB": "Erneutes Einreichen des Auftrags", "RESUBMIT_PROJECT": "Projekt erneut einreichen", + "RENAME_ALL_FAILED": "{{count}} Auftrag/Aufträge konnten nicht umbenannt werden.", + "RENAME_COMPLETE": "Umbenennung abgeschlossen", + "RENAME_ERROR": "Beim Umbenennen der Aufträge ist ein Fehler aufgetreten.", + "RENAME_JOB_TO": "Job umbenennen zu:", + "RENAME_JOBS_TO": "{{count}} Jobs umbenennen zu:", + "RENAME_PARTIAL_SUCCESS": "{{success}} Auftrag/Aufträge umbenannt. {{failed}} fehlgeschlagen.", + "RENAME_SUCCESS": "{{count}} Auftrag/Aufträge erfolgreich umbenannt.", + "RENAMING_JOBS": "Aufträge werden umbenannt...", + "WILL_RENAME_JOBS": "{{count}} Auftrag/Aufträge werden umbenannt.", "RESULTS_TO_ON_DEMAND_QUEUE": "Ergebnisse in die On-Demand-Warteschlange", "RESULTS_WILL_NOW_CONTAIN_ONLY_SCENES_WITH_THE_SAME_PATH_AND_FRAME": "Die Ergebnisse enthalten jetzt nur noch Szenen mit demselben Pfad und Frame.", "REVIEW": "Rezension", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index df21b5fe9..186d95fe9 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -29,6 +29,7 @@ "ADD_SCENE_FILES_TO_DOWNLOADS": "Add scene files to downloads", "ADD_SIDE_POLARIZATION_TO_SEARCH": "Add side polarization to search", "ADD_TO_ON_DEMAND_QUEUE": "Add to On Demand queue", + "ADDITIONAL": "additional", "ADDITIONAL_DRAWING_TOOL_OPTIONS_ARE_AVAILABLE_IN_THE_TOOLBAR_INCLUDING_POINT_LINESTRING_AND_POLYGON_OPTIONS": "Additional drawing tool options are available in the toolbar, including point, linestring, and polygon options.", "ADDITIONAL_FILTERS": "Additional Filters", "ADJUST_OVERLAY_OPACITY": "Adjust Overlay Opacity", @@ -70,7 +71,8 @@ "AREA_OF_INTEREST_OPTIONS": "Area of Interest Options", "AREA_OF_INTEREST_WKT": "Area of Interest • WKT", "ARIA_INGEST_DOCS": "ARIA On Demand Ingest Documentation", - "ARIA_VERSION": "ARIA Version", + "ARIA_VERSION": "Versión ARIA", + "ARIAS1GUNW_JOB_TYPE_DESC": "ARIA Sentinel-1 Geocoded Unwrapped Interferogram (ARIA-S1-GUNW) products are a standardized product that provide CF-Compliant 90-m pixel spacing interferometric SAR (InSAR) data ideal for simplified ground displacement measurements.", "ARROW_BACKWARD": "arrow_backward", "ARROW_FORWARD": "arrow_forward", "ASCENDING": "Ascending", @@ -121,6 +123,7 @@ "CAMPAIGN_SELECTOR": "Campaign Selector", "CANADAS_OPEN_LICENSE": "Canada's Open Government License", "CANCEL": "Cancel", + "CANNOT_RENAME_PROJECTS_FOR": "You cannot rename projects for", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(center column) and Files column (right) will populate.", "CHARACTERS": "characters", "CHART": "Chart", @@ -135,17 +138,24 @@ "CLEAR_PRODUCT_NAME_FILTER": "Clear Product Name Filter", "CLEAR_SEARCH": "Clear Search", "CLEAR_SEARCH_AREA": "Clear Search Area", + "CLEAR_SELECTED_MISSION": "Clear selected mission", "CLEAR_WILL_CLEAR_ALL_FILES_FROM_THE_QUEUE_THE_OPTION_RESTORE_WILL_BE": "Clear will clear all files from the queue. The option Restore will be", "CLICK_ON_THE_CART_ICON_NEXT_TO_A_SCENE_NAME_TO_ADD_ALL_THE_SCENE_S_FILES_TO_THE_DOWNLOAD_QUEUE": "Click on the cart icon next to a scene name to add all the scene’s files to the download queue.", "CLICK_ON_THE_FILTERS_BUTTON_IN_THE_SEARCH_MENU_THE_FILTERS_YOU_CAN_SPECIFY_INCLUDE": "click on the 'Filters ...' button in the search menu. The filters you can specify include:", - "CLICK_ON_THE_MAP_ONCE_TO_SPECIFY_THE_STARTING_CORNER_MOVE_THE_MOUSE_THEN_CLICK_AGAIN_TO_FINISH_THE_BOX": "Click on the map once to specify the starting corner, move the mouse, then click again to finish the box.", + "CLICK_ON_THE_MAP_ONCE_TO_SPECIFY_THE_STARTING_CORNER_MOVE_THE_MOUSE_THEN_CLICK_AGAIN_TO_FINISH_THE_BOX": "Click on the map once to specify the starting corner, move the mouse, then click again to finish the box", "CLICK_ON_THE_ZOOM_ICON_NEXT_TO_A_SCENE_NAME_TO_ZOOM_IN_TO_THE_SCENE_S_LOCATION_ON_THE_MAP": "Click on the zoom icon next to a scene name to zoom-in to the scene’s location on the map.", "CLICK_THE_ARROW_DOWN_ICON_ON_THE_SEARCH_BUTTON_TO_OPEN_THE_SEARCH_MENU": "Click the arrow down icon on the 'Search' button to open the search menu.", "CLICKING_EDIT_LIST_OPENS_THE_SCENE_LIST_SEARCH_WINDOW_SO_YOU_CAN_MAKE_CHANGES_TO_YOUR_LIST": "Clicking 'Edit List' opens the Scene List Search window so you can make changes to your list.", "CLICKING_THE_IMAGE_THUMBNAIL_WILL_OPEN_AN_IMAGE_BROWSER_SO_YOU_CAN_VIEW_THE_IMAGE_IN_MORE_DETAIL": "Clicking the image thumbnail will open an image browser so you can view the image in more detail.", "CLOSE": "Close", + "CLOSE_CONTENTS": "Close contents", "COHERENCE_LAYER": "Coherence Layer", + "COMING_SOON": "coming soon!", "COMPLETE_YOU_CAN_ALSO_SELECT_TO_ONLY_SUBMIT_CERTAIN_PROCESSING_TYPES_OR_ALL_PROCESSING_TYPES_BY_SELECTING": "complete. You can also select to only submit certain processing types or all processing types. By selecting", + "CONFIRM_REMOVE_MULTIPLE": "Yes! I really want to remove the names from these {{projectCount}} projects ({{jobCount}} jobs).", + "CONFIRM_REMOVE_SINGLE": "Yes! I really want to remove the project name from this project ({{jobCount}} jobs)", + "CONFIRM_RENAME_MULTIPLE": "Yes! I really want to remove the project name from this project ({{jobCount}} jobs).", + "CONFIRM_RENAME_SINGLE": "Yes! I really want to rename this 1 project ({{jobCount}} jobs) to \"{{newName}}\".", "CONST_REDIRECT_HTTPS_SEARCH_ASF_ALASKA_EDU_WINDOW_LOCATION_PATHNAME_WINDOW_LOCATION_HASH": "const redirect = `https://search.asf.alaska.edu${window.location.pathname}${window.location.hash}`;", "CONST_URL_WINDOW_LOCATION_HOSTNAME_TO_LOWER_CASE": "const url = window.location.hostname.toLowerCase();", "CONTACT": "Contact", @@ -157,6 +167,7 @@ "COPY_FILE_ID_TO_CLIPBOARD": "Copy File IDs to clipboard", "COPY_FILE_IDS": "Copy File IDs", "COPY_FILE_URLS_TO_CLIPBOARD": " Copy File URLs to clipboard", + "COPY_IDS_URLS": "Copy IDs/URLs", "COPY_JOB_ID": "Copy Job ID", "COPY_NAME": "Copy Name", "COPY_REFERENCE_SCENE_NAMES_TO_CLIPBOARD": "Copy reference scene names to clipboard", @@ -173,7 +184,7 @@ "CORPORATE_FARE_ASF": "corporate_fareASF", "CREATE_SUBSCRIPTION": "Create Subscription...", "CREDIT": "credit", - "CREDIT_COST": "Credit Cost", + "CREDIT_COST": "Costo del crédito", "CREDIT_MAX": "credit max", "CREDITS": "credits", "CREDITS_LEFT": "credits left", @@ -206,7 +217,7 @@ "DAYS": "Days", "DEC_JAN_FEB": "Dec, Jan, Feb", "DECIBEL": "decibel", - "DEFAULT": "Default", + "DEFAULT": "Predeterminado", "DEFAULT_LANGUAGE": "Language", "DEFAULT_LANGUAGE_AND_THEME": "Language and Theme", "DEFAULT_MAP_LAYER": "Map Layer", @@ -239,14 +250,18 @@ "DEVELOPER": "Developer", "DIRECTION": "Direction", "DISABLE": "Disable", + "DISCLAIMER": "Disclaimer", "DISP_DOI": "DISP DOI", "DISPLACEMENT": "Displacement", - "DISPLACEMENT_DESCRIPTION": "Displacement products provide information on anthropogenic and natural changes of Earth's surface, covering North America.", + "DISPLACEMENT_DATA_DISCLAIMER": "Displacement Data Disclaimer", + "DISPLACEMENT_DATA_DISCLAIMER_TEXT": "The displacement data shown here is a short-wavelength filtered visualization product. Filtering removes long-wavelength (> ~25 km) signals, such as atmospheric noise, and highlights short-wavelength signals, such as landslides, but it also can introduce artifacts (e.g., see Central Valley, CA subsidence area) not present in the validated displacement layer. Before interpreting data, please read the FAQ.", + "DISPLACEMENT_DESCRIPTION": "Displacement products provide information on anthropogenic and natural changes of the Earth’s surface, covering North America.", "DISPLACEMENT_FILTERS": "Displacement Filters", "DISPLACEMENT_SEARCH": "Displacement Search", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "displayed if you wish to undo this action.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "displayed in the search menu at the top. You can access all of the hidden filters by", "DO_YOU_WANT_TO_DELETE_ALL_SERIES": "Do you want to delete all series?", + "DOCUMENTATION": "Documentation", "DONE": "Done", "DOWNLOAD": "Download", "DOWNLOAD_ALL": "Download All", @@ -274,10 +289,12 @@ "E_PREVENT_DEFAULT": "e.preventDefault();", "EACH_WITH_THEIR_OWN_PROCESSING_OPTIONS_SELECT_THE_PROCESSINGOPTIONS_YOU_WISH": "each with their own processing options. Select the processingoptions you wish.", "EDIT": "Edit", + "EDIT_ALL_PROJECT_NAMES": "Edit All Project Names", "EDIT_CURRENT_AREA_OF_INTEREST": "Edit current area of interest", "EDIT_FILTERS": "Edit Filters", "EDIT_LIST": "Edit List", "EDIT_NAME": "Edit name", + "EDIT_PROJECT_NAME": "Edit Project Name", "EMAIL": "email", "END": "End", "END_DATE": "End Date", @@ -285,8 +302,10 @@ "ENVIRONMENT_FILE": "Environment File", "EQUATORIAL_MAP_VIEW": "Equatorial Map View", "ERS_DESC": "Primarily SAR imagery within the ASF and the McMurdo, Antarctica, station masks. Data is suitable for interferometry.", + "ESTIMATED_TIME_REMAINING": "Estimated time remaining", "EVENT": "Event", "EVENT_DATE": "Event Date", + "EVENT_DESCRIPTION_ID_TYPE": "event description, id, or type", "EVENT_DETAIL": "Event Detail", "EVENT_FILTERS": "Event Filters", "EVENT_PRODUCTS": "Event Products", @@ -302,6 +321,7 @@ "EXPORT_API": "Export API", "EXPORT_PYTHON": "Export Python", "FAILED": "Failed", + "FAILED_PROJECTS": "Failed projects", "FALSE": "},false);", "FARADAY_ROTATION": "Faraday Rotation", "FEEDBACK": " Feedback", @@ -310,7 +330,7 @@ "FIELDS_THE_DATE_PICKER_WILL_AUTOMATICALLY_CONSTRAIN": " fields. The date picker will automatically constrain", "FILE": "File", "FILE_I_DS_NAMES_CAN_BE_COPIED": "File IDs (names) can be copied", - "FILE_IDS": "File IDs.", + "FILE_IDS": "IDs de archivo.", "FILE_IMPORT_SUPPORTED": "File Import Supported", "FILE_IMPORT_SUPPORTED ": "File Import Supported", "FILE_LIST_SEARCH": "File List Search", @@ -325,6 +345,7 @@ "FILES_OPC": "(shp, geojson, kml, zip)", "FILES_PROVIDED_BY_THIS_FEATURE_ARE_COMPATIBLE_WITH_THE_GEOGRAPHIC_SEARCH_IMPORT_FEATURE": "files provided by this feature are compatible with the Geographic Search Import feature.", "FILES_THE_RIGHT_COLUMN": "Files - the right column", + "Filter Campaign": "Filter Campaign", "FILTER_PRESET_NAME": "Filter Preset Name", "FILTER_SEARCHES": "Filter Searches", "FILTERS": "Filters", @@ -392,6 +413,7 @@ "HTTPS_URS_EARTHDATA_NASA_GOV_USERS_NEW": "https://urs.earthdata.nasa.gov/users/new", "HY_P3_API_URL": "HyP3 API URL", "HY_P3_USER_GUIDE": "HyP3 User Guide", + "HYP3_AVAILABLE": "Available for On Demand Processing (HyP3)", "HYP3_JOB_IDS_INFO_BAR": "HYP3 Job IDs Info Bar", "HYP3_SDK_DOCS": "HyP3 SDK Docs", "I_DS": "IDs", @@ -403,6 +425,7 @@ "IMPORT_AREA_OF_INTEREST": "Import Area of Interest", "IMPORT_FILE": "Import File", "IN_ADDITION_THERE_ARE_BUTTONS_BELOW_THE_METADATA_ALMOST_ALL_SCENES_HAVE_A": "In addition, there are buttons below the metadata. Almost all scenes have a", + "IN_PROGRESS": "In progress", "IN_SAR_PAIR": "InSAR pair", "IN_THE_LEFT_COLUMN_AS_YOU_CLICK_ON_THE_DIFFERENT_SCENES_YOU_WILL_SEE_THE_CENTER_COLUMN_REFLECT_THE": "in the left column. As you click on the different scenes, you will see the center column reflect the", "IN_THE_UPPER_RIGHT_CORNER_OF_VERTEX_THEN_SELECT_THE_REGISTER_BUTTON_AND_FILL_IN": "in the upper-right corner of Vertex, then select the \"REGISTER\" button and fill-in", @@ -426,7 +449,7 @@ "INFO_WETLANDS_MEASURES": "This dataset includes regional and continental-scale maps covering crucial wetlands systems.", "INSAR_DESC": "Interferometric Synthetic Aperture Radar (InSAR) processing uses two SAR images collected over the same area to determine geometric properties of the surface. The phase measurements of the two images acquired at different times are differenced to detect and quantify surface changes.", "INSTRUMENT": "Instrument", - "INSTRUMENTS": "Instruments", + "INSTRUMENTS": "Instrumentos", "INSTRUMENTS_SELECTED": "instruments selected", "INVALID_BASELINE": "Invalid Baseline", "INVALID_END_DAY": "Invalid End Day", @@ -436,12 +459,12 @@ "IS_USED_TO_DOWNLOAD_MULTIPLE_PRODUCTS_WITH_EITHER_THE": "is used to download multiple products, with either the", "IS_USED_TO_EXPORT_THE_CONTENTS_OF_THE_DOWNLOAD_QUEUE": "is used to export the contents of the download queue", "ITEMS_CAN_BE_REMOVED_FROM_THE_QUEUE": "Items can be removed from the queue", - "J_D_CREATE_ELEMENT_S_DL_L_DATA_LAYER_AND_L_L_J_ASYNC_TRUE_J_SRC": "j=d.createElement(s),dl=l!='dataLayer'?'&l='+l:'';j.async=true;j.src=", "JERS_1_AND_RADARSAT_1_DATASETS_REQUIRE_A": "JERS-1 and RADARSAT-1 datasets require a", "JERS_1_REQUIRES_A": "JERS-1 requires a", "JERS_DESC": "The JERS-1 (Japanese Earth Resources Satellite) SAR is a high-resolution, all-weather imaging radar. Data uses: land surveys, agriculture, forestry, fisheries, environmental...", "JOB": "job", "JOB_FILTERS": "Job Filters", + "JOB_ID": "Job ID", "JOB_IDS_SELECTOR": "Job IDs Selector", "JOB_INGEST_PROCESSING": "The On Demand Job is currently processing; scene metadata will become available once the job is complete.", "JOB_MAX": "job max", @@ -482,9 +505,6 @@ "LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH": "login to view number of credits left this month", "LOGIN_TO_VIEW_NUMBER_OF_JOBS_LEFT_THIS_MONTH": "login to view number of jobs left this month", "LOOKING_FOR_DEMS": "Looking for DEMs", - "LOOKS TWO": "looks_two", - "LOOKS_MANY": "Looks Many", - "LOOKS_OTHER": "Looks Other", "MAGNITUDE": "Magnitude", "MAIN": "Main", "MAIN_BAND_FREQ_A_POLARIZATION": "Main Band (Freq. A) Polarization", @@ -500,7 +520,6 @@ "MATCHING_FRAMES": "Matching Frames", "MATURITY": "Maturity", "MAX_DAYS": "Max Days", - "MENU_BOOK": "menu_book", "METADATA": "Metadata", "METADATA_CSV": "Metadata (csv)", "METADATA_DOWNLOAD": "Metadata Download", @@ -513,7 +532,6 @@ "METERS": "Meters", "MIN_DAYS": "Min Days", "MORE": "More", - "MORE_HORIZ": "more_horiz", "MORE_INFO": "More Info", "MORE_LIKE_THIS": "More Like This", "MORE_LIKE_THIS_BUTTON_IF_THE_SCENE_IS_SUITABLE_FOR_INTERFEROMETRY_THERE_WILL_BE_TWO_ADDITIONAL": "\"More Like This\" button. If the scene is suitable for interferometry, there will be two additional", @@ -523,7 +541,6 @@ "NAVIGATE_TO_YOUR_AREA_OF_INTEREST": "Navigate To Your Area of Interest", "NAVIGATE_TO_YOUR_AREA_OF_INTEREST_BY_DRAGGING_THE_MAP_WHILE_HOLDING_DOWN_THE_LEFT_MOUSE_BUTTON": "Navigate to your area of interest by dragging the map while holding down the left mouse button.", "NEW": "New!", - "NEW_DATE_GET_TIME_EVENT_GTM_JS_VAR_F_D_GET_ELEMENTS_BY_TAG_NAME_S": "new Date().getTime(),event:'gtm.js'});var f=d.getElementsByTagName(s)[0],", "NEW_END_DATE": "New End Date'\n", "NEXT": "Next", "NISAR_DESC": "NISAR provides L- and S-band SAR data to measure Earth's changing ecosystems, dynamic surfaces, and ice masses with 12-day regularity on ascending and descending passes.", @@ -547,6 +564,7 @@ "NO_POINT_SELECTED": "No Point Selected", "NO_POLARIZATION_SELECTED": "No polarization selected", "NO_POLARIZATIONS_TO_SELECT": "No polarizations to select", + "NO_PROCESSING_OPTIONS_FOR": "No processing options for", "NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT": "No Products Available for this Event", "NO_RESULTS": "NO RESULTS", "NO_SCENE_SELECTED": "No Scene Selected", @@ -558,7 +576,7 @@ "NOT_ABLE_TO_SELECT_SIMILAR_SCENES_FROM_THIS_SOURCE": "Not able to select similar scenes from this source", "NOT_ALL_FILTERS_WILL_BE_AVAILABLE_FOR": "Not all filters will be available for", "NOTE_IN_VERTEX_A_SCENE_IS_CONSIDERED_TO_BE_A_PACKAGE_CONTAINING_ALL_FILES_OR_PRODUCTS": "Note: In Vertex, a scene is considered to be a package containing all files, or products,", - "NOTE_THE_NUMBER_OF_FILES_THAT_ARE_PREDICTED_TO_MATCH_THE_CURRENT_SEARCH_PARAMETERS_IS_DISPLAYED_UNDER_THE_SEARCH_BUTTON_IF_THERE_ARE_NO_PREDICTED_MATCHES_THE_SEARCH_BUTTON_WILL_BE_GREYED_OUT_AND_DISPLAY_NO_RESULTS": "Note: The number of files that are predicted to match the current search parameters is displayed under the SEARCH button. If there are no predicted matches, the search button will be greyed out and display NO RESULTS.", + "NOTE_THE_NUMBER_OF_FILES_THAT_ARE_PREDICTED_TO_MATCH_THE_CURRENT_SEARCH_PARAMETERS_IS_DISPLAYED_UNDER_THE_SEARCH_BUTTON_IF_THERE_ARE_NO_PREDICTED_MATCHES_THE_SEARCH_BUTTON_WILL_BE_GREYED_OUT_AND_DISPLAY_NO_RESULTS": "Note: The number of files expected to match the current search parameters is displayed on the SEARCH button. If no matches are expected, the search button will appear grayed out and display NO RESULTS.", "OBSERVATIONAL_FILTERS": "Observational Filters", "OF": "of", "OF_THE_BOUNDING_BOX_OR_TO_DELETE_THE_BOUNDING_BOX": "of the bounding box, or to delete the bounding box.", @@ -572,7 +590,7 @@ "ON_DEMAND_PROCESSING": "On Demand Processing", "ON_DEMAND_PRODUCTS": "On Demand Products", "ON_DEMAND_QUEUE": "On Demand Queue", - "ON_DEMAND_SEARCH": "On Demand Search", + "ON_DEMAND_SEARCH": "Búsqueda On Demand", "ON_DEMAND_SEARCH_ALLOWS_YOU_TO_VIEW_YOUR_SUBMITTED_ON_DEMAND_JOBS": "On Demand search allows you to view your submitted On Demand jobs.", "ON_DEMAND_SUBSCRIPTIONS": "On Demand Subscriptions", "ONCE_ALL_PARAMETERS_HAVE_BEEN_CHOSEN_CLICK_SEARCH_SEARCH_RESULTS_WILL_APPEAR_IN_THE_FOOTER_AREA_OF_THE_VERTEX_WINDOW_AND_ON_THE_MAP": "Once all parameters have been chosen, click SEARCH. Search results will appear in the footer area of the Vertex window, and on the map.", @@ -582,6 +600,7 @@ "ONLY_DISPLAY_SCENES_WITH_A_BROWSE_IMAGE": "Only display scenes with a browse image", "OPACITY": "Opacity", "OPACITY_OF_COHERENCE_LAYER": "Coherence Layer Opacity", + "OPEN_FAQ": "Open FAQ", "OPEN_IN_IMAGE_VIEWER": "Open in Image Viewer", "OPEN_LINK_TO_DOCUMENTATION": "Open link to documentation.", "OPEN_MANUAL": "Open Manual", @@ -590,7 +609,7 @@ "OPERA_S1_DESC": "Sentinel-1 RTC backscatter products providing near-global coverage, as well as Sentinel-1 CSLC products covering North America.", "OPERA_S1_SOURCE_DATA": "Source Sentinel-1 scene for selected OPERA-S1 product", "OPTION_OR": "option or", - "OPTION_OR ": "option or", + "OPTION_OR ": "opción o", "OPTIONS": "Options", "OR": "or", "OR_DOWNLOAD_IN_ADDITION_TO_PERMITTING_THE_SAME_WITH_THE_ENTIRE_ZIP_FILE_ITSELF": "or download, in addition to permitting the same with the entire zip file itself.", @@ -642,13 +661,12 @@ "PREFERENCES_FOR": "Preferences for", "PROCESSING_DATE": "Processing Date:", "PROCESSING_OPTIONS": "Processing Options", - "PROD_FILES_PRODUCT_SIZE_TO_STRING_READABLE_SIZE_FROM_BYTES": "prod.files.product_size.toString() | readableSizeFromBytes", "PRODUCT": "Product", - "PRODUCT_BYTES_TO_STRING_READABLE_SIZE_FROM_BYTES": "product.bytes.toString() | readableSizeFromBytes", "PRODUCT_CRITERIA": "Product Criteria", "PRODUCT_DETAILS": "Product Details", "PRODUCT_FILENAME": "Product Filename:", "PRODUCT_FILTERS": "Product Filters", + "PRODUCT_NAME_PLACEHOLDER": "Product name placeholder", "PRODUCT_OVERLAYS_FOR_CURRENT_SCENE_DATASET_NOT_AVAILABLE": "Product Overlays for current scene dataset not available", "PRODUCT_SOURCE_SCENE": "Product/Source Scene", "PRODUCT_TYPE": "Product Type", @@ -657,10 +675,32 @@ "PRODUCTION_CONFIGURATION": "Production Configuration", "PRODUCTION_CONFIGURATION_FILTER": "Production Configuration Filter", "PRODUCTION_CONFIGURATION_TOOLTIP": "Processing pipeline used to generate this granule", - "PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT": "Products in your queue may require a restricted dataset agreement.", + "PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT": "Los productos en tu lista pueden requerir un acuerdo de conjunto de datos restringido.", "PRODUCTS_TO_DOWNLOADS_FROM_SELECTED_EVENT": "products to downloads from selected event", "PROFILE": "Profile", + "PROJECT": "Proyect", "PROJECT_NAME": "Project Name", + "PROJECT_NAME_DIALOG_SUBTITLE": "Update project name", + "PROJECT_NAME_DIALOG_TITLE": "Project Name", + "PROJECT_NAME_HELP_TEXT": "Enter a new project name", + "PROJECT_NAME_MAX_LENGTH": "Project name cannot exceed 100 characters", + "PROJECT_NAME_PLACEHOLDER": "Project name placeholder", + "PROJECT_NAME_REQUIRED": "Project name is required", + "PROJECT_NAME_UNNAMED": "(unnamed)\n", + "PROJECT_NAME_UPDATE_ALL_TOOLTIP": "Update project name for all loaded jobs", + "PROJECT_NAME_UPDATE_FOR_JOBS": "Update project name for {{count}} jobs", + "PROJECT_RENAME_CANCELLED": "Project rename cancelled", + "PROJECT_RENAME_CONFIRMATION": "Confirm project rename", + "PROJECT_RENAME_FAILED": "Project rename failed", + "PROJECT_RENAME_HELP_TOOLTIP": "Change the project name for selected items", + "PROJECT_RENAME_IN_PROGRESS": "Project rename in progress", + "PROJECT_RENAME_INFO": "Rename project to the selected name", + "PROJECT_RENAME_REVIEW": "Review project name changes", + "PROJECT_RENAME_SUCCESS": "Project renamed successfully", + "PROJECT_RENAME_SUMMARY": "Project rename summary", + "PROJECT_RENAME_WARNING": "This action cannot be undone", + "PROJECTS_SELECTED": "Projects Selected", + "PROJECTS_TO_RENAME": "Projects to rename:", "PUSH_PIN": "push_pin", "PYTHON_PY": "python (.py)", "QUAKE": "quake", @@ -668,7 +708,7 @@ "QUEUE_YOU_CAN_ADD_AS_MANY_FILES_AS_YOU_WISH_BUT_THERE_IS_A_LIMIT_OF_TWO_HUNDRED_FILES_PER_MONTH_THAT": "queue. You can add as many files as you wish but there is a limit of two hundred files per month that", "QUICKLY_LEARN_THE_BASICS_OF_VERTEX_DATA_SEARCH_WITH_THIS_GETTING_STARTED_SERIES": "Quickly learn the basics of Vertex Data Search with this getting started series.", "RADAR_LOOK_DIRECTION": "Radar Look Direction", - "RADARSAT_1": "RADARSAT-1 Antarctic Mapping Project (RAMP)", + "RADARSAT_1": "RADARSAT-1 Antarctic Mapping Project (RAMP)\n", "RADARSAT_1_DESC": "RADARSAT-1 synthetic aperture radar (SAR), was a powerful microwave instrument. It captured high quality SAR images of the Earth night and day and in all-weather conditions.", "RADARSAT_IS_AVAILABLE_THROUGH": "RADARSAT-1 is freely available through", "RADIO_BUTTON_UNCHECKED": "radio_button_unchecked", @@ -679,7 +719,7 @@ "READ_OUR_ON_DEMAND_GUIDE": "Read Our On Demand Guide", "READ_OUR_USER_GUIDE": "Read Our User Guide", "READ_THE_VERTEX_USER_GUIDE_INCLUDING_SECTIONS_ON_GETTING_STARTED_BASELINE_SEARCHES": "Read the Vertex User Guide, including sections on Getting Started, Baseline Searches,", - "READABLE_SIZE_FROM_BYTES": "| readableSizeFromBytes", + "RECOMMENDED_PRODUCT": "Recommended Product", "REFERENCE": "Reference", "REFERENCE_SCENE": "reference scene.", "REFERENCE_SCENES": "Reference Scenes", @@ -690,10 +730,22 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Remove file from downloads", "REMOVE_FILE_FROM_QUEUE": "Remove file from queue", "REMOVE_JOB": "Remove job", + "REMOVE_PROJECT_NAME": "Remove {{count}} project name", + "REMOVE_PROJECT_NAMES": "Remove {{count}} project names", "REMOVE_RED_EYE": "remove_red_eye", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Remove scene files from downloads", "REMOVE_SERIES": "Remove Series", - "REQUEUE_PROJECT": "Add Project to Queue", + "RENAME_ALL_FAILED": "Failed to rename {{count}} job(s).", + "RENAME_COMPLETE": "Rename Complete", + "RENAME_ERROR": "An error occurred while renaming jobs.", + "RENAME_JOB_TO": "Rename job to:", + "RENAME_JOBS_TO": "Rename {{count}} jobs to:", + "RENAME_PARTIAL_SUCCESS": "Renamed {{success}} job(s). {{failed}} failed.", + "RENAME_PROJECT": "Rename Project", + "RENAME_PROJECTS": "Rename Projects", + "RENAME_SUCCESS": "Rename success", + "RENAMING_JOBS": "Renaming jobs...", + "REQUEUE_PROJECT": "Requeue project", "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "Resampled DEM (SRTM or NED) used for RTC processing.", "RESET_CHART_REFERENCE": "Reset chart reference", "RESET_TO_DEFAULT": "Reset to Default", @@ -713,8 +765,6 @@ "RUNNING": "Running", "SAMPLES_PER_BURST": "Samples Per Burst", "SAR_FILE_SEARCHES": "SAR File Searches", - "SARVIEW_EVENT_DESCRIPTION_0_TO_UPPER_CASE": "sarviewEvent.description[0].toUpperCase() +", - "SARVIEW_EVENT_DESCRIPTION_SLICE": "sarviewEvent.description.slice(1)", "SARVIEWS_EVENT": "SARVIEWS Event", "SARVIEWS_EVENTS": "Sarviews Events", "SATELLITE": "Satellite", @@ -741,7 +791,6 @@ "SCALE": "Scale", "SCATTERING_AREA_MAP": "Scattering Area Map", "SCENE": "Scene", - "SCENE_ASYNC_METADATA_JOB_JOB_PARAMETERS_SCENES_1_NAME": "(scene$ | async).metadata?.job?.job_parameters.scenes[1].name", "SCENE_DETAIL": "Scene Detail", "SCENE_DETAIL_THE_CENTER_COLUMN": "Scene Detail - the center column", "SCENE_I_DS": "Scene IDs", @@ -769,6 +818,7 @@ "SEARCH_OPTIONS": "Search Options", "SEARCH_RESULTS": "Search Results", "SEARCH_TYPE": "Search Type", + "SEARCH_TYPE_MISMATCH": "Current Search Wrong Type", "SEARCH_TYPES": "Search types", "SEARCHING_FOR_A_FRAME_OF_INTEREST_BY_1_2_FRAMES": "searching for a frame of interest by ±1-2 frames.", "SEASAT_DESC": "Seasat's primary mission was to observe oceans using NASA’s first synthetic aperture radar (SAR) sensor.", @@ -781,11 +831,11 @@ "SELECT_GEOGRAPHIC_FROM_THE_DROP_DOWN_LIST_OF_SEARCH_TYPES": "Select 'Geographic' from the drop-down list of search types.", "SELECT_SAVE_SEARCH_FROM_THE_SEARCH_MENU": "Select 'Save Search' from the search menu.", "SELECT_SAVED_SEARCHES_FROM_THE_SEARCH_MENU": "Select 'Saved Searches...' from the search menu.", - "SELECT_SEARCH_HISTORY_FROM_THE_SEARCH_MENU": "Select 'Search History...' from the search menu.", "SELECT_THE_DATASET_OF_INTEREST": "Select the dataset of interest.", "SELECTED": "Selected", "SELECTED_EVENT_PRODUCTS": "Selected Event Products", "SELECTED_JOB": "Selected Job", + "SELECTED_PRODUCTS": "Selected products", "SELECTING_LIST_FROM_THE_SEARCH_TYPE_DROPDOWN_MENU_OPENS_THE_SCENE_LIST_SEARCH_WINDOW_AND_ALLOWS_YOU_TO_ENTER_A_LIST_OF_SCENE_OR_FILE_NAMES": "Selecting 'List' from the Search Type dropdown menu, opens the Scene List Search window and allows you to enter a list of scene or file names.", "SENTINEL_1_BURST_DESC": "Sentinel-1 BURST products are the individual radar pulse responses that make up the 3 sub-swaths of every Sentinel-1 SLC product.", "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "Level 2 standardized Sentinel-1 Interferogram products generated by JPL’s Advanced Rapid Imaging and Analysis (ARIA) project.", @@ -863,6 +913,7 @@ "STOP_DRAWING": "Stop drawing", "STOP_EDITING": "Stop editing", "STOP_TIME": "Stop Time", + "STORYMAP": "StoryMap", "STREET": "Street", "STREET_LAYER": "Street Layer", "SUBJECT": "subject : \"\",", @@ -884,7 +935,6 @@ "TEMPORAL": "Temporal", "TEMPORAL_CRITERIA": "Temporal Criteria:", "TEST": "Test", - "TEST_1_1": "TEST 1.1", "THAT_ARE_RELATED_TO_A_SPECIFIC_LOCATION_AND_TIME": "that are related to a specific location and time.", "THE_BASELINE_TOOL_BUTTON_OPENS_THE_ASF_BASELINE_TOOL_WHICH_IS_USED_FOR_THE_CREATION_OF_IN_SAR_STACKS": "The 'Baseline Tool' button opens the ASF Baseline Tool, which is used for the creation of InSAR stacks.", "THE_CART_CHANGES_APPEARANCE_WHEN_THIS_IS_DONE": "The cart changes appearance when this is done.", @@ -916,6 +966,7 @@ "TOO_MANY_JOBS_IN_QUEUE": "Too many jobs in queue", "TOOLS": "Tools", "TOOLTIP": "TOOLTIP", + "TOTAL": "Total", "TRACK": "Track", "TRACK_AND_FRAME_FILTERS": "Track and Frame Filters", "TRACK_END": "Track End", @@ -926,12 +977,14 @@ "UNDO": "undo", "UNPIN_ALL_SELECTED_PRODUCTS": "Unpin All Selected Products", "UPDATE": "Update", + "UPDATE_SAVED_SEARCH": "Update Saved Search With Current Filters", "UPLOAD": "upload", "UPLOAD_AOI_VIA_FILE": "Upload AOI via file", "UPLOAD_GEOSPATIAL_FILE": "Upload Geospatial File", "UR_LS": "URLs", "URGENT_RESPONSE": "Urgent Response", "USE_AN_ASF_SEARCH_API_QUERY_TO_DOWNLOAD_MORE_RESULTS_MANUALLY": "Use an ASF Search API query to download more results manually.", + "USE_CASE_PLACEHOLDER": "Use case placeholder", "USE_THE_AREA_OF_INTEREST_BUTTONS_TO_TOGGLE_DRAWING_ON_THE_MAP_ON_AND_OFF_TO_EDIT_THE_SHAPE": "Use the 'Area of Interest' buttons to toggle drawing on the map on and off, to edit the shape", "USE_THE_MAP_PROJECTION_BUTTONS_IN_THE_MAP_TOOLBAR_TO_TOGGLE_BETWEEN_THE_ARCTIC_EQUATORIAL": "Use the 'Map Projection' buttons in the map toolbar to toggle between the Arctic, Equatorial,", "USE_THE_SELECTION_SHAPE_BUTTONS_TO_SWITCH_BETWEEN_DIFFERENT_DRAWING_SHAPES_INCLUDING_POINT": "Use the 'Selection Shape' buttons to switch between different drawing shapes including: point,", @@ -986,13 +1039,8 @@ "WILL_COPY_THE_FILE_NAMES_OF_ALL_FILES_IN_THE_QUEUE_FOR_USE_ELSEWHERE": "will copy the file names of all files in the queue for use elsewhere.", "WILL_DISPLAY_THE_CONTENTS_OF_YOUR_CURRENT_DOWNLOAD_QUEUE": "will display the contents of your current download queue.", "WILL_EXPAND_THE_LIST_TO_SHOW_ALL_OF_THE_INDIVIDUAL_COMPONENTS_WITHIN_THE_ZIP_ARCHIVE_YOU_CAN": "will expand the list to show all of the individual components within the zip archive. You can", + "WILL_RENAME_JOBS": "This will rename {{count}} job(s).", "WINDOW": "window.", - "WINDOW_ADD_EVENT_LISTENER_DRAGENTER_FUNCTION_E": "window.addEventListener('dragenter',function(e){", - "WINDOW_ADD_EVENT_LISTENER_DRAGOVER_FUNCTION_E": "window.addEventListener('dragover',function(e){", - "WINDOW_ADD_EVENT_LISTENER_DROP_FUNCTION_E": "window.addEventListener('drop',function(e){", - "WINDOW_DOCUMENT_SCRIPT_DATA_LAYER_GTM_5_KZ_8_WLF": "})(window,document,'script','dataLayer','GTM-5KZ8WLF');", - "WINDOW_DOCUMENT_SCRIPT_DATA_LAYER_GTM_WNP_7_MLF": "})(window,document,'script','dataLayer','GTM-WNP7MLF');", - "WINDOW_LOCATION_REDIRECT": "window.location = redirect;", "WITHIN_THE_DOWNLOAD_QUEUE_THE_LIST_OF_FILES_YOU_HAVE_SELECTED_TO_DOWNLOAD": "Within the download queue, the list of files you have selected to download", "YOU_CAN_EXECUTE_THE_SEARCH_AND_VERIFY_IT_PERFORMS_AS_YOU_EXPECT": "You can execute the search and verify it performs as you expect.", "YOU_CAN_HAVE_ASF_PERFORM_SAR_PROCESSING_FOR_YOU_ON_DEMAND_THE_ON_DEMAND_SYSTEM": "You can have ASF perform SAR processing for you On Demand. The On Demand system", @@ -1019,4 +1067,4 @@ "ZOOM_TO_FIT": "Zoom To Fit", "ZOOM_TO_RESULTS": "Zoom to results", "ZOOM_TO_SCENE": "Zoom to scene" -} +} \ No newline at end of file diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 95e05335e..63edf3360 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -29,6 +29,7 @@ "ADD_SCENE_FILES_TO_DOWNLOADS": "Agregar archivos de escena a las descargas", "ADD_SIDE_POLARIZATION_TO_SEARCH": "Agregar polarización lateral a la búsqueda", "ADD_TO_ON_DEMAND_QUEUE": "Añadir a la lista On Demand", + "ADDITIONAL": "adicional", "ADDITIONAL_DRAWING_TOOL_OPTIONS_ARE_AVAILABLE_IN_THE_TOOLBAR_INCLUDING_POINT_LINESTRING_AND_POLYGON_OPTIONS": "Las opciones de herramientas de dibujo adicionales están disponibles en la barra de herramientas, incluidas las opciones de punto, cadena de líneas y polígono.", "ADDITIONAL_FILTERS": "Filtros Adicionales", "ADJUST_OVERLAY_OPACITY": "Ajustar opacidad de superposición", @@ -36,7 +37,7 @@ "ADVANCED_FEATURES": "Características Avanzadas", "AIRSAR_DESC": "AIRSAR era una herramienta de generación de imágenes para todo clima capaz de penetrar a través de las nubes y recopilar datos durante la noche. Las longitudes de onda más largas también podrían penetrar en el dosel del bosque y...", "ALL": "todos", - "ALL_AOIS": "Todas las áreas", + "ALL_AOIS": "Todas las AOIs", "ALL_DATASETS_AND_THIS_LIST_CAN_CHANGE": "todos los conjuntos de datos, y esta lista puede cambiar.", "ALL_HELP_AND_TUTORIALS": "Ayuda y Tutoriales", "ALL_OF_THE_OTHER_SEARCH_FILTERS_OF_INTEREST_TO_YOU_TO_CREATE_THE_SEARCH_EXACTLY_AS_YOU_LIKE_IT": "todos los demás filtros de búsqueda que le interesen para crear la búsqueda exactamente como le gusta.", @@ -69,8 +70,9 @@ "AREA_OF_INTEREST": "Área de Interés", "AREA_OF_INTEREST_OPTIONS": "Opciones de Área de Interés", "AREA_OF_INTEREST_WKT": "Área de Interés • WKT", - "ARIA_INGEST_DOCS": "Documentación de ingesta de ARIA On Demand", + "ARIA_INGEST_DOCS": "Documentación de Ingesta de ARIA On Demand", "ARIA_VERSION": "Versión ARIA", + "ARIAS1GUNW_JOB_TYPE_DESC": "Los productos ARIA Sentinel-1 Geocoded Unwrapped Interferogram (ARIA-S1-GUNW) son un producto estandarizado que proporciona datos de interferometría SAR (InSAR) con separación de píxel de 90 m conforme a CF, ideales para mediciones simplificadas de desplazamiento del terreno. ", "ARROW_BACKWARD": "flecha_hacia atrás", "ARROW_FORWARD": "flecha_adelante", "ASCENDING": "Ascendente", @@ -121,6 +123,7 @@ "CAMPAIGN_SELECTOR": "Selector de Campaña", "CANADAS_OPEN_LICENSE": "Licencia de Gobierno Abierto de Canadá", "CANCEL": "Cancelar", + "CANNOT_RENAME_PROJECTS_FOR": "No puedes renombrar proyectos para", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(columna central) y la columna Archivos (derecha) se completarán.", "CHARACTERS": "caracteres", "CHART": "Gráfico", @@ -135,17 +138,24 @@ "CLEAR_PRODUCT_NAME_FILTER": "Eliminar filtro de nombre de producto", "CLEAR_SEARCH": "Eliminar Búsqueda", "CLEAR_SEARCH_AREA": "Eliminar área de búsqueda", + "CLEAR_SELECTED_MISSION": "Limpiar misión seleccionada", "CLEAR_WILL_CLEAR_ALL_FILES_FROM_THE_QUEUE_THE_OPTION_RESTORE_WILL_BE": "Eliminar eliminará todos los archivos de la lista. La opción Restaurar será", "CLICK_ON_THE_CART_ICON_NEXT_TO_A_SCENE_NAME_TO_ADD_ALL_THE_SCENE_S_FILES_TO_THE_DOWNLOAD_QUEUE": "Haga clic en el ícono del carrito junto al nombre de una escena para agregar todos los archivos de la escena a la lista de descarga.", "CLICK_ON_THE_FILTERS_BUTTON_IN_THE_SEARCH_MENU_THE_FILTERS_YOU_CAN_SPECIFY_INCLUDE": "Haga clic en el botón 'Filtros ...' en el menú de búsqueda. Los filtros que puede especificar incluyen:", - "CLICK_ON_THE_MAP_ONCE_TO_SPECIFY_THE_STARTING_CORNER_MOVE_THE_MOUSE_THEN_CLICK_AGAIN_TO_FINISH_THE_BOX": "Haga clic una vez en el mapa para especificar la esquina de inicio, mueva el mouse y luego haga clic nuevamente para completar el rectángulo.", + "CLICK_ON_THE_MAP_ONCE_TO_SPECIFY_THE_STARTING_CORNER_MOVE_THE_MOUSE_THEN_CLICK_AGAIN_TO_FINISH_THE_BOX": "Haga clic en el mapa una vez para especificar la esquina de inicio, mueva el mouse y, a continuación, vuelva a hacer clic para finalizar el cuadro.", "CLICK_ON_THE_ZOOM_ICON_NEXT_TO_A_SCENE_NAME_TO_ZOOM_IN_TO_THE_SCENE_S_LOCATION_ON_THE_MAP": "Haga clic en el icono de zoom junto al nombre de una escena para acercar la ubicación de la escena en el mapa.", "CLICK_THE_ARROW_DOWN_ICON_ON_THE_SEARCH_BUTTON_TO_OPEN_THE_SEARCH_MENU": "Haga clic en el icono de flecha hacia abajo en el botón 'Buscar' para abrir el menú de búsqueda.", "CLICKING_EDIT_LIST_OPENS_THE_SCENE_LIST_SEARCH_WINDOW_SO_YOU_CAN_MAKE_CHANGES_TO_YOUR_LIST": "Al hacer clic en 'Editar lista', se abre la ventana de búsqueda de la lista de escenas para que pueda realizar cambios en su lista.", "CLICKING_THE_IMAGE_THUMBNAIL_WILL_OPEN_AN_IMAGE_BROWSER_SO_YOU_CAN_VIEW_THE_IMAGE_IN_MORE_DETAIL": "Al hacer clic en la miniatura de la imagen, se abrirá un explorador de imágenes para que pueda ver la imagen con más detalle.", "CLOSE": "Cerrar", + "CLOSE_CONTENTS": "Close contents", "COHERENCE_LAYER": "Capa de coherencia", + "COMING_SOON": "¡Próximamente!", "COMPLETE_YOU_CAN_ALSO_SELECT_TO_ONLY_SUBMIT_CERTAIN_PROCESSING_TYPES_OR_ALL_PROCESSING_TYPES_BY_SELECTING": "Complete. También puede seleccionar enviar solo ciertos tipos de procesamiento o todos los tipos de procesamiento. Al seleccionar", + "CONFIRM_REMOVE_MULTIPLE": "Sí! Realmente quiero eliminar estos {{projectCount}} proyectos ({{jobCount}} trabajos).", + "CONFIRM_REMOVE_SINGLE": "Sí! Realmente quiero eliminar este 1 proyecto ({{jobCount}} trabajos).", + "CONFIRM_RENAME_MULTIPLE": "¡Sí! Realmente quiero eliminar este 1 proyecto ({{jobCount}} trabajos) múltiples.", + "CONFIRM_RENAME_SINGLE": "Sí! Realmente quiero renombrar este 1 proyecto ({{jobCount}} a \"{{newName}}\".", "CONST_REDIRECT_HTTPS_SEARCH_ASF_ALASKA_EDU_WINDOW_LOCATION_PATHNAME_WINDOW_LOCATION_HASH": "const redirect = `https://search.asf.alaska.edu${window.location.pathname}${window.location.hash}`;", "CONST_URL_WINDOW_LOCATION_HOSTNAME_TO_LOWER_CASE": "const url = ventana.ubicación.nombre de host.toLowerCase();", "CONTACT": "Contacto", @@ -157,7 +167,8 @@ "COPY_FILE_ID_TO_CLIPBOARD": "Copiar ID de Archivo al portapapeles", "COPY_FILE_IDS": "Copiar ID de archivos", "COPY_FILE_URLS_TO_CLIPBOARD": " Copiar URL de Archivo al portapapeles", - "COPY_JOB_ID": "Copiar ID de tarea", + "COPY_IDS_URLS": "Copiar IDs/URLs", + "COPY_JOB_ID": "Copiar ID de trabajo", "COPY_NAME": "Copiar Nombre", "COPY_REFERENCE_SCENE_NAMES_TO_CLIPBOARD": "Copie los nombres de las escenas de referencia en el portapapeles", "COPY_SCENE_NAME": "Copiar nombre de escena", @@ -179,7 +190,7 @@ "CREDITS_LEFT": "créditos restantes", "CREDITS_LEFT_THIS_MONTH": "créditos restantes este mes", "CRITICAL_BASELINE": "Línea Base Crítica", - "CRITICAL_BASELINE_ABBR": "Línea Crítica", + "CRITICAL_BASELINE_ABBR": "Línea Base Crítica", "CSV": "CSV", "CUMULATIVE_LAYER": "Capa Acumulativa", "CURRENT_SARVIEWS_PRODUCT_FILES_PRODUCT_SIZE_TO_STRING": "currentSarviewsProduct.files.product_size.toString()", @@ -231,7 +242,7 @@ "DERIVED_DATASETS_1": "Set de Datos Derivados", "DERIVED_DATASETS_CONTAIN_A_COLLECTION_OF_DATASETS_AVAILABLE_TO_VIEW_AND_DOWNLOAD": "Los conjuntos de datos derivados contienen una colección de conjuntos de datos disponibles para ver y descargar.", "DESCENDING": "Descendente", - "DESCRIP_GLOBAL_SEASONAL_SENTINEL": "Este conjunto de datos es la primera representación espacial de este tipo de retrodispersión y coherencia interferométrica de paso repetido de SAR global y multiestacional. La cobertura mundial comprende todas las masas terrestres y capas de hielo desde los 82 grados de latitud norte hasta los 78 grados de latitud sur. El conjunto de datos se deriva del procesamiento interferométrico de paso repetido multitemporal de alta resolución de aproximadamente 205 000 datos Sentinel-1 Single-Look-Complex (SLC) adquiridos en el modo Interferometric Wide-Swath (modo Sentinel-1 IW) del 1 de diciembre al 2019 al 30-nov-2020.", + "DESCRIP_GLOBAL_SEASONAL_SENTINEL": "Este conjunto de datos es una representación espacial sin precedentes de firmas globales y multitemporales de coherencia interferométrica y retrodispersión SAR obtenidas mediante interferometría de paso repetido. La cobertura global incluye todas las masas terrestres y capas de hielo, desde los 82 grados de latitud norte hasta los 78 grados de latitud sur. El conjunto de datos se deriva del procesamiento interferométrico multitemporal de alta resolución de aproximadamente 205 000 datos Sentinel-1 en formato Single-Look-Complex (SLC), adquiridos en modo Interferometric Wide-Swath (modo IW de Sentinel-1) entre el 1 de diciembre de 2019 y el 30 de noviembre de 2020.", "DESCRIPTION_RADIOMETRIC_TERRAIN_CORRECTION": "La Corrección Radiométrica del Terreno (RTC) elimina las distorsiones geométricas y radiométricas en los conjuntos de datos SAR y crea datos listos para el análisis adecuados para su uso en aplicaciones GIS.", "DETAIL": "Detalle", "DETAILS": "detalles : \"\"", @@ -239,14 +250,18 @@ "DEVELOPER": "Desarrollador", "DIRECTION": "Dirección", "DISABLE": "Desactivar", + "DISCLAIMER": "Aviso legal", "DISP_DOI": "DOI de desplazamiento", "DISPLACEMENT": "Desplazamiento", - "DISPLACEMENT_DESCRIPTION": "Los productos de desplazamiento proporcionan información sobre los cambios antropogénicos y naturales en la superficie de la Tierra, cubriendo América del Norte.", + "DISPLACEMENT_DATA_DISCLAIMER": "Aviso legal sobre los datos de desplazamiento", + "DISPLACEMENT_DATA_DISCLAIMER_TEXT": "Los datos de desplazamiento que se muestran aquí son un producto de visualización filtrado por longitudes de onda cortas. El filtrado elimina señales de longitudes de onda largas (> ~25 km), como el ruido atmosférico, y resalta señales de longitudes de onda cortas, como deslizamientos de tierra, pero también puede introducir artefactos (por ejemplo, consulte el área de subsidencia del Valle Central, California) que no están presentes en la capa de desplazamiento validada. Antes de interpretar los datos, por favor lea las preguntas frecuentes.", + "DISPLACEMENT_DESCRIPTION": "Los productos de desplazamiento proporcionan información sobre los cambios antropogénicos y naturales de la superficie terrestre, cubriendo Norteamérica.", "DISPLACEMENT_FILTERS": "Filtros de desplazamiento", "DISPLACEMENT_SEARCH": "Búsqueda de Desplazamiento", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "aparecerá si desea deshacer esta acción.", "DISPLAYED_IN_THE_SEARCH_MENU_AT_THE_TOP_YOU_CAN_ACCESS_ALL_OF_THE_HIDDEN_FILTERS_BY": "que se muestra en el menú de búsqueda en la parte superior. ", "DO_YOU_WANT_TO_DELETE_ALL_SERIES": "¿Quieres eliminar todas las series?", + "DOCUMENTATION": "Documentación", "DONE": "Hecho", "DOWNLOAD": "Descargar", "DOWNLOAD_ALL": "Descargar todo", @@ -274,10 +289,12 @@ "E_PREVENT_DEFAULT": "e.preventDefault();", "EACH_WITH_THEIR_OWN_PROCESSING_OPTIONS_SELECT_THE_PROCESSINGOPTIONS_YOU_WISH": "cada uno con sus propias opciones de procesamiento. ", "EDIT": "Editar", + "EDIT_ALL_PROJECT_NAMES": "Editar todos los nombres de los proyectos", "EDIT_CURRENT_AREA_OF_INTEREST": "Editar área de interés actual", "EDIT_FILTERS": "Editar filtros", "EDIT_LIST": "Lista de edición", "EDIT_NAME": "Editar nombre", + "EDIT_PROJECT_NAME": "Editar nombre del proyecto", "EMAIL": "correo electrónico", "END": "Fin", "END_DATE": "Fecha Final", @@ -285,8 +302,10 @@ "ENVIRONMENT_FILE": "Archivo de entorno", "EQUATORIAL_MAP_VIEW": "Ver Mapa Ecuatorial", "ERS_DESC": "Principalmente imágenes SAR dentro de las máscaras de la estación ASF y McMurdo, Antártida. Los datos son adecuados para la interferometría.", + "ESTIMATED_TIME_REMAINING": "Tiempo estimado restante", "EVENT": "Evento", "EVENT_DATE": "Fecha del evento", + "EVENT_DESCRIPTION_ID_TYPE": "descripción del evento, ID o tipo", "EVENT_DETAIL": "Detalle del evento", "EVENT_FILTERS": "Filtros de Eventos", "EVENT_PRODUCTS": "Productos de Eventos", @@ -302,6 +321,7 @@ "EXPORT_API": "Exportar API", "EXPORT_PYTHON": "Exportar Python", "FAILED": "Fallido", + "FAILED_PROJECTS": "Proyectos fallidos", "FALSE": "},falso);", "FARADAY_ROTATION": "Rotación de Faraday", "FEEDBACK": "Comentarios", @@ -325,6 +345,7 @@ "FILES_OPC": "(shp, geojson, kml, zip)", "FILES_PROVIDED_BY_THIS_FEATURE_ARE_COMPATIBLE_WITH_THE_GEOGRAPHIC_SEARCH_IMPORT_FEATURE": "Los archivos proporcionados por esta función son compatibles con la función de importación de Búsqueda Geográfica.", "FILES_THE_RIGHT_COLUMN": "Archivos - la columna derecha", + "Filter Campaign": "Filtrar por campaña", "FILTER_PRESET_NAME": "Nombre del Filtro Preestablecido", "FILTER_SEARCHES": "Filtrar búsquedas", "FILTERS": "Filtros", @@ -365,13 +386,13 @@ "GEOJSON": "geojson", "GEOSPATIAL_FILES_HERE": "Archivos Geoespaciales", "GET_AN_EARTHDATA_LOGIN": "Obtenga un inicio de sesión de Earthdata", - "GET_APP": "Obtener aplicaciones", + "GET_APP": "Obtener_aplicaciones", "GET_HELP_ON_HOW_TO_USER_VERTEX": "Obtenga ayuda sobre cómo utilizar Vertex", "GETTING_AN_EARTH_DATA_ID_AND_LOGGING_IN": "Obtener una ID de EarthData e iniciar sesión", "GETTING_STARTED": "Empezando", "GISMO": "GISMO", "GLACIER_SPEED": "Velocidad del Glaciar", - "GLOBAL_SEASONAL_SENTINEL": "Conjunto de Datos de Estacionales Globales de Retrodispersión y Coherencia Del Sentinel-1 ", + "GLOBAL_SEASONAL_SENTINEL": "Conjunto de datos global de coherencia interferométrica y retrodispersión estacional de Sentinel-1", "GRATICULE_OVERLAY": "Superposición de Retícula", "GRAZING_ANGLE": "Ángulo Rasante", "GRIDLINES_OVERLAY": "Superposición de líneas de cuadrícula", @@ -392,21 +413,23 @@ "HTTPS_URS_EARTHDATA_NASA_GOV_USERS_NEW": "https://urs.earthdata.nasa.gov/users/new", "HY_P3_API_URL": "URL de la API de HyP3", "HY_P3_USER_GUIDE": "Guía del usuario de HyP3", - "HYP3_JOB_IDS_INFO_BAR": "Barra informativa de ID de tareas HYP3", + "HYP3_AVAILABLE": "Disponible para procesamiento On Demand (HyP3)", + "HYP3_JOB_IDS_INFO_BAR": "Barra informativa de ID de trabajos HYP3", "HYP3_SDK_DOCS": "Documentos del SDK de HyP3", "I_DS": "identificaciones", "IF_YOU_ARE_LOGGED_INTO_VERTEX_CLICKING_ON_THE_CART_ICON_IN_THE_HEADER_LABELED_DOWNLOADS": "Si ha iniciado sesión en Vertex, al hacer clic en el ícono del carrito en el encabezado, denominado Descargas,", "IF_YOU_DO_NOT_ALREADY_HAVE_ONE_REGISTER_FOR_A_FREE_EARTHDATA_LOGIN_ACCOUNT": "Si aún no tiene una, regístrese para obtener una cuenta gratuita de inicio de sesión de Earthdata.", "IF_YOU_NEED_MORE_INFORMATION_ABOUT_A_PARTICULAR_DATASET_CLICK_ON_THE_HELP_ICON_IN_THE_DATASET_SELECTOR": "Si necesita más información sobre un conjunto de datos en particular, haga clic en el icono de ayuda en el selector de conjuntos de datos.", "IF_YOU_WISH_TO": "Si quiere", - "IMAGE_SEARCH": "búsqueda de imágenes", + "IMAGE_SEARCH": "búsqueda_de_imágenes", "IMPORT_AREA_OF_INTEREST": "Importar área de interés", "IMPORT_FILE": "Importar archivo", "IN_ADDITION_THERE_ARE_BUTTONS_BELOW_THE_METADATA_ALMOST_ALL_SCENES_HAVE_A": "Además, hay botones debajo de los metadatos. Casi todas las escenas tienen un", + "IN_PROGRESS": "En progreso", "IN_SAR_PAIR": "par InSAR", "IN_THE_LEFT_COLUMN_AS_YOU_CLICK_ON_THE_DIFFERENT_SCENES_YOU_WILL_SEE_THE_CENTER_COLUMN_REFLECT_THE": "En la columna izquierda. Al hacer clic en las diferentes escenas, verá que la columna central refleja el", "IN_THE_UPPER_RIGHT_CORNER_OF_VERTEX_THEN_SELECT_THE_REGISTER_BUTTON_AND_FILL_IN": "en la esquina superior derecha de Vertex, luego seleccione el botón \"REGISTRARSE\" y complete", - "INCIDENCE_ANGLE": "Incidence Angle", + "INCIDENCE_ANGLE": "Ángulo de Incidencia", "INCIDENCE_ANGLE_MAP": "Mapa de ángulo de incidencia", "INCLUDE": "Incluir", "INCLUDE_A_FALSE_COLOR_RGB": "Incluya una descomposición RGB en colores falsos en el paquete del producto para gránulos de doble polarización (ignorado para gránulos de polarización simple).", @@ -416,12 +439,11 @@ "INFO_BACKSCATTER_COEFFICIENT": "Normalización del coeficiente de retrodispersión, ya sea por área de suelo (sigma0) o área iluminada proyectada en la dirección de la mirada (gamma0).", "INFO_GISMO": "El proyecto Ice-Sheet Mapping Observatory (GISMO) mapeó el vuelo sobre la capa de hielo de Groenlandia.", "INFO_GLACIER_SPEED": "Este conjunto de datos revela patrones complejos de flujo de glaciares en Alaska.", - "INFO_GLOBAL_SEASONAL_SENTINEL": "Este conjunto de datos representa la coherencia interferométrica y las firmas de retrodispersión globales en múltiples temporadas.", + "INFO_GLOBAL_SEASONAL_SENTINEL": "Este conjunto de datos proporciona una representación espacial de la coherencia interferométrica global multiestacional y las firmas de retrodispersión.", "INFO_NAME_OF_THE_DEM": "Nombre del DEM a utilizar para el procesamiento. copernicus usará el Copernicus GLO-30 DEM público, mientras que el legado utilizará el DEM con la mejor cobertura de los conjuntos de datos SRTM/NED heredados de ASF.", "INFO_PRODUCT_PIXEL": "Espaciado de píxeles del producto en metros", "INFO_PRODUCT_PIXEL ": "Espaciado de píxeles del producto en metros.", - "INFO_RADARSAT": "El RADARSAT-1 Antarctic Mapping Project (RAMP) adquirió un mapa completo de la Antártida.", - "INFO_RADARSAT_plural": "El RADARSAT-1 Antarctic Mapping Project (RAMP) adquirió un mapa completo de la Antártida.", + "INFO_RADARSAT": "El Proyecto de Cartografía Antártica RADARSAT-1 (RAMP) adquirió un mapa completo de la Antártida.", "INFO_SCALE_OF_OUTPUT_IMAGE": "Escala de la imagen de salida; potencia, decibel o amplitud.", "INFO_SEA_ICE_MEASURES": "Este conjunto de datos incluye capturas de radar del hielo marino en el Ártico y el Océano Austral.", "INFO_WETLANDS_MEASURES": "Este conjunto de datos incluye mapas a escala regional y continental que cubren sistemas de humedales cruciales.", @@ -437,14 +459,14 @@ "IS_USED_TO_DOWNLOAD_MULTIPLE_PRODUCTS_WITH_EITHER_THE": "se utiliza para descargar múltiples productos, ya sea con el", "IS_USED_TO_EXPORT_THE_CONTENTS_OF_THE_DOWNLOAD_QUEUE": "se utiliza para exportar el contenido de la lista de descarga", "ITEMS_CAN_BE_REMOVED_FROM_THE_QUEUE": "Los elementos se pueden eliminar de la lista", - "J_D_CREATE_ELEMENT_S_DL_L_DATA_LAYER_AND_L_L_J_ASYNC_TRUE_J_SRC": "j=d.createElement(s),dl=l!='capaDeDatos'?'", "JERS_1_AND_RADARSAT_1_DATASETS_REQUIRE_A": "Los conjuntos de datos JERS-1 y RADARSAT-1 requieren un", "JERS_1_REQUIRES_A": "JERS-1 requiere un", "JERS_DESC": "El JERS-1 (Japanese Earth Resources Satellite) SAR es un radar de imágenes de alta resolución y para todo tipo de clima. Usos de los datos: estudios de tierra, agricultura, silvicultura, pesca, medio ambiente...", "JOB": "trabajo", "JOB_FILTERS": "Filtros de Trabajo", - "JOB_IDS_SELECTOR": "Selector de ID de tareas", - "JOB_INGEST_PROCESSING": "El trabajo On Demand se está procesando actualmente; Los metadatos de la escena estarán disponibles una vez que se complete el trabajo.", + "JOB_ID": "ID del Trabajo", + "JOB_IDS_SELECTOR": "Selector de ID de trabajo", + "JOB_INGEST_PROCESSING": "El trabajo de On Demand se está procesando actualmente; los metadatos de la escena estarán disponibles una vez que el trabajo haya finalizado.", "JOB_MAX": "trabajos Max", "JOB_STATUS": "Estado del Trabajo", "JOB_SUBMITTED": "Trabajo Enviado", @@ -483,9 +505,6 @@ "LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH": "inicie sesión para ver el número de créditos que restan este mes", "LOGIN_TO_VIEW_NUMBER_OF_JOBS_LEFT_THIS_MONTH": "inicie sesión para ver la cantidad de trabajos que restan este mes", "LOOKING_FOR_DEMS": "Buscando DEMs", - "LOOKS TWO": "parece_dos", - "LOOKS_MANY": "parece_uno", - "LOOKS_OTHER": "parece_uno", "MAGNITUDE": "Magnitud", "MAIN": "Principal", "MAIN_BAND_FREQ_A_POLARIZATION": "Polarización de Banda Principal (Frecuencia A)", @@ -501,7 +520,6 @@ "MATCHING_FRAMES": "Marcos Coincidentes", "MATURITY": "Madurez", "MAX_DAYS": "Días máximos", - "MENU_BOOK": "menú_libro", "METADATA": "metadatos", "METADATA_CSV": "Metadatos (csv)", "METADATA_DOWNLOAD": "Descarga de Metadatos", @@ -514,7 +532,6 @@ "METERS": "Metros", "MIN_DAYS": "Días mínimos", "MORE": "Más", - "MORE_HORIZ": "mas_horiz", "MORE_INFO": "Más Información", "MORE_LIKE_THIS": "Más Como Esto", "MORE_LIKE_THIS_BUTTON_IF_THE_SCENE_IS_SUITABLE_FOR_INTERFEROMETRY_THERE_WILL_BE_TWO_ADDITIONAL": "Botón 'Más como esto'. Si la escena es adecuada para interferometría, habrá dos adicionales\n\n\n\n\n\n\n\n", @@ -524,7 +541,6 @@ "NAVIGATE_TO_YOUR_AREA_OF_INTEREST": "Navegue a su área de interés", "NAVIGATE_TO_YOUR_AREA_OF_INTEREST_BY_DRAGGING_THE_MAP_WHILE_HOLDING_DOWN_THE_LEFT_MOUSE_BUTTON": "Navegue hasta su área de interés arrastrando el mapa mientras mantiene presionado el botón izquierdo del mouse.", "NEW": "¡Nuevo!", - "NEW_DATE_GET_TIME_EVENT_GTM_JS_VAR_F_D_GET_ELEMENTS_BY_TAG_NAME_S": "nueva Fecha().getTime(),evento:'gtm.js'});var f=d.getElementsByTagName(s)[0],", "NEW_END_DATE": "Nueva fecha de finalización", "NEXT": "Siguiente", "NISAR_DESC": "NISAR proporciona datos SAR de banda L y S para medir los ecosistemas cambiantes, las superficies dinámicas y las masas de hielo de la Tierra con una regularidad de 12 días en pasadas ascendentes y descendentes.", @@ -548,6 +564,7 @@ "NO_POINT_SELECTED": "Ningún punto seleccionado", "NO_POLARIZATION_SELECTED": "No se seleccionó una polarización", "NO_POLARIZATIONS_TO_SELECT": "No hay polarizaciones para seleccionar", + "NO_PROCESSING_OPTIONS_FOR": "No hay opciones de procesamiento para", "NO_PRODUCTS_AVAILABLE_FOR_THIS_EVENT": "No hay productos disponibles para este evento", "NO_RESULTS": "SIN RESULTADOS", "NO_SCENE_SELECTED": "No se seleccionó ninguna escena", @@ -559,7 +576,7 @@ "NOT_ABLE_TO_SELECT_SIMILAR_SCENES_FROM_THIS_SOURCE": "No es posible seleccionar escenas similares de esta fuente", "NOT_ALL_FILTERS_WILL_BE_AVAILABLE_FOR": "No todos los filtros estarán disponibles para", "NOTE_IN_VERTEX_A_SCENE_IS_CONSIDERED_TO_BE_A_PACKAGE_CONTAINING_ALL_FILES_OR_PRODUCTS": "Nota: En Vertex, una escena se considera un paquete que contiene todos los archivos o productos", - "NOTE_THE_NUMBER_OF_FILES_THAT_ARE_PREDICTED_TO_MATCH_THE_CURRENT_SEARCH_PARAMETERS_IS_DISPLAYED_UNDER_THE_SEARCH_BUTTON_IF_THERE_ARE_NO_PREDICTED_MATCHES_THE_SEARCH_BUTTON_WILL_BE_GREYED_OUT_AND_DISPLAY_NO_RESULTS": "Nota: El número de archivos que se predice coincidan con los parámetros de búsqueda actuales se muestra debajo del botón de BÚSQUEDA. Si no hay coincidencias predichas, el botón de búsqueda se desactivará y mostrará SIN RESULTADOS.", + "NOTE_THE_NUMBER_OF_FILES_THAT_ARE_PREDICTED_TO_MATCH_THE_CURRENT_SEARCH_PARAMETERS_IS_DISPLAYED_UNDER_THE_SEARCH_BUTTON_IF_THERE_ARE_NO_PREDICTED_MATCHES_THE_SEARCH_BUTTON_WILL_BE_GREYED_OUT_AND_DISPLAY_NO_RESULTS": "Nota: El número de archivos que se prevé que coincidan con los parámetros de búsqueda actuales se muestra en el botón BUSCAR. Si no hay coincidencias previstas, el botón de búsqueda aparecerá en gris y mostrará SIN RESULTADOS.", "OBSERVATIONAL_FILTERS": "Filtros Observacionales", "OF": "de", "OF_THE_BOUNDING_BOX_OR_TO_DELETE_THE_BOUNDING_BOX": "\"Del rectángulo delimitador o para eliminar el rectángulo delimitador.", @@ -583,6 +600,7 @@ "ONLY_DISPLAY_SCENES_WITH_A_BROWSE_IMAGE": "Mostrar solo escenas con una imagen de exploración", "OPACITY": "Opacidad", "OPACITY_OF_COHERENCE_LAYER": "Opacidad de la capa de coherencia", + "OPEN_FAQ": "Abrir preguntas frecuentes", "OPEN_IN_IMAGE_VIEWER": "Abrir en el visualizador de imágenes", "OPEN_LINK_TO_DOCUMENTATION": "Abrir enlace a la documentación.", "OPEN_MANUAL": "Abrir Manual", @@ -613,9 +631,9 @@ "PERFORM_A_SEARCH": "Realizar una búsqueda", "PERFORM_ANY_SENTINEL_SEARCH_WHICH_WILL_RETURN_A_LIST_OF_FILES_THAT_COULD_POTENTIALLY_BE_SUITABLE": "Realice cualquier búsqueda de Sentinel que arrojará una lista de archivos que podrían ser potencialmente adecuados", "PERFORM_RTC_PROCESSING_ON_THE_FILE_THEN_CLICK_THE_ICON_TO_ADD_THAT_FILE_TO_THE_ON_DEMAND_PROCESSING": "realice el procesamiento RTC en el archivo, luego haga clic en el icono para agregar ese archivo al Procesamiento a pedido", - "PERFORMING_BASELINE_SEARCHES": "Realización de búsquedas de línea de base", + "PERFORMING_BASELINE_SEARCHES": "Realización de búsquedas de Baseline", "PERFORMING_SHORT_BASELINE_SUBSET_SBAS_SEARCHES": "Realización de búsquedas de subconjuntos de línea de base corta (SBAS)", - "PERIODS_WITHIN_AN_OVERALL_RANGE_OF_DATES_CLICK_THE_SEASONAL_SEARCH_TOGGLE": "periodos dentro de un rango general de fechas. ", + "PERIODS_WITHIN_AN_OVERALL_RANGE_OF_DATES_CLICK_THE_SEASONAL_SEARCH_TOGGLE": "Periodos dentro de un rango general de fechas. Haz clic en el interruptor de Búsqueda Estacional", "PERPENDICULAR": "Perpendicular", "PERPENDICULAR_CRITERIA": "Criterios Perpendiculares:", "PGE_VERSION": "PGE Versión", @@ -643,13 +661,12 @@ "PREFERENCES_FOR": "Preferencias para", "PROCESSING_DATE": "Fecha de procesamiento:", "PROCESSING_OPTIONS": "Opciones de procesamiento", - "PROD_FILES_PRODUCT_SIZE_TO_STRING_READABLE_SIZE_FROM_BYTES": "prod.files.product_size.toString() | ", "PRODUCT": "Producto", - "PRODUCT_BYTES_TO_STRING_READABLE_SIZE_FROM_BYTES": "producto.bytes.toString() | ", "PRODUCT_CRITERIA": "Criterios del producto", "PRODUCT_DETAILS": "Detalles de producto", "PRODUCT_FILENAME": "Nombre de archivo del producto:", "PRODUCT_FILTERS": "Filtros de Productos", + "PRODUCT_NAME_PLACEHOLDER": "Marcador de posición del nombre del producto", "PRODUCT_OVERLAYS_FOR_CURRENT_SCENE_DATASET_NOT_AVAILABLE": "Superposiciones de Producto para el conjunto de datos de escena actual no disponible", "PRODUCT_SOURCE_SCENE": "Producto/Escena de origen", "PRODUCT_TYPE": "Tipo de Producto", @@ -661,7 +678,29 @@ "PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT": "Los productos en su lista pueden requerir un acuerdo de conjunto de datos restringido.", "PRODUCTS_TO_DOWNLOADS_FROM_SELECTED_EVENT": "los productos a las descargas del evento seleccionado", "PROFILE": "Perfil", + "PROJECT": "Proyecto", "PROJECT_NAME": "Nombre del Proyecto", + "PROJECT_NAME_DIALOG_SUBTITLE": "Actualizar nombre del proyecto", + "PROJECT_NAME_DIALOG_TITLE": "Nombre del proyecto", + "PROJECT_NAME_HELP_TEXT": "Ingrese un nuevo nombre de proyecto", + "PROJECT_NAME_MAX_LENGTH": "El nombre del proyecto no puede superar los 100 caracteres", + "PROJECT_NAME_PLACEHOLDER": "Marcador de posición del nombre del proyecto", + "PROJECT_NAME_REQUIRED": "Se requiere el nombre del proyecto", + "PROJECT_NAME_UNNAMED": "(sin nombre)", + "PROJECT_NAME_UPDATE_ALL_TOOLTIP": "Actualizar el nombre del proyecto para todos los trabajos cargados", + "PROJECT_NAME_UPDATE_FOR_JOBS": " Actualizar nombre del proyecto para {{count}} trabajos ", + "PROJECT_RENAME_CANCELLED": "Cambio de nombre del proyecto cancelado", + "PROJECT_RENAME_CONFIRMATION": "Confirmar cambio de nombre del proyecto", + "PROJECT_RENAME_FAILED": "El cambio de nombre del proyecto fracasó", + "PROJECT_RENAME_HELP_TOOLTIP": "Cambiar el nombre del proyecto para los elementos seleccionados", + "PROJECT_RENAME_IN_PROGRESS": "Cambio de nombre del proyecto en progreso", + "PROJECT_RENAME_INFO": "Renombrar el proyecto al nombre seleccionado", + "PROJECT_RENAME_REVIEW": "Revisar cambios en el nombre del proyecto", + "PROJECT_RENAME_SUCCESS": "El proyecto se renombró correctamente", + "PROJECT_RENAME_SUMMARY": "Resumen del cambio de nombre del proyecto", + "PROJECT_RENAME_WARNING": "Esta acción no se puede deshacer", + "PROJECTS_SELECTED": "Proyectos seleccionados", + "PROJECTS_TO_RENAME": "Proyectos a renombrar:", "PUSH_PIN": "chincheta", "PYTHON_PY": "python (.py)", "QUAKE": "terremoto", @@ -669,7 +708,7 @@ "QUEUE_YOU_CAN_ADD_AS_MANY_FILES_AS_YOU_WISH_BUT_THERE_IS_A_LIMIT_OF_TWO_HUNDRED_FILES_PER_MONTH_THAT": "lista. Puede agregar tantos archivos como desee, pero hay un límite de doscientos archivos por mes que", "QUICKLY_LEARN_THE_BASICS_OF_VERTEX_DATA_SEARCH_WITH_THIS_GETTING_STARTED_SERIES": "Aprenda rápidamente los conceptos básicos de Vertex Data Search con esta serie de introducción.", "RADAR_LOOK_DIRECTION": "Radar Look Direction", - "RADARSAT_1": "Proyecto de Mapeo Antártico RADARSAT-1 ", + "RADARSAT_1": "Proyecto de Cartografía Antártica RADARSAT-1 (RAMP)", "RADARSAT_1_DESC": "El radar de apertura sintética (SAR) RADARSAT-1 era un poderoso instrumento de microondas. Capturó imágenes SAR de alta calidad de la Tierra de día y de noche y en todas las condiciones climáticas.", "RADARSAT_IS_AVAILABLE_THROUGH": "RADARSAT-1 está disponible gratuitamente a través de", "RADIO_BUTTON_UNCHECKED": "botón_de_radio_sin marcar", @@ -680,7 +719,7 @@ "READ_OUR_ON_DEMAND_GUIDE": "Lea nuestra guía a On Demand ", "READ_OUR_USER_GUIDE": "Lea nuestra guía de usuario", "READ_THE_VERTEX_USER_GUIDE_INCLUDING_SECTIONS_ON_GETTING_STARTED_BASELINE_SEARCHES": "Lea la Guía del usuario de Vertex, incluidas las secciones sobre Primeros pasos, Búsquedas de referencia,", - "READABLE_SIZE_FROM_BYTES": "| ", + "RECOMMENDED_PRODUCT": "Producto Recomendado", "REFERENCE": "Referencia", "REFERENCE_SCENE": "escena de referencia.", "REFERENCE_SCENES": "Escenas de referencia", @@ -691,10 +730,22 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Eliminar archivo de las descargas", "REMOVE_FILE_FROM_QUEUE": "Eliminar archivo de la lista", "REMOVE_JOB": "Quitar trabajo", + "REMOVE_PROJECT_NAME": "Eliminar {{count}} nombre del proyecto", + "REMOVE_PROJECT_NAMES": "Eliminar {{count}} nombres de proyectos", "REMOVE_RED_EYE": "quitar_ojo_rojo", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Eliminar archivos de escena de las descargas", "REMOVE_SERIES": "Eliminar serie", - "REQUEUE_PROJECT": "Agregar proyecto a la lista", + "RENAME_ALL_FAILED": "Error al renombrar {{count}} trabajo(s). ", + "RENAME_COMPLETE": "Renombrar Completo", + "RENAME_ERROR": "Ocurrió un error al renombrar los trabajos.", + "RENAME_JOB_TO": "Renombrar el trabajo a:", + "RENAME_JOBS_TO": "Renombrar {{count}} trabajos a:", + "RENAME_PARTIAL_SUCCESS": "Se renombraron {{success}} trabajo(s). {{failed}} fallaron.", + "RENAME_PROJECT": "Renombrar el proyecto", + "RENAME_PROJECTS": "Renombrar proyectos", + "RENAME_SUCCESS": "Cambio de nombre completado correctamente", + "RENAMING_JOBS": "Renombrar los puestos...", + "REQUEUE_PROJECT": "Renombrar el proyecto", "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "DEM remuestreado (SRTM o NED) utilizado para el procesamiento de RTC.", "RESET_CHART_REFERENCE": "Restablecer gráfico", "RESET_TO_DEFAULT": "Restablecen a los predeterminados", @@ -714,8 +765,6 @@ "RUNNING": "Corriendo", "SAMPLES_PER_BURST": "Muestras Por Burst", "SAR_FILE_SEARCHES": "Búsquedas de archivos SAR", - "SARVIEW_EVENT_DESCRIPTION_0_TO_UPPER_CASE": "sarviewEvent.descripción[0].toUpperCase()", - "SARVIEW_EVENT_DESCRIPTION_SLICE": "sarviewEvent.descripción.slice(1)", "SARVIEWS_EVENT": "Evento SARVIEWS", "SARVIEWS_EVENTS": "Eventos Sarviews", "SATELLITE": "Satélite", @@ -742,8 +791,7 @@ "SCALE": "Escala", "SCATTERING_AREA_MAP": "Mapa del área de dispersión", "SCENE": "Escena", - "SCENE_ASYNC_METADATA_JOB_JOB_PARAMETERS_SCENES_1_NAME": "(escena$ | asíncrono).metadatos?.trabajo?.trabajo_parámetros.escenas[1].nombre", - "SCENE_DETAIL": "Detalle de escena", + "SCENE_DETAIL": "Detalles de la escena", "SCENE_DETAIL_THE_CENTER_COLUMN": "Detalle de la escena: la columna central", "SCENE_I_DS": "ID de escena", "SCENE_LIST_SEARCH": "Búsqueda de Lista de Escenas", @@ -770,6 +818,7 @@ "SEARCH_OPTIONS": "Opciones de Búsqueda", "SEARCH_RESULTS": "Resultados de la Búsqueda", "SEARCH_TYPE": "Tipo de Búsqueda", + "SEARCH_TYPE_MISMATCH": "El tipo de la búsqueda actual es incorrecto", "SEARCH_TYPES": "Tipos de Búsqueda", "SEARCHING_FOR_A_FRAME_OF_INTEREST_BY_1_2_FRAMES": "buscando un marco de interés por ±1-2 marcos.", "SEASAT_DESC": "La misión principal de Seasat era observar los océanos utilizando el primer sensor de radar de apertura sintética (SAR) de la NASA.", @@ -782,11 +831,11 @@ "SELECT_GEOGRAPHIC_FROM_THE_DROP_DOWN_LIST_OF_SEARCH_TYPES": "Seleccione 'Geográfica' de la lista desplegable de tipos de búsqueda.", "SELECT_SAVE_SEARCH_FROM_THE_SEARCH_MENU": "Seleccione 'Guardar búsqueda' en el menú de búsqueda.", "SELECT_SAVED_SEARCHES_FROM_THE_SEARCH_MENU": "Seleccione 'Búsquedas guardadas...' en el menú de búsqueda.", - "SELECT_SEARCH_HISTORY_FROM_THE_SEARCH_MENU": "Seleccione 'Buscar historial...' en el menú de búsqueda.", "SELECT_THE_DATASET_OF_INTEREST": "Seleccione el conjunto de datos de interés.", "SELECTED": "Seleccionado", "SELECTED_EVENT_PRODUCTS": "Productos de Eventos Seleccionados", "SELECTED_JOB": "Trabajo Seleccionado", + "SELECTED_PRODUCTS": "Productos seleccionados", "SELECTING_LIST_FROM_THE_SEARCH_TYPE_DROPDOWN_MENU_OPENS_THE_SCENE_LIST_SEARCH_WINDOW_AND_ALLOWS_YOU_TO_ENTER_A_LIST_OF_SCENE_OR_FILE_NAMES": "Al seleccionar 'Lista' en el menú desplegable Tipo de búsqueda, se abre la ventana Búsqueda de lista de escenas y le permite ingresar una lista de nombres de escenas o archivos.", "SENTINEL_1_BURST_DESC": "Los productos Sentinel-1 BURST son las respuestas de pulso del radar individuales que componen las 3 sub-franjas de cada producto Sentinel-1 SLC.", "SENTINEL_1_INTERFEROGRAM_BETA_DESC": "El nivel 2 son productos de interferograma Sentinel-1 estandarizados y generados por el proyecto Advanced Rapid Imaging and Analysis (ARIA) del JPL.", @@ -863,11 +912,12 @@ "STOP_DOWNLOAD": "Detener la descarga", "STOP_DRAWING": "Detener dibujo", "STOP_EDITING": "Detener edición", - "STOP_TIME": "Para el Tiempo", + "STOP_TIME": "Hora de finalización", + "STORYMAP": "StoryMap", "STREET": "Calle", "STREET_LAYER": "Capa de Calle", "SUBJECT": "sujeto : \"\",", - "SUBMIT": "Entregar", + "SUBMIT": "Enviar", "SUBMIT_ALL_OF_THE_FILES_YOU_WANT_FOR_ADDITIONAL_PROCESSING_AFTER_SUBMITTING_YOUR_FILES_YOU_CAN_VIEW": "Envíe todos los archivos que desee para procesamiento adicional. Después de enviar sus archivos, puede ver", "SUBMIT_AND_VIEW_JOBS": "Enviar Y Ver Trabajos", "SUBMITTED_PRODUCTS": "Productos Enviados", @@ -885,11 +935,10 @@ "TEMPORAL": "Temporal", "TEMPORAL_CRITERIA": "Criterios Temporales:", "TEST": "Prueba", - "TEST_1_1": "PRUEBA 1.1", "THAT_ARE_RELATED_TO_A_SPECIFIC_LOCATION_AND_TIME": "que están relacionados con un lugar y tiempo específico.", "THE_BASELINE_TOOL_BUTTON_OPENS_THE_ASF_BASELINE_TOOL_WHICH_IS_USED_FOR_THE_CREATION_OF_IN_SAR_STACKS": "El botón 'Herramienta de línea base' abre la Herramienta de línea base ASF, que se utiliza para la creación de pilas InSAR.", "THE_CART_CHANGES_APPEARANCE_WHEN_THIS_IS_DONE": "El carrito cambia de apariencia cuando se hace esto.", - "THE_CITATION_BUTTON_OPENS_A_NEW_WINDOW_WITH_CITATION_GUIDANCE_FOR_PUBLISHED_WORKS_USING_DATA_IMAGERY_OR_TOOLS_ACCESSED_THROUGH_ASF": "El botón 'Cita' abre una nueva ventana con guía de citas para trabajos publicados utilizando datos, imágenes o herramientas a las que se accede a través de ASF.", + "THE_CITATION_BUTTON_OPENS_A_NEW_WINDOW_WITH_CITATION_GUIDANCE_FOR_PUBLISHED_WORKS_USING_DATA_IMAGERY_OR_TOOLS_ACCESSED_THROUGH_ASF": "El botón 'Citación' abre una nueva ventana con guía de citas para trabajos publicados utilizando datos, imágenes o herramientas a las que se accede a través de ASF.", "THE_DIFFERENT_PROCESSING_TYPES_IF_THAT_IS_USEFUL_FOR_YOU": "los diferentes tipos de procesamiento si eso es útil para usted.", "THE_FILE_LIST_TYPE_ALLOWS_SEARCHING_FOR_SPECIFIC_FILE_NAMES_PRODUCT_NAMES_AND_THE_RESULTS_WILL_ONLY_INCLUDE_EXACTLY_THOSE_FILES": "El tipo de lista 'Archivo' permite buscar nombres de archivos específicos (nombres de productos), y los resultados solo incluirán exactamente esos archivos.", "THE_FILE_LIST_TYPE_ALLOWS_SEARCHING_FOR_SPECIFIC_FILE_NAMES_PRODUCT_NAMES_AND_THE_RESULTS_WILL_ONLY_INCLUDE_EXACTLY_THOSE_FILES.": "El tipo de lista 'Archivo' permite buscar nombres de archivos específicos (nombres de productos), y los resultados solo incluirán exactamente esos archivos.", @@ -897,11 +946,11 @@ "THE_LIST_OF_JOBS_VIA_THE_ON_DEMAND_SEARCH_WINDOW_AND_DOWNLOAD_THEM_FROM_THERE": "la lista de trabajos a través de la ventana de búsqueda On Demand y descargarlos desde allí.", "THE_MAP": "El mapa", "THE_MORE_LIKE_THIS_BUTTON_CREATES_A_SEARCH_BASED_ON_THE_SELECTED_SCENE_S_PATH_AND_FRAME": "El botón 'Más como esto' crea una búsqueda basada en la ruta y el marco de la escena seleccionada.", - "THE_NECESSARY_INFORMATION_ON_THE_SUBSEQUENT_FORM_NOTE_THAT_YOU_CAN_RESIZE_THE_FORM_IF_DESIRED": "la información necesaria en el siguiente formulario. ", + "THE_NECESSARY_INFORMATION_ON_THE_SUBSEQUENT_FORM_NOTE_THAT_YOU_CAN_RESIZE_THE_FORM_IF_DESIRED": "la información necesaria en el formulario siguiente. Tenga en cuenta que puede redimensionar la forma si lo desea.", "THE_SCENE_DETAIL_COLUMN_CENTER_PROVIDES_A_MORE_DETAILED_DESCRIPTION_OF_THE_SCENE_INCLUDING": "La columna Detalle de escena (centro) proporciona una descripción más detallada de la escena, incluyendo", "THEMING": "Tematización", "THEN_MANIPULATE_EACH_OF_THE_COMPONENTS_AS_THOUGH_THEY_WERE_INDEPENDENT_FILES": "luego manipule cada uno de los componentes como si fueran archivos independientes.", - "THIS_INTERFACE_IS_POWERED_BY_A_ROBUST_API_YOU_CAN_USE_THAT_API_DIRECTLY_ALLOWING": "Esta interfaz está impulsada por una API robusta. ", + "THIS_INTERFACE_IS_POWERED_BY_A_ROBUST_API_YOU_CAN_USE_THAT_API_DIRECTLY_ALLOWING": "Esta interfaz está impulsada por una API robusta. Puede usar esa API directamente permitiendo", "TIMELINE": "línea de tiempo", "TITLE_HOW_CAN_WE_HELP_YOU": "title : \"¿Cómo podemos ayudarte?\",", "TO": "de", @@ -914,9 +963,10 @@ "TO_VIEW_MORE_INFORMATION_ABOUT_A_SCENE_CLICK_ON_THE_SCENE_IN_THE_LEFT_COLUMN_AND_THE_SCENE_DETAIL": "Para ver más información sobre una escena, haga clic en la escena en la columna de la izquierda y en Detalle de la escena.", "TO_VIEW_YOUR_SAVED_SEARCHES_FOLLOW_THESE_STEPS": "Para ver sus búsquedas guardadas, siga estos pasos:", "TO_VIEW_YOUR_SEARCH_HISTORY_FOLLOW_THESE_STEPS": "Para ver su historial de búsqueda, siga estos pasos:", - "TOO_MANY_JOBS_IN_QUEUE": "Demasiados trabajos en lista", + "TOO_MANY_JOBS_IN_QUEUE": "Demasiados trabajos en la lista", "TOOLS": "Herramientas", "TOOLTIP": "SUGERENCIA", + "TOTAL": "Total", "TRACK": "Trayecto", "TRACK_AND_FRAME_FILTERS": "Filtros de Trayecto y Marco", "TRACK_END": "Fin del Trayecto", @@ -927,37 +977,39 @@ "UNDO": "deshacer", "UNPIN_ALL_SELECTED_PRODUCTS": "Desanclar todos los productos seleccionados", "UPDATE": "Actualizar", + "UPDATE_SAVED_SEARCH": "Actualizar búsqueda guardada con los filtros actuales", "UPLOAD": "subir", "UPLOAD_AOI_VIA_FILE": "Subir AOI a través de un archivo", "UPLOAD_GEOSPATIAL_FILE": "Subir archivo geoespacial", - "UR_LS": "URL", + "UR_LS": "URLs", "URGENT_RESPONSE": "Respuesta Urgente", "USE_AN_ASF_SEARCH_API_QUERY_TO_DOWNLOAD_MORE_RESULTS_MANUALLY": "Utilice una consulta de la API de búsqueda de ASF para descargar más resultados manualmente.", + "USE_CASE_PLACEHOLDER": "Marcador de posición del caso de uso", "USE_THE_AREA_OF_INTEREST_BUTTONS_TO_TOGGLE_DRAWING_ON_THE_MAP_ON_AND_OFF_TO_EDIT_THE_SHAPE": "Use los botones 'Área de interés' para activar y desactivar el dibujo en el mapa, para editar la forma", "USE_THE_MAP_PROJECTION_BUTTONS_IN_THE_MAP_TOOLBAR_TO_TOGGLE_BETWEEN_THE_ARCTIC_EQUATORIAL": "Use los botones de 'Proyección de mapa' en la barra de herramientas del mapa para alternar entre el Ártico, Ecuatorial,", "USE_THE_SELECTION_SHAPE_BUTTONS_TO_SWITCH_BETWEEN_DIFFERENT_DRAWING_SHAPES_INCLUDING_POINT": "Utilice los botones 'Forma de selección' para alternar entre diferentes formas de dibujo, incluyendo: punto,", "USE_THE_VIEW_BUTTONS_TO_TOGGLE_BETWEEN_THE_SATELLITE_AND_STREET_MAP_VIEWS_OF_THE_MAP": "Use los botones 'Ver' para alternar entre las vistas de satélite y mapa de calles del mapa.", "USE_THE_ZOOM_BUTTONS_TO_ZOOM_IN_AND_OUT_OF_THE_MAP_TO_CLEARLY_SEE_YOUR_AREA_OF_INTEREST": "Use los botones 'Zoom' para acercar y alejar el mapa para ver claramente su área de interés.", "USE_THIS_EVENT_S_PRODUCT_SCENES_IN_LIST_SEARCH": "Utilice las escenas de productos de este evento en la búsqueda de listas", - "USE_THIS_SCENE_IN_THE_BASELINE_TOOL_FOR_INTERFEROMETRY": "Usar esta escena en la herramienta de línea base para interferometría", + "USE_THIS_SCENE_IN_THE_BASELINE_TOOL_FOR_INTERFEROMETRY": "Usar esta escena en la herramienta de Baseline para interferometría", "USE_THIS_SCENE_IN_THE_SBAS_TOOL_TO_MAKE_PRODUCT_PAIRS_FOR_INTERFEROMETRY": "Utilice esta escena en la herramienta SBAS para hacer pares de productos para interferometría", "USER_ID_INFO_BAR": "ID de usuario", "USER_ID_SELECTOR": "ID de usuario", - "USGS_ID": "Identificación USGS •", + "USGS_ID": "Identificación USGS ", "USING_ADVANCED_FILTERS": "Uso de filtros avanzados", "USING_SEARCH_RESULTS": "Uso de resultados de búsqueda", "USING_THE_DOWNLOAD_QUEUE": "Uso de la lista de descarga", "USING_THE_MORE_LIKE_THIS_FEATURE": "Uso de la función \"Más como esto\"", "USING_ZIPPED_DATA": "Uso de datos comprimidos", "USING_ZIPPED_PRODUCT_FILES": "Uso de archivos de productos comprimidos", - "VALIDATE_ONLY": "Validar solo", - "VALIDATED_PRODUCTS_OPTION": "Productos Validados", + "VALIDATE_ONLY": "Validar Solo", + "VALIDATED_PRODUCTS_OPTION": "Productos Estándar", "VELOCITY": "Velocidad", "VELOCITY_OVERVIEW_OPACITY": "Velocity Overview Opacity", - "VERTEX_CODE_REPOSITORY": "Repositorio de código del Vertex", + "VERTEX_CODE_REPOSITORY": "Repositorio de Código del Vertex", "VERTEX_USER_GUIDE": "Guía del usuario de Vertex", "VIDEO_LIBRARY": "biblioteca_de_videos", - "VIDEO_TUTORIALS": "Tutoriales En Vídeo", + "VIDEO_TUTORIALS": "Videos tutoriales", "VIEW_DATASETS": "Ver conjuntos de datos", "VIEW_FILTERS": "Ver Filtros...", "VIEW_ON_DEMAND_PRODUCTS": "Ver productos On Demand", @@ -978,22 +1030,17 @@ "WHAT_ARE_CREDITS": "¿Qué son los créditos?", "WHAT_ARE_THESE?": "¿Qué son estas capas?", "WHAT_IS_BASELINE": "¿Qué es la línea de base", - "WHAT_IS_SBAS": "¿Qué es SBAS", + "WHAT_IS_SBAS": "¿Qué es SBAS?", "WHEN_YOU_PERFORM_A_SEARCH_AND_THE_RESULTS_ARE_RETURNED_YOU_CAN_BROWSE_THE_LIST_OF_RESULTING_SCENES": "Cuando realiza una búsqueda y se devuelven los resultados, puede navegar por la lista de escenas resultantes", "WHEN_YOU_PERFORM_A_SEARCH_AND_THE_RESULTS_ARE_RETURNED_YOU_CAN_BROWSE_THE_RESULTS": "Cuando realiza una búsqueda y se devuelven los resultados, puede examinar los resultados", "WHEN_YOU_SUBMIT_THE_JOB_S_YOU_CAN_ENTER_A_PROJECT_NAME_FOR_EASY_REFERENCE_WHEN_THE_PROCESSING_IS": "Cuando envíe el(los) trabajo(s), puede ingresar un nombre de proyecto para una fácil referencia cuando finalice el procesamiento.", "WILL_BE": "será", "WILL_CLEAR_ALL_FILES_FROM_THE_QUEUE_THE_OPTION": "borrará todos los archivos de la lista. La opción", - "WILL_COPY_THE_FILE_NAMES_OF_ALL_FILES_IN_THE_QUEUE_FOR_USE_ELSEWHERE": "copiará los nombres de todos los archivos de la cola para utilizarlos en otro lugar.", + "WILL_COPY_THE_FILE_NAMES_OF_ALL_FILES_IN_THE_QUEUE_FOR_USE_ELSEWHERE": "copiará los nombres de todos los archivos de la lista para utilizarlos en otro lugar.", "WILL_DISPLAY_THE_CONTENTS_OF_YOUR_CURRENT_DOWNLOAD_QUEUE": "mostrará el contenido de su lista de descarga actual.", "WILL_EXPAND_THE_LIST_TO_SHOW_ALL_OF_THE_INDIVIDUAL_COMPONENTS_WITHIN_THE_ZIP_ARCHIVE_YOU_CAN": "expandirá la lista para mostrar todos los componentes individuales dentro del archivo zip. ", + "WILL_RENAME_JOBS": "Se renombrarán {{count}} trabajo(s).", "WINDOW": "Ventana.", - "WINDOW_ADD_EVENT_LISTENER_DRAGENTER_FUNCTION_E": "ventana.addEventListener('dragenter',function(e){", - "WINDOW_ADD_EVENT_LISTENER_DRAGOVER_FUNCTION_E": "ventana.addEventListener('dragover',function(e){", - "WINDOW_ADD_EVENT_LISTENER_DROP_FUNCTION_E": "ventana.addEventListener('drop',function(e){", - "WINDOW_DOCUMENT_SCRIPT_DATA_LAYER_GTM_5_KZ_8_WLF": "})(ventana,documento,'guión','capa de datos','GTM-5KZ8WLF');", - "WINDOW_DOCUMENT_SCRIPT_DATA_LAYER_GTM_WNP_7_MLF": "})(ventana,documento,'script','capa de datos','GTM-WNP7MLF');", - "WINDOW_LOCATION_REDIRECT": "ventana.ubicación = redirigir;", "WITHIN_THE_DOWNLOAD_QUEUE_THE_LIST_OF_FILES_YOU_HAVE_SELECTED_TO_DOWNLOAD": "Dentro de la lista de descarga, la lista de archivos que ha seleccionado para descargar", "YOU_CAN_EXECUTE_THE_SEARCH_AND_VERIFY_IT_PERFORMS_AS_YOU_EXPECT": "Puede ejecutar la búsqueda y verificar que funciona como espera.", "YOU_CAN_HAVE_ASF_PERFORM_SAR_PROCESSING_FOR_YOU_ON_DEMAND_THE_ON_DEMAND_SYSTEM": "Puede hacer que ASF realice el procesamiento de SAR por usted On Demand. ", @@ -1020,4 +1067,4 @@ "ZOOM_TO_FIT": "Acercar para ajustar", "ZOOM_TO_RESULTS": "Acercar a los resultados", "ZOOM_TO_SCENE": "Acercar a la escena" -} +} \ No newline at end of file diff --git a/src/assets/opera-disp-logo.png b/src/assets/opera-disp-logo.png new file mode 100644 index 000000000..0d6ea0339 Binary files /dev/null and b/src/assets/opera-disp-logo.png differ diff --git a/src/karma.conf.js b/src/karma.conf.js index 44bf3b5fc..e85f053b9 100644 --- a/src/karma.conf.js +++ b/src/karma.conf.js @@ -16,20 +16,20 @@ module.exports = function (config) { autoWatch: true, browsers: ['ChromeHeadless'], customLaunchers: { - HeadlessChrome: { - base: 'ChromeHeadless', - flags: [ - '--no-sandbox', - '--headless', - '--disable-setuid-sandbox', - '--disable-gpu', - '--disable-translate', - '--disable-extensions' - ] - } + HeadlessChrome: { + base: 'ChromeHeadless', + flags: [ + '--no-sandbox', + '--headless', + '--disable-setuid-sandbox', + '--disable-gpu', + '--disable-translate', + '--disable-extensions', + ], + }, }, singleRun: false, browserNoActivityTimeout: 120000, - urlRoot: '' + urlRoot: '', }); }; diff --git a/src/main.ts b/src/main.ts index d9a2e7e4a..4357ff4c7 100644 --- a/src/main.ts +++ b/src/main.ts @@ -1,13 +1,180 @@ -import { enableProdMode } from '@angular/core'; -import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'; +import { enableProdMode, importProvidersFrom } from '@angular/core'; -import { AppModule } from './app/app.module'; +import { HttpLoaderFactory, routes } from './app/app.module'; import { environment } from './environments/environment'; +import { SAVER, getSaver } from '@services/saver.provider'; +import { + DateAdapter, + MAT_DATE_LOCALE, + MAT_DATE_FORMATS, +} from '@angular/material/core'; +import { + MomentDateAdapter, + MAT_MOMENT_DATE_ADAPTER_OPTIONS, + MAT_MOMENT_DATE_FORMATS, +} from '@angular/material-moment-adapter'; +import { BrowserModule, bootstrapApplication } from '@angular/platform-browser'; +import { TranslateModule, TranslateLoader } from '@ngx-translate/core'; +import { HttpClient, provideHttpClient } from '@angular/common/http'; +import { provideAnimations } from '@angular/platform-browser/animations'; +import { + NgcCookieConsentModule, + NgcCookieConsentConfig, +} from 'ngx-cookieconsent'; +import { MatBottomSheetModule } from '@angular/material/bottom-sheet'; +import { withHashLocation, provideRouter } from '@angular/router'; +import { AppComponent } from './app/app.component'; +import { StoreModule } from '@ngrx/store'; +import { EffectsModule } from '@ngrx/effects'; +import { MatSidenavModule } from '@angular/material/sidenav'; +import { MatTableModule } from '@angular/material/table'; +import { MatSortModule } from '@angular/material/sort'; +import { MatMenuModule } from '@angular/material/menu'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatIconModule } from '@angular/material/icon'; +import { MatDialogModule } from '@angular/material/dialog'; +import { ToastrModule } from 'ngx-toastr'; +import { + AsfApiService, + AsfLanguageService, + UrlStateService, + MapService, + DrawService, + WktService, + LayerService, + ProductService, + BulkDownloadService, + SearchParamsService, + RangeService, + PolygonValidationService, + DateExtremaService, + EnvironmentService, + PropertyService, + LegacyAreaFormatService, + BannerApiService, + ScreenSizeService, + KeyboardService, + UserDataService, + SavedSearchService, + UnzipApiService, + ScenesService, + SearchService, + Hyp3ApiService, + Hyp3JobStatusService, + Hyp3JobService, + PossibleHyp3JobsService, + OnDemandService, + Hyp3JobPollingService, + PairService, + SceneSelectService, +} from '@services'; +import { metaReducers, reducers } from '@store/app.reducer'; +import { appEffects } from '@store/app.effect'; + +const cookieConfig: NgcCookieConsentConfig = { + autoOpen: false, + cookie: { + domain: window.location.hostname, + }, + position: 'bottom', + theme: 'edgeless', + palette: { + popup: { + background: '#000000', + text: '#ffffff', + link: '#ffffff', + }, + button: { + background: '#236192', + text: '#ffffff', + border: 'transparent', + }, + }, + type: 'info', + content: { + message: + 'This website uses cookies to ensure you get the best experience on our website.', + dismiss: 'Dismiss', + deny: 'Refuse cookies', + link: 'Learn more', + href: 'https://cookiesandyou.com', + policy: 'Cookie Policy', + }, +}; if (environment.production) { enableProdMode(); } -platformBrowserDynamic() - .bootstrapModule(AppModule) - .catch((err) => console.error(err)); +bootstrapApplication(AppComponent, { + providers: [ + importProvidersFrom( + BrowserModule, + TranslateModule.forRoot({ + loader: { + provide: TranslateLoader, + useFactory: HttpLoaderFactory, + deps: [HttpClient], + }, + }), + NgcCookieConsentModule.forRoot(cookieConfig), + MatBottomSheetModule, + StoreModule.forRoot(reducers, { metaReducers: metaReducers }), + EffectsModule.forRoot(appEffects), + MatSidenavModule, + MatTableModule, + MatSortModule, + MatMenuModule, + MatFormFieldModule, + MatIconModule, + MatDialogModule, + ToastrModule.forRoot({ + positionClass: 'inline', + preventDuplicates: true, + }), + ), + HttpClient, // remove in v21 w/ update to ngx-translate + AsfApiService, + AsfLanguageService, + UrlStateService, + MapService, + DrawService, + WktService, + LayerService, + ProductService, + BulkDownloadService, + SearchParamsService, + RangeService, + PolygonValidationService, + DateExtremaService, + EnvironmentService, + PropertyService, + LegacyAreaFormatService, + BannerApiService, + ScreenSizeService, + KeyboardService, + UserDataService, + SavedSearchService, + UnzipApiService, + ScenesService, + SearchService, + Hyp3ApiService, + Hyp3JobStatusService, + Hyp3JobService, + PossibleHyp3JobsService, + OnDemandService, + Hyp3JobPollingService, + PairService, + SceneSelectService, + { provide: SAVER, useFactory: getSaver }, + { + provide: DateAdapter, + useClass: MomentDateAdapter, + deps: [MAT_DATE_LOCALE, MAT_MOMENT_DATE_ADAPTER_OPTIONS], + }, + { provide: MAT_DATE_FORMATS, useValue: MAT_MOMENT_DATE_FORMATS }, + provideHttpClient(), + provideAnimations(), + provideRouter(routes, withHashLocation()), + ], +}).catch((err) => console.error(err)); diff --git a/src/styles.scss b/src/styles.scss index 4bd5a3843..38152f41f 100644 --- a/src/styles.scss +++ b/src/styles.scss @@ -462,7 +462,7 @@ ul { .mat-mdc-select-panel { max-width: fit-content !important; //max-width: 340px !important; - max-height: 364px !important; + max-height: 400px !important; } /* TODO(mdc-migration): The following rule targets internal classes of form-field that may no longer apply for the MDC version. */