From 33450ff44e79ee9dff307d5dd05be0054957f0f3 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 21 Nov 2025 12:33:30 -0800 Subject: [PATCH 01/34] DS-6299 Displacement Search should not allow polar map views (#2365) * DS-6299 Only Equatorial view is valid for Displacement Searches * DS-D299 Added fix to switch to equatorial view if a polar view is currently active, when a user switches to a Displacement view --- .../view-selector/view-selector.component.html | 2 ++ .../view-selector/view-selector.component.ts | 16 +++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) 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..1851d0ae1 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 @@ -30,6 +30,7 @@ aria-label="Arctic map projection" (click)="onArcticSelected()" [value]="types.ARCTIC" + [disabled]="isDisplacementSearch" > { + 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); From 67c4d844328003b9dc306baa3fdf1e49ea431c49 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Mon, 1 Dec 2025 17:30:43 -0500 Subject: [PATCH 02/34] Updated translations from Phrase (#2337) * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --------- Co-authored-by: Andrew Anderson Co-authored-by: yoreley777 --- src/assets/i18n/en.json | 5 ++++- src/assets/i18n/es.json | 9 ++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index df21b5fe9..dd1df3e22 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", @@ -71,6 +72,7 @@ "AREA_OF_INTEREST_WKT": "Area of Interest • WKT", "ARIA_INGEST_DOCS": "ARIA On Demand Ingest Documentation", "ARIA_VERSION": "ARIA Version", + "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. [MORE](https://hyp3-docs.asf.alaska.edu/guides/gunw_product_guide/#aria-sentinel-1-gunw-product-guide)", "ARROW_BACKWARD": "arrow_backward", "ARROW_FORWARD": "arrow_forward", "ASCENDING": "Ascending", @@ -247,6 +249,7 @@ "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", @@ -1019,4 +1022,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..35ff0ce2b 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", @@ -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. [MÁS](https://hyp3-docs.asf.alaska.edu/guides/gunw_product_guide/#aria-sentinel-1-gunw-product-guide)", "ARROW_BACKWARD": "flecha_hacia atrás", "ARROW_FORWARD": "flecha_adelante", "ASCENDING": "Ascendente", @@ -247,6 +249,7 @@ "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", @@ -444,7 +447,7 @@ "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_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", @@ -1020,4 +1023,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 From 679e3976f23cd7a538ab47490886a10394bb6495 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Mon, 1 Dec 2025 19:20:51 -0500 Subject: [PATCH 03/34] Updated translations from Phrase (#2367) * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --------- Co-authored-by: Andrew Anderson Co-authored-by: yoreley777 --- src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 1 + 2 files changed, 2 insertions(+) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index dd1df3e22..f2f617991 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -683,6 +683,7 @@ "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", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 35ff0ce2b..7dab2030e 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -684,6 +684,7 @@ "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", From abf4c1cc739b4fb526d409cd4373a1fa2006d75c Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 08:53:31 -0900 Subject: [PATCH 04/34] feat: add displacement disclaimer button and modal to header breadcrumb --- .../header/info-bar/info-bar.component.html | 5 +++ .../header/info-bar/info-bar.component.ts | 13 ++++++- ...isplacement-disclaimer-dialog.component.ts | 36 +++++++++++++++++++ .../timeseries-results-menu.component.scss | 9 +++++ src/assets/i18n/en.json | 2 ++ 5 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 src/app/components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component.ts 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..f39f61c27 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -22,6 +22,11 @@ {{ 'PRODUCT_TYPES' | translate }}: {{ eventProductTypes }} + @if ((searchType$ | async) === searchTypes.DISPLACEMENT) { + + + + } {{ 'START' | translate }}: {{ startDate | shortDate }} 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..cf2dedf9f 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,8 @@ import * as searchStore from '@store/search'; import * as services from '@services'; import * as models from '@models'; import * as userStore from '@store/user'; +import { DispDataDisclaimerComponent } from '@components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component'; +import { MatDialog } from '@angular/material/dialog'; // Declare GTM dataLayer array. declare global { @@ -29,7 +31,7 @@ export class InfoBarComponent implements OnInit, OnDestroy { private store$ = inject>(Store); private screenSize = inject(services.ScreenSizeService); private hyp3 = inject(services.Hyp3ApiService); - + private dialog = inject(MatDialog); public searchType: models.SearchType = models.SearchType.DATASET; public searchTypes = models.SearchType; public searchType$ = this.store$.select(searchStore.getSearchType); @@ -285,6 +287,15 @@ export class InfoBarComponent implements OnInit, OnDestroy { ); } + public onOpenDispDataDisclaimer() { + this.dialog.open(DispDataDisclaimerComponent, { + width: '550px', + height: '325px', + maxWidth: '550px', + maxHeight: '500px', + }); + } + ngOnDestroy() { this.subs.unsubscribe(); } 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..da118cc8f --- /dev/null +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component.ts @@ -0,0 +1,36 @@ +import { Component, inject } from '@angular/core'; +import { MatButton } from '@angular/material/button'; +import { + MatDialogActions, + MatDialogClose, + MatDialogContent, + MatDialogRef, +} from '@angular/material/dialog'; +import { SharedModule } from '@shared'; + +@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, + SharedModule, + ], +}) +export class DispDataDisclaimerComponent { + dialogRef = inject>(MatDialogRef); +} diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss index 4e449b208..452101ca7 100644 --- a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.scss @@ -462,3 +462,12 @@ ul { } } + +.disp-disclaimer-title { + @include themify($themes) { + color: themed('dark-primary-text'); + } + text-align: left; + margin-bottom: 9px; + margin-left: 20px; +} diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index dd1df3e22..ccadac2b2 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -243,6 +243,8 @@ "DISABLE": "Disable", "DISP_DOI": "DISP DOI", "DISPLACEMENT": "Displacement", + "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 Earth's surface, covering North America.", "DISPLACEMENT_FILTERS": "Displacement Filters", "DISPLACEMENT_SEARCH": "Displacement Search", From edc0d057f331649f53246fe90d136fa20b369f8e Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 09:42:54 -0900 Subject: [PATCH 05/34] feat: add Open FAQ button to displacement disclaimer text --- .../header/info-bar/info-bar.component.html | 2 +- ...isplacement-disclaimer-dialog.component.ts | 40 ++++++++++++++++--- 2 files changed, 36 insertions(+), 6 deletions(-) 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 f39f61c27..f24bb31f9 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -24,7 +24,7 @@ @if ((searchType$ | async) === searchTypes.DISPLACEMENT) { - + } 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 index da118cc8f..d526581db 100644 --- 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 @@ -1,4 +1,4 @@ -import { Component, inject } from '@angular/core'; +import { Component, inject, OnDestroy, OnInit } from '@angular/core'; import { MatButton } from '@angular/material/button'; import { MatDialogActions, @@ -7,7 +7,9 @@ import { MatDialogRef, } from '@angular/material/dialog'; import { SharedModule } from '@shared'; - +import { DocsModalModule } from '@components/shared/docs-modal'; +import { TranslateService } from '@ngx-translate/core'; +import { SubSink } from 'subsink'; @Component({ selector: 'app-disp-disclaimer-dialog', template: ` @@ -15,11 +17,22 @@ import { SharedModule } from '@shared'; {{ 'DISPLACEMENT_DATA_DISCLAIMER' | translate }} -

{{ 'DISPLACEMENT_DATA_DISCLAIMER_TEXT' | translate }}

+

+ {{ 'DISPLACEMENT_DATA_DISCLAIMER_TEXT' | translate }} +

- + + `, styleUrls: ['./timeseries-results-menu.component.scss'], @@ -29,8 +42,25 @@ import { SharedModule } from '@shared'; MatButton, MatDialogClose, SharedModule, + DocsModalModule, ], }) -export class DispDataDisclaimerComponent { +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(); + } } From ed3b3619a99d362865c25d0bb6e6c1ebb3a92775 Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 09:45:11 -0900 Subject: [PATCH 06/34] fix: add punctuation to end of disp disclaimer text --- src/assets/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index f3a6838ae..700bfcee1 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -244,7 +244,7 @@ "DISP_DOI": "DISP DOI", "DISPLACEMENT": "Displacement", "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_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 Earth's surface, covering North America.", "DISPLACEMENT_FILTERS": "Displacement Filters", "DISPLACEMENT_SEARCH": "Displacement Search", From 795d5ec4ae382e5227e43451e2339981f43758b8 Mon Sep 17 00:00:00 2001 From: SpicyGarlicAlbacoreRoll Date: Tue, 2 Dec 2025 09:56:16 -0900 Subject: [PATCH 07/34] fix: add OPEN_FAQ translation key --- src/assets/i18n/en.json | 1 + 1 file changed, 1 insertion(+) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 700bfcee1..642365d9e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -587,6 +587,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", From 59636dd06435cea88188b3801c14432b0a43f072 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Wed, 3 Dec 2025 09:58:34 -0800 Subject: [PATCH 08/34] DS-6335 (#2368) Identifying GCOV (Geocoded Polarimetric Covariance) as the recommended product in the NISAR Science Filters --- .../product-science-selector.component.html | 6 ++++-- .../product-science-selector.component.scss | 7 +++++++ .../product-science-selector.component.ts | 2 +- src/styles.scss | 2 +- 4 files changed, 13 insertions(+), 4 deletions(-) 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..3df3a4dd0 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 @@ -18,12 +18,14 @@ > @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..93a1d3b1d 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 @@ -29,3 +29,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..aa76a8ec9 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 @@ -51,7 +51,7 @@ 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/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. */ From 0f7473d7a98360babd300da639c9845769051121 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Wed, 3 Dec 2025 09:59:49 -0800 Subject: [PATCH 09/34] Andy/ds 6336 (#2366) * Make Help more easily seen on Filter's panel. * DS-6336 Text modified to be translatable. * Lint space * Update src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../dataset-filters.component.html | 28 +++++++++++-------- .../dataset-filters.component.scss | 16 ++++++++--- 2 files changed, 29 insertions(+), 15 deletions(-) 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..531e4554a 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 @@ -38,10 +38,11 @@ [collapsedHeight]="customCollapsedHeight" [expandedHeight]="customExpandedHeight" > - + {{ 'AREA_OF_INTEREST_OPTIONS' | translate }} @@ -63,10 +64,11 @@ [collapsedHeight]="customCollapsedHeight" [expandedHeight]="customExpandedHeight" > - + {{ 'DATE_FILTERS' | translate }} @@ -91,10 +93,11 @@ [collapsedHeight]="customCollapsedHeight" [expandedHeight]="customExpandedHeight" > - + {{ 'PRODUCT_FILTERS' | translate }} @@ -118,18 +121,20 @@ [collapsedHeight]="customCollapsedHeight" [expandedHeight]="customExpandedHeight" > - + @if (selectedDataset !== 'NISAR') { {{ 'ADDITIONAL_FILTERS' | translate }} } @else { {{ 'OBSERVATIONAL_FILTERS' | translate }} @@ -157,7 +162,7 @@ [collapsedHeight]="customCollapsedHeight" [expandedHeight]="customExpandedHeight" > - + @if (selectedDataset === 'SENTINEL-1 INTERFEROGRAM (BETA)') { {{ 'TRACK' | translate }} {{ 'FILTERS' | translate }} } @else if (selectedDataset !== 'NISAR') { @@ -166,7 +171,8 @@ {{ 'TRACK_AND_FRAME_FILTERS' | translate }} } 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 +} From 4997d78309eed96c06f40af706d6ca5250cbd9e3 Mon Sep 17 00:00:00 2001 From: Tyler Chase Date: Wed, 3 Dec 2025 17:34:06 -0500 Subject: [PATCH 10/34] feat: Update control flow syntax (#2370) * chore: control flow migration tool * fix: duplicate template names * fix: ngSwitch case * chore: rerun migration tool with errors fixed * fix: flow regression --- .../baseline-chart.component.html | 54 +- .../baseline-filters.component.html | 228 +-- .../dataset-filters.component.html | 428 +++--- .../filters-dropdown.component.html | 184 ++- .../frame-order-filters.component.html | 55 +- .../frame-order-filters.component.ts | 2 - .../list-filters/list-filters.component.html | 268 ++-- .../sarviews-filters.component.html | 216 ++- .../sbas-filters/sbas-filters.component.html | 235 +-- .../timeseries-filters.component.html | 40 +- .../baseline-header.component.html | 137 +- .../aoi-filter/aoi-filter.component.html | 33 +- .../dataset-header.component.html | 177 ++- .../header-buttons.component.html | 647 ++++---- .../preferences/preferences.component.html | 71 +- .../components/header/header.component.html | 85 +- .../hyp3-header/hyp3-header.component.html | 101 +- .../header/info-bar/info-bar.component.html | 371 +++-- .../list-header/list-header.component.html | 72 +- .../header/logo/logo.component.html | 43 +- .../confirmation/confirmation.component.html | 77 +- .../dropdown-option.component.html | 30 +- .../processing-options.component.html | 163 +- .../range-option/range-option.component.html | 16 +- .../processing-queue-jobs.component.html | 272 ++-- .../processing-queue.component.html | 449 +++--- .../header/queue/queue.component.html | 665 ++++----- .../sarviews-header.component.html | 118 +- .../timeseries-header.component.html | 116 +- .../help-new-stuff.component.html | 24 +- src/app/components/help/help.component.html | 84 +- .../attributions/attributions.component.html | 13 +- .../map/banners/banners.component.html | 8 +- .../layer-selector.component.html | 75 +- .../map-controls/map-controls.component.html | 343 +++-- .../view-selector.component.html | 27 +- src/app/components/map/map.component.html | 127 +- .../baseline-results-menu.component.html | 383 +++-- .../desktop-results-menu.component.html | 71 +- .../mobile-results-menu.component.html | 350 ++--- .../results-menu/results-menu.component.html | 283 ++-- .../sarviews-results-menu.component.html | 110 +- .../sbas-results-menu.component.html | 146 +- .../sbas-sliders-two.component.html | 18 +- .../browse-list/browse-list.component.html | 71 +- .../image-dialog/image-dialog.component.html | 797 +++++----- .../scene-detail/scene-detail.component.html | 871 +++++------ .../scene-file/scene-file.component.html | 351 ++--- .../scene-files/scene-files.component.html | 345 +++-- .../scenes-list-header.component.html | 1329 ++++++++--------- .../scenes-list/pair/pair.component.html | 42 +- .../sarviews-event.component.html | 122 +- .../baseline-scene-controls.component.html | 61 +- .../scene-controls.component.html | 110 +- .../scenes-list/scene/scene.component.html | 131 +- .../scenes-list/scenes-list.component.html | 56 +- .../timeseries-results-menu.component.html | 506 +++---- .../aoi-options/aoi-options.component.html | 48 +- .../draw-selector.component.html | 212 ++- .../file-upload-dialog.component.html | 111 +- .../geocode-selector.component.html | 8 +- .../interaction-selector.component.html | 9 +- .../cart-toggle/cart-toggle.component.html | 8 +- .../chart-modal/chart-modal.component.ts | 3 +- .../copy-to-clipboard.component.html | 50 +- .../docs-modal/docs-modal.component.html | 16 +- .../download-file-button.component.html | 90 +- .../event-metadata.component.html | 246 +-- .../event-product-metadata.component.html | 55 +- ...event-product-sort-selector.component.html | 12 +- .../shared/file-name/file-name.component.html | 42 +- .../shared/hyp3-url/hyp3-url.component.html | 10 +- .../api-link-dialog.component.html | 27 +- .../max-results-selector.component.html | 152 +- .../on-demand-add-menu.component.html | 112 +- .../scene-metadata.component.html | 1004 ++++++------- .../search-button.component.html | 492 +++--- ...seline-frame-reference-toggle.component.ts | 4 +- .../full-burst-selector.component.html | 11 +- .../dataset-selector.component.html | 197 +-- .../dataset/dataset.component.html | 12 +- .../hyp3-job-type-selector.component.html | 8 +- .../job-product-name-selector.component.html | 163 +- .../job-status-selector.component.html | 8 +- .../language-selector.component.html | 4 +- .../mission-selector.component.html | 4 +- .../observation-panel-selector.component.html | 213 +-- .../other-selector.component.html | 202 +-- .../aoi-clear/aoi-clear.component.html | 32 +- .../path-selector.component.html | 144 +- .../product-type-selector.component.html | 30 +- .../project-name-selector.component.html | 11 +- ...views-event-search-selector.component.html | 37 +- ...arviews-event-type-selector.component.html | 8 +- .../search-type-selector.component.html | 383 ++--- .../season-selector.component.html | 76 +- .../season-selector.component.ts | 3 +- .../short-name-selector.component.html | 22 +- .../save-user-filter.component.html | 104 +- .../save-user-filters.component.html | 54 +- .../saved-search/saved-search.component.html | 158 +- .../baseline-search-filters.component.html | 71 +- .../geographic-search-filters.component.html | 263 ++-- .../list-search-filters.component.html | 20 +- .../sbas-search-filters.component.html | 45 +- .../search-filters.component.html | 47 +- .../saved-searches.component.html | 106 +- .../components/sidebar/sidebar.component.html | 18 +- .../timeseries-chart-export.component.ts | 2 - ...art-flight-direction-toggle.component.html | 16 +- ...chart-flight-direction-toggle.component.ts | 2 - .../timeseries-chart.component.html | 16 +- 112 files changed, 8885 insertions(+), 8523 deletions(-) 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 @@ -
-
    -
  • -
    - {{ 'REFERENCE' | translate }} -
    • -
  • -
    - {{ 'SELECTED' | translate }} -
    • -
  • -
    - {{ 'DOWNLOADS' | translate }} -
    • -
  • -
    - {{ 'CRITICAL_BASELINE_ABBR' | translate }} -
    • -
  • -
    - {{ 'CRITICAL_BASELINE' | translate }} -
    • -
-
+@if (breakpoint$ | async; as breakpoint) { +
+
    +
  • +
    + {{ 'REFERENCE' | translate }} +
    • +
  • +
    + {{ 'SELECTED' | translate }} +
    • +
  • +
    + {{ 'DOWNLOADS' | translate }} +
    • + @if (breakpoint === breakpoints.MOBILE) { +
  • +
    + {{ 'CRITICAL_BASELINE_ABBR' | translate }} +
    • + } + @if (breakpoint !== breakpoints.MOBILE) { +
  • +
    + {{ 'CRITICAL_BASELINE' | translate }} +
    • + } +
+
+}
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/dataset-filters/dataset-filters.component.html b/src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.html index 531e4554a..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,249 +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/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/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..a4658b58d 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,7 +1,6 @@ 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'; @@ -45,7 +44,6 @@ enum FilterPanel { @Component({ selector: 'app-frame-order-filters', imports: [ - CommonModule, FormsModule, FlightDirectionSelectorComponent, MatSelectModule, 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/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/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/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/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/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/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/header-buttons/header-buttons.component.html b/src/app/components/header/header-buttons/header-buttons.component.html index 33c13af5d..3fb203971 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,207 @@ -
- - - - - - - - + + + + + - - - + } - - - - - - - - - - - - - - - + } + @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 +446,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/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.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/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/info-bar/info-bar.component.html b/src/app/components/header/info-bar/info-bar.component.html index f24bb31f9..ffd9f3344 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -1,164 +1,229 @@ -
-
- - - - - {{ '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 }} - - - @if ((searchType$ | async) === searchTypes.DISPLACEMENT) { - - - - } - - {{ 'START' | translate }}: {{ startDate | shortDate }} - - - {{ 'END' | translate }}: {{ endDate | shortDate }} - - - - @if (selectedDatasetIsNISARFormat) { - {{ 'TRACK' | translate }} - } @else { - {{ 'PATH' | translate }} + ) { + + {{ 'PRODUCT_TYPES' | translate }}: {{ eventProductTypes }} + + } + @if ((searchType$ | async) === searchTypes.DISPLACEMENT) { + + + + } + @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/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/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/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/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/processing-options.component.html b/src/app/components/header/processing-queue/processing-options/processing-options.component.html index 62a659cfe..da5eef385 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,105 @@
- - - + @if (selectedJobType) { + @for (jobType of JobTypesList; track jobType) { + @if (selectedJobType.id === jobType.id) { @if (jobType.options.length === 0) {

No processing options for {{ 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/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-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.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/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/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/timeseries-header/timeseries-header.component.html b/src/app/components/header/timeseries-header/timeseries-header.component.html index 57a50e437..88b167654 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/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.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/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/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/map-controls/layer-selector/layer-selector.component.html b/src/app/components/map/map-controls/layer-selector/layer-selector.component.html index 89538c49a..086b40362 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,13 @@ [matMenuTriggerFor]="layerMenu" aria-label="Map projection view" > - - terrain - - + @if (layerType === layerTypes.SATELLITE) { + + terrain + + } @else { directions_car - + } @@ -54,38 +51,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/view-selector/view-selector.component.html b/src/app/components/map/map-controls/view-selector/view-selector.component.html index 1851d0ae1..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) { + + } diff --git a/src/app/components/map/map.component.html b/src/app/components/map/map.component.html index a358a9bbf..1c774c48f 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 (searchType === searchTypes.DATASET) { + + +} 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)) { + + +
-
- - -
- -
- - - - -
- - -
- - - - - + + + + } +} - +@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/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/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/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/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) { +
+ +
+ } - {{ - '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/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/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/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-files/scene-file/scene-file.component.html b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.html index 6d428b7ef..fff76914b 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,33 +1,39 @@ - - - keyboard_arrow_right - - - keyboard_arrow_down - -
- -
- + @if (false) { + + @if (!isUnzipLoading && !isOpen) { + + keyboard_arrow_right + + } + @if (isOpen) { + + keyboard_arrow_down + + } + @if (isUnzipLoading) { +
+ +
+ } + + } @@ -35,136 +41,149 @@
@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 }} -
+ @if (product.metadata.job.name) { +
+ {{ 'PROJECT_NAME' | translate }}: + {{ product.metadata.job.name }} +
+ }
{{ 'JOB_SUBMITTED' | translate }}: {{ 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) { +
+ {{ 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-files.component.html b/src/app/components/results-menu/scene-files/scene-files.component.html index 31263457c..0eefa4efb 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,187 @@ -
- {{ '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/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index b3832c2b2..b25b79023 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,656 @@ }}{{ (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 - - + + + + + +
-
- - -
- + } + @if (searchType === SearchTypes.CUSTOM_PRODUCTS) { +
+
+ +
+
+
+ + + get_app + + +
+
- - } - -
-
- -
-
-
- - - 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/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/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/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/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/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/timeseries-results-menu/timeseries-results-menu.component.html b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.html index a1025eb51..c81033b4e 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,266 @@ - - - - - - -
-
- - - {{ '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-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/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/mission-selector/mission-selector.component.html b/src/app/components/shared/selectors/mission-selector/mission-selector.component.html index 05778ad22..abcc1a332 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 @@ -9,7 +9,7 @@ - +@if (!!selectedMission) {
@@ -31,7 +31,7 @@
- +} {{ 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/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/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/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/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/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/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..8f5911b61 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-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/search-type-selector/search-type-selector.component.html b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.html index f5aa521e8..4ed8bef7e 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,229 @@ -
-
- {{ 'SEARCH_TYPE' | 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/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..5ecfae8f4 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 @@ -64,7 +64,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/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/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-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 }}

-
- + }
- 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/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/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/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/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/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-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/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..38ec9bf5e 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 @@ -16,7 +16,6 @@ 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', @@ -32,7 +31,6 @@ import { NgIf } from '@angular/common'; 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 }}
-
-
+ }
Date: Wed, 3 Dec 2025 20:51:35 -0500 Subject: [PATCH 11/34] Updated translations from Phrase (#2373) * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state * Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state phrase: update src/assets/i18n/de.json to latest state --------- Co-authored-by: Andrew Anderson Co-authored-by: yoreley777 --- src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 642365d9e..44a83788e 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -923,6 +923,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", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 7dab2030e..c103dffd9 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -243,6 +243,8 @@ "DISABLE": "Desactivar", "DISP_DOI": "DOI de desplazamiento", "DISPLACEMENT": "Desplazamiento", + "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 en la superficie de la Tierra, cubriendo América del Norte.", "DISPLACEMENT_FILTERS": "Filtros de desplazamiento", "DISPLACEMENT_SEARCH": "Búsqueda de Desplazamiento", @@ -586,6 +588,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", @@ -684,7 +687,7 @@ "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", + "RECOMMENDED_PRODUCT": "Producto Recomendado", "REFERENCE": "Referencia", "REFERENCE_SCENE": "escena de referencia.", "REFERENCE_SCENES": "Escenas de referencia", @@ -921,6 +924,7 @@ "TOO_MANY_JOBS_IN_QUEUE": "Demasiados trabajos en lista", "TOOLS": "Herramientas", "TOOLTIP": "SUGERENCIA", + "TOTAL": "Total", "TRACK": "Trayecto", "TRACK_AND_FRAME_FILTERS": "Filtros de Trayecto y Marco", "TRACK_END": "Fin del Trayecto", From a08de521e55b4b2ecc4c9d6c4bca13612e85ec58 Mon Sep 17 00:00:00 2001 From: Tyler Chase Date: Thu, 4 Dec 2025 11:05:40 -0500 Subject: [PATCH 12/34] feat: standalone migration * feat: initial migration tool pass * feat: remove modules, and move providers into components * chore: remove shared module * fix: merged component not standalone * chore: update automated imports to use ts aliasing * chore: remove ngIf, ngFor module imports * chore: remove unused filter pipe * fix: ng-template leftovers --- package.json | 2 +- src/app/app.component.ts | 23 ++- src/app/app.module.ts | 163 ---------------- .../baseline-chart.component.ts | 6 +- .../baseline-chart/baseline-chart.module.ts | 15 -- src/app/components/baseline-chart/index.ts | 1 - .../baseline-filters.component.ts | 36 +++- .../baseline-filters.module.ts | 35 ---- .../baseline-sliders.component.ts | 3 +- .../baseline-sliders.module.ts | 12 -- .../custom-products-filters.component.ts | 29 ++- .../custom-products-filters.module.ts | 40 ---- .../job-id-selector.component.ts | 12 +- .../dataset-filters.component.ts | 45 ++++- .../dataset-filters/dataset-filters.module.ts | 55 ------ .../filters-dropdown/dataset-filters/index.ts | 1 - .../derived-datasets.module.ts | 22 --- .../filters-dropdown.component.ts | 31 ++- .../filters-dropdown.module.ts | 56 ------ .../frame-order-filters.component.ts | 35 +--- .../list-filters/list-filters.component.ts | 36 +++- .../list-filters/list-filters.module.ts | 38 ---- .../sarviews-filters/index.ts | 1 - .../sarviews-filters.component.ts | 35 +++- .../sarviews-filters.module.ts | 36 ---- .../filters-dropdown/sbas-filters/index.ts | 1 - .../sbas-filters/sbas-filters.component.ts | 37 +++- .../sbas-filters/sbas-filters.module.ts | 39 ---- .../timeseries-filters/index.ts | 1 - .../timeseries-filters.component.ts | 20 +- .../timeseries-filters.module.ts | 35 ---- .../baseline-header.component.ts | 23 ++- .../baseline-header/baseline-header.module.ts | 17 -- .../aoi-filter/aoi-filter.component.ts | 27 ++- .../dataset-header.component.ts | 32 +++- .../customize-env/customize-env.component.ts | 25 ++- .../header-buttons.component.ts | 26 ++- .../header-buttons/header-buttons.module.ts | 52 ----- .../hyp3-url-selector.component.ts | 30 ++- .../preferences/preferences.component.ts | 38 +++- src/app/components/header/header.component.ts | 23 ++- src/app/components/header/header.module.ts | 124 ------------ .../hyp3-header/hyp3-header.component.ts | 23 ++- src/app/components/header/index.ts | 1 - .../info-bar/ci-search/ci-search.component.ts | 5 +- .../info-bar/ci-search/ci-search.module.ts | 11 -- .../header/info-bar/info-bar.component.ts | 18 +- .../list-header/list-header.component.ts | 17 +- .../components/header/logo/logo.component.ts | 4 +- src/app/components/header/logo/logo.module.ts | 13 -- .../confirmation/confirmation.component.ts | 38 +++- .../header/processing-queue/index.ts | 1 - .../checkbox-option.component.ts | 5 +- .../dropdown-option.component.ts | 19 +- .../processing-options.component.ts | 15 +- .../processing-options.module.ts | 42 ---- .../range-option/range-option.component.ts | 20 +- .../subset-option/subset-option.component.ts | 4 +- .../toggle-option/toggle-option.component.ts | 5 +- .../processing-queue-jobs.component.ts | 44 ++++- .../processing-queue-jobs.module.ts | 29 --- .../processing-queue.component.ts | 59 +++++- .../processing-queue.module.ts | 81 -------- .../processing-signup.component.ts | 48 ++++- .../processing-signup.module.ts | 34 ---- .../queue-submit/queue-submit.component.ts | 4 +- .../download-all/download-all.component.ts | 5 +- .../queue/download-all/download-all.module.ts | 13 -- src/app/components/header/queue/index.ts | 1 - .../header/queue/queue.component.ts | 68 ++++++- .../components/header/queue/queue.module.ts | 56 ------ .../sarviews-header.component.ts | 23 ++- .../timeseries-header.component.ts | 16 +- .../help-baseline-search.component.ts | 4 +- .../help-download-queue.component.ts | 4 +- .../help-export-options.component.ts | 3 +- .../help-filters/help-filters.component.ts | 4 +- .../help-geo-search.component.ts | 5 +- .../help-list-search.component.ts | 4 +- .../help-login/help-login.component.ts | 4 +- .../help-map-controls.component.ts | 4 +- .../help-more-like-this.component.ts | 4 +- .../help-new-stuff.component.ts | 3 +- .../help-on-demand.component.ts | 4 +- .../help-saved-searches.component.ts | 4 +- .../help-sbas-search.component.ts | 4 +- .../help-search-results.component.ts | 4 +- .../help-pages/help-toc/help-toc.component.ts | 44 ++++- .../help-unzipping.component.ts | 4 +- src/app/components/help/help.component.ts | 41 +++- src/app/components/help/help.module.ts | 63 ------ .../attributions/attributions.component.ts | 9 +- .../banner-dialog/banner-dialog.component.ts | 19 +- .../map/banners/banners.component.ts | 8 +- .../components/map/banners/banners.module.ts | 18 -- src/app/components/map/banners/index.ts | 1 - .../displacement-layers.component.ts | 18 +- .../displacement-layers.module.ts | 36 ---- src/app/components/map/index.ts | 1 - .../gridlines-selector.component.ts | 6 +- .../gridlines-selector.module.ts | 21 -- .../map-controls/gridlines-selector/index.ts | 1 - .../map/map-controls/layer-selector/index.ts | 1 - .../layer-selector.component.html | 13 +- .../layer-selector.component.ts | 23 ++- .../layer-selector/layer-selector.module.ts | 28 --- .../map-controls/map-controls.component.ts | 36 +++- .../map/map-controls/map-controls.module.ts | 35 ---- .../map-info/map-info.component.ts | 3 +- .../map/map-controls/view-selector/index.ts | 1 - .../view-selector/view-selector.component.ts | 21 +- .../view-selector/view-selector.module.ts | 22 --- src/app/components/map/map.component.ts | 31 ++- src/app/components/map/map.module.ts | 49 ----- .../baseline-results-menu.component.ts | 37 +++- .../baseline-results-menu.module.ts | 36 ---- .../desktop-results-menu.component.ts | 21 +- .../desktop-results-menu.module.ts | 28 --- .../mobile-results-menu.component.ts | 42 +++- .../mobile-results-menu.module.ts | 40 ---- .../results-menu/results-menu.component.ts | 27 ++- .../results-menu/results-menu.module.ts | 33 ---- .../sarviews-results-menu.component.ts | 34 +++- .../sarviews-results-menu.module.ts | 34 ---- .../sbas-results-menu.component.ts | 36 +++- .../sbas-results-menu.module.ts | 56 ------ .../sbas-sliders-two.component.ts | 18 +- .../sbas-sliders/sbas-sliders.component.ts | 1 - .../event-polygon-slider.component.ts | 3 +- .../event-polygon-slider.module.ts | 11 -- .../event-polygon-slider/index.ts | 1 - .../browse-list/browse-list.component.ts | 18 +- .../image-dialog/image-dialog.component.ts | 55 +++++- .../image-dialog/image-dialog.module.ts | 53 ------ .../scene-detail/image-dialog/index.ts | 1 - .../scene-detail/scene-detail.component.ts | 45 ++++- .../scene-detail/scene-detail.module.ts | 45 ----- .../file-contents/file-contents.component.ts | 25 ++- .../file-contents/file-contents.module.ts | 28 --- .../scene-files/file-contents/index.ts | 1 - .../scene-file/scene-file.component.ts | 56 +++++- .../scene-file/scene-file.module.ts | 47 ----- .../scene-files/scene-files.component.ts | 43 ++++- .../scene-files/scene-files.module.ts | 47 ----- .../scenes-list-header.component.ts | 40 +++- .../scenes-list-header.module.ts | 28 --- .../scenes-list/pair/pair.component.ts | 24 ++- .../sarview-event/sarviews-event.component.ts | 26 ++- .../baseline-scene-controls.component.ts | 18 +- .../scene-controls.component.ts | 15 +- .../scenes-list/scene/scene.component.ts | 26 ++- .../scenes-list/scene/scene.module.ts | 41 ---- .../scenes-list/scenes-list.component.ts | 28 ++- .../scenes-list/scenes-list.module.ts | 40 ---- ...isplacement-disclaimer-dialog.component.ts | 11 +- .../timeseries-results-menu.component.ts | 37 +++- .../timeseries-results-menu.module.ts | 61 ------ .../sbas-chart/sbas-chart.component.ts | 3 +- .../sbas-chart/sbas-chart.module.ts | 15 -- .../aoi-options/aoi-options.component.ts | 31 ++- .../shared/aoi-options/aoi-options.module.ts | 47 ----- .../draw-selector.component.html | 33 ++-- .../draw-selector/draw-selector.component.ts | 19 +- .../file-upload-dialog.component.ts | 17 +- .../file-upload/file-upload.component.ts | 1 - .../file-upload/file-upload.module.ts | 36 ---- .../geocode-selector.component.ts | 21 +- .../components/shared/aoi-options/index.ts | 1 - .../interaction-selector.component.ts | 23 ++- .../cancel-filter-changes.component.ts | 4 +- .../cancel-filter-changes.module.ts | 21 -- .../shared/cancel-filter-changes/index.ts | 1 - .../cart-toggle/cart-toggle.component.ts | 6 +- .../shared/cart-toggle/cart-toggle.module.ts | 13 -- .../components/shared/cart-toggle/index.ts | 1 - .../clear-button/clear-button.component.ts | 4 +- .../clear-button/clear-button.module.ts | 13 -- .../components/shared/clear-button/index.ts | 1 - .../code-export/code-export.component.ts | 24 ++- .../shared/code-export/code-export.module.ts | 32 ---- .../components/shared/code-export/index.ts | 1 - .../copy-to-clipboard.component.ts | 12 +- .../copy-to-clipboard.module.ts | 21 -- .../shared/copy-to-clipboard/index.ts | 1 - .../shared/docs-modal/docs-modal.component.ts | 25 ++- .../shared/docs-modal/docs-modal.module.ts | 24 --- src/app/components/shared/docs-modal/index.ts | 1 - .../download-file-button.component.ts | 14 +- .../download-file-button.module.ts | 22 --- .../event-metadata.component.ts | 22 ++- .../event-metadata/event-metadata.module.ts | 20 -- .../event-product-metadata.component.ts | 5 +- .../event-product-metadata.module.ts | 12 -- .../event-product-sort-selector.component.ts | 19 +- .../event-product-sort-selector.module.ts | 23 --- .../shared/file-name/file-name.component.ts | 3 +- .../shared/file-name/file-name.module.ts | 12 -- src/app/components/shared/file-name/index.ts | 1 - .../hyp3-job-status-badge.component.ts | 5 +- .../hyp3-job-status-badge.module.ts | 23 --- .../shared/hyp3-job-status-badge/index.ts | 1 - .../shared/hyp3-url/hyp3-url.component.ts | 3 +- .../shared/hyp3-url/hyp3-url.module.ts | 12 -- .../api-link-dialog.component.ts | 46 ++++- .../max-results-selector.component.ts | 26 ++- .../max-results-selector.module.ts | 47 ----- .../closest-pair/closest-pair.component.ts | 5 +- .../on-demand-add-menu.component.ts | 26 ++- .../on-demand-add-menu.module.ts | 26 --- .../shared/save-search-dialog/index.ts | 1 - .../save-search-dialog.component.ts | 31 ++- .../save-search-dialog.module.ts | 26 --- .../components/shared/scene-metadata/index.ts | 1 - .../scene-metadata.component.ts | 25 ++- .../scene-metadata/scene-metadata.module.ts | 21 -- .../search-button/search-button.component.ts | 36 +++- .../search-button/search-button.module.ts | 25 --- ...seline-frame-reference-toggle.component.ts | 4 +- .../burst-selector.component.ts | 3 +- .../burst-selector/burst-selector.module.ts | 26 --- .../full-burst-selector.component.ts | 5 +- .../shared/selectors/burst-selector/index.ts | 1 - .../circle-slider/circle-slider.component.ts | 6 +- .../circle-slider/circle-slider.module.ts | 35 ---- .../dataset-selector.component.ts | 26 ++- .../dataset-selector.module.ts | 33 ---- .../dataset/dataset.component.ts | 3 +- .../selectors/dataset-selector/index.ts | 1 - .../date-range/date-range.component.ts | 38 +++- .../selectors/date-range/date-range.module.ts | 29 --- .../date-selector/date-selector.component.ts | 8 +- .../date-selector/date-selector.module.ts | 40 ---- .../shared/selectors/date-selector/index.ts | 1 - .../flight-direction-selector.component.ts | 4 +- .../hyp3-job-type-selector.component.ts | 11 +- .../hyp3-job-type-selector.module.ts | 21 -- .../job-product-name-selector.component.ts | 45 ++++- .../job-product-name-selector.module.ts | 29 --- .../job-status-selector.component.ts | 7 +- .../job-status-selector.module.ts | 22 --- .../language-selector.component.ts | 6 +- .../language-selector.module.ts | 23 --- .../master-scene-selector.component.ts | 5 +- .../master-scene-selector.module.ts | 25 --- .../selectors/mission-selector/index.ts | 1 - .../mission-selector.component.ts | 34 +++- .../mission-selector.module.ts | 43 ----- .../observation-panel-selector.component.ts | 30 ++- .../observation-panel-selector.module.ts | 39 ---- .../on-demand-user-selector/index.ts | 1 - .../on-demand-user-selector.component.ts | 5 +- .../on-demand-user-selector.module.ts | 22 --- .../opera-calibration-data-selector/index.ts | 1 - ...era-calibration-data-selector.component.ts | 9 +- .../opera-calibration-data-selector.module.ts | 12 -- .../selectors/opera-s1-selector/index.ts | 1 - .../opera-burst-id-selector.component.ts | 4 +- .../opera-s1-selector.component.ts | 3 +- .../opera-s1-selector.module.ts | 26 --- .../shared/selectors/other-selector/index.ts | 1 - .../other-selector.component.ts | 19 +- .../other-selector/other-selector.module.ts | 35 ---- .../aoi-clear/aoi-clear.component.ts | 6 +- .../shared/selectors/path-selector/index.ts | 1 - .../path-selector/path-selector.component.ts | 16 +- .../path-selector/path-selector.module.ts | 27 --- .../product-science-selector.component.ts | 4 +- .../product-science-selector.module.ts | 8 - .../product-type-selector.component.ts | 20 +- .../product-type-selector.module.ts | 22 --- .../production-config-selector.component.ts | 4 +- .../production-config-selector.module.ts | 8 - .../project-name-selector.component.ts | 21 +- .../project-name-selector.module.ts | 24 --- ...arviews-event-active-selector.component.ts | 9 +- .../sarviews-event-active-selector.module.ts | 20 -- .../index.ts | 1 - ...iews-event-magnitude-selector.component.ts | 1 - ...arviews-event-magnitude-selector.module.ts | 11 -- ...arviews-event-search-selector.component.ts | 29 ++- .../sarviews-event-search-selector.module.ts | 26 --- .../sarviews-event-type-selector.component.ts | 11 +- .../sarviews-event-type-selector.module.ts | 20 -- .../sbas-overlap-selector.component.ts | 15 +- .../sbas-overlap-selector.module.ts | 26 --- .../search-selector.component.ts | 13 +- .../search-selector/search-selector.module.ts | 15 -- .../selectors/search-type-selector/index.ts | 1 - .../search-type-selector.component.ts | 27 ++- .../search-type-selector.module.ts | 26 --- .../shared/selectors/season-selector/index.ts | 1 - .../season-selector.component.ts | 20 +- .../season-selector/season-selector.module.ts | 32 ---- .../short-name-selector.component.ts | 20 +- .../short-name-selector.module.ts | 22 --- src/app/components/sidebar/index.ts | 1 - .../save-user-filter.component.ts | 30 ++- .../save-user-filters.component.ts | 13 +- .../save-user-filters.module.ts | 34 ---- .../saved-search/saved-search.component.ts | 23 ++- .../baseline-search-filters.component.ts | 4 +- .../displacement-filters.component.ts | 5 +- .../geographic-search-filters.component.ts | 5 +- .../list-search-filters.component.ts | 3 +- .../sbas-search-filters.component.ts | 3 +- .../search-filters.component.ts | 25 ++- .../search-filters/search-filters.module.ts | 31 --- .../saved-searches.component.ts | 25 ++- .../saved-searches/saved-searches.module.ts | 33 ---- .../components/sidebar/sidebar.component.ts | 4 +- src/app/components/sidebar/sidebar.module.ts | 14 -- .../timeseries-chart-config.component.ts | 4 +- ...chart-flight-direction-toggle.component.ts | 2 - .../timeseries-chart.component.ts | 38 +++- .../timeseries-chart.module.ts | 42 ---- src/app/directives/context-menu.directive.ts | 5 +- src/app/directives/file-download.directive.ts | 1 - src/app/directives/onlynumber.directive.ts | 5 +- src/app/directives/resized.directive.ts | 13 +- src/app/pipes/aoi-icon.pipe.ts | 1 - src/app/pipes/dynamic-moment.ts | 5 +- src/app/pipes/filter-extension.pipe.ts | 5 +- src/app/pipes/filter-type.pipe.ts | 35 +--- src/app/pipes/float-precision.pipe.ts | 5 +- src/app/pipes/html-input-value.pipe.ts | 5 +- src/app/pipes/index.ts | 1 - src/app/pipes/join.pipe.ts | 5 +- src/app/pipes/pipes.module.ts | 71 ------- src/app/pipes/polarization.pipe.ts | 5 +- .../pipes/readable-size-from-bytes.pipe.ts | 5 +- src/app/pipes/sarviews-event.pipe.ts | 10 +- src/app/pipes/short-date.pipe.ts | 4 - src/app/shared/index.ts | 2 - src/app/shared/mat-shared.module.ts | 31 --- src/app/shared/shared.module.ts | 29 --- src/main.ts | 179 +++++++++++++++++- 336 files changed, 3092 insertions(+), 3875 deletions(-) delete mode 100644 src/app/components/baseline-chart/baseline-chart.module.ts delete mode 100644 src/app/components/filters-dropdown/baseline-filters/baseline-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/baseline-filters/baseline-sliders/baseline-sliders.module.ts delete mode 100644 src/app/components/filters-dropdown/custom-products-filters/custom-products-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/dataset-filters/dataset-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/derived-datasets/derived-datasets.module.ts delete mode 100644 src/app/components/filters-dropdown/filters-dropdown.module.ts delete mode 100644 src/app/components/filters-dropdown/list-filters/list-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/sarviews-filters/sarviews-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/sbas-filters/sbas-filters.module.ts delete mode 100644 src/app/components/filters-dropdown/timeseries-filters/timeseries-filters.module.ts delete mode 100644 src/app/components/header/baseline-header/baseline-header.module.ts delete mode 100644 src/app/components/header/header-buttons/header-buttons.module.ts delete mode 100644 src/app/components/header/header.module.ts delete mode 100644 src/app/components/header/index.ts delete mode 100644 src/app/components/header/info-bar/ci-search/ci-search.module.ts delete mode 100644 src/app/components/header/logo/logo.module.ts delete mode 100644 src/app/components/header/processing-queue/processing-options/processing-options.module.ts delete mode 100644 src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.module.ts delete mode 100644 src/app/components/header/processing-queue/processing-queue.module.ts delete mode 100644 src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts delete mode 100644 src/app/components/header/queue/download-all/download-all.module.ts delete mode 100644 src/app/components/header/queue/queue.module.ts delete mode 100644 src/app/components/help/help.module.ts delete mode 100644 src/app/components/map/banners/banners.module.ts delete mode 100644 src/app/components/map/displacement-layers/displacement-layers.module.ts delete mode 100644 src/app/components/map/map-controls/gridlines-selector/gridlines-selector.module.ts delete mode 100644 src/app/components/map/map-controls/layer-selector/layer-selector.module.ts delete mode 100644 src/app/components/map/map-controls/map-controls.module.ts delete mode 100644 src/app/components/map/map-controls/view-selector/view-selector.module.ts delete mode 100644 src/app/components/map/map.module.ts delete mode 100644 src/app/components/results-menu/baseline-results-menu/baseline-results-menu.module.ts delete mode 100644 src/app/components/results-menu/desktop-results-menu/desktop-results-menu.module.ts delete mode 100644 src/app/components/results-menu/mobile-results-menu/mobile-results-menu.module.ts delete mode 100644 src/app/components/results-menu/results-menu.module.ts delete mode 100644 src/app/components/results-menu/sarviews-results-menu/sarviews-results-menu.module.ts delete mode 100644 src/app/components/results-menu/sbas-results-menu/sbas-results-menu.module.ts delete mode 100644 src/app/components/results-menu/scene-detail/event-polygon-slider/event-polygon-slider.module.ts delete mode 100644 src/app/components/results-menu/scene-detail/image-dialog/image-dialog.module.ts delete mode 100644 src/app/components/results-menu/scene-detail/scene-detail.module.ts delete mode 100644 src/app/components/results-menu/scene-files/file-contents/file-contents.module.ts delete mode 100644 src/app/components/results-menu/scene-files/scene-file/scene-file.module.ts delete mode 100644 src/app/components/results-menu/scene-files/scene-files.module.ts delete mode 100644 src/app/components/results-menu/scenes-list-header/scenes-list-header.module.ts delete mode 100644 src/app/components/results-menu/scenes-list/scene/scene.module.ts delete mode 100644 src/app/components/results-menu/scenes-list/scenes-list.module.ts delete mode 100644 src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts delete mode 100644 src/app/components/sbas-chart/sbas-chart.module.ts delete mode 100644 src/app/components/shared/aoi-options/aoi-options.module.ts delete mode 100644 src/app/components/shared/aoi-options/file-upload/file-upload.module.ts delete mode 100644 src/app/components/shared/aoi-options/index.ts delete mode 100644 src/app/components/shared/cancel-filter-changes/cancel-filter-changes.module.ts delete mode 100644 src/app/components/shared/cancel-filter-changes/index.ts delete mode 100644 src/app/components/shared/cart-toggle/cart-toggle.module.ts delete mode 100644 src/app/components/shared/clear-button/clear-button.module.ts delete mode 100644 src/app/components/shared/clear-button/index.ts delete mode 100644 src/app/components/shared/code-export/code-export.module.ts delete mode 100644 src/app/components/shared/copy-to-clipboard/copy-to-clipboard.module.ts delete mode 100644 src/app/components/shared/docs-modal/docs-modal.module.ts delete mode 100644 src/app/components/shared/download-file-button/download-file-button.module.ts delete mode 100644 src/app/components/shared/event-metadata/event-metadata.module.ts delete mode 100644 src/app/components/shared/event-product-metadata/event-product-metadata.module.ts delete mode 100644 src/app/components/shared/event-product-sort-selector/event-product-sort-selector.module.ts delete mode 100644 src/app/components/shared/file-name/file-name.module.ts delete mode 100644 src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.module.ts delete mode 100644 src/app/components/shared/hyp3-url/hyp3-url.module.ts delete mode 100644 src/app/components/shared/max-results-selector/max-results-selector.module.ts delete mode 100644 src/app/components/shared/on-demand-add-menu/on-demand-add-menu.module.ts delete mode 100644 src/app/components/shared/save-search-dialog/save-search-dialog.module.ts delete mode 100644 src/app/components/shared/scene-metadata/scene-metadata.module.ts delete mode 100644 src/app/components/shared/search-button/search-button.module.ts delete mode 100644 src/app/components/shared/selectors/burst-selector/burst-selector.module.ts delete mode 100644 src/app/components/shared/selectors/circle-slider/circle-slider.module.ts delete mode 100644 src/app/components/shared/selectors/dataset-selector/dataset-selector.module.ts delete mode 100644 src/app/components/shared/selectors/dataset-selector/index.ts delete mode 100644 src/app/components/shared/selectors/date-range/date-range.module.ts delete mode 100644 src/app/components/shared/selectors/date-selector/date-selector.module.ts delete mode 100644 src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.module.ts delete mode 100644 src/app/components/shared/selectors/job-product-name-selector/job-product-name-selector.module.ts delete mode 100644 src/app/components/shared/selectors/job-status-selector/job-status-selector.module.ts delete mode 100644 src/app/components/shared/selectors/language-selector/language-selector.module.ts delete mode 100644 src/app/components/shared/selectors/master-scene-selector/master-scene-selector.module.ts delete mode 100644 src/app/components/shared/selectors/mission-selector/mission-selector.module.ts delete mode 100644 src/app/components/shared/selectors/observation-panel-selector/observation-panel-selector.module.ts delete mode 100644 src/app/components/shared/selectors/on-demand-user-selector/on-demand-user-selector.module.ts delete mode 100644 src/app/components/shared/selectors/opera-calibration-data-selector/opera-calibration-data-selector.module.ts delete mode 100644 src/app/components/shared/selectors/opera-s1-selector/opera-s1-selector.module.ts delete mode 100644 src/app/components/shared/selectors/other-selector/other-selector.module.ts delete mode 100644 src/app/components/shared/selectors/path-selector/path-selector.module.ts delete mode 100644 src/app/components/shared/selectors/product-science-selector/product-science-selector.module.ts delete mode 100644 src/app/components/shared/selectors/product-type-selector/product-type-selector.module.ts delete mode 100644 src/app/components/shared/selectors/production-config-selector/production-config-selector.module.ts delete mode 100644 src/app/components/shared/selectors/project-name-selector/project-name-selector.module.ts delete mode 100644 src/app/components/shared/selectors/sarviews-event-active-selector/sarviews-event-active-selector.module.ts delete mode 100644 src/app/components/shared/selectors/sarviews-event-magnitude-selector/sarviews-event-magnitude-selector.module.ts delete mode 100644 src/app/components/shared/selectors/sarviews-event-search-selector/sarviews-event-search-selector.module.ts delete mode 100644 src/app/components/shared/selectors/sarviews-event-type-selector/sarviews-event-type-selector.module.ts delete mode 100644 src/app/components/shared/selectors/sbas-overlap-selector/sbas-overlap-selector.module.ts delete mode 100644 src/app/components/shared/selectors/search-selector/search-selector.module.ts delete mode 100644 src/app/components/shared/selectors/search-type-selector/search-type-selector.module.ts delete mode 100644 src/app/components/shared/selectors/season-selector/season-selector.module.ts delete mode 100644 src/app/components/shared/selectors/short-name-selector/short-name-selector.module.ts delete mode 100644 src/app/components/sidebar/save-user-filters/save-user-filters.module.ts delete mode 100644 src/app/components/sidebar/saved-searches/saved-search/search-filters/search-filters.module.ts delete mode 100644 src/app/components/sidebar/saved-searches/saved-searches.module.ts delete mode 100644 src/app/components/sidebar/sidebar.module.ts delete mode 100644 src/app/components/timeseries-chart/timeseries-chart.module.ts delete mode 100644 src/app/pipes/pipes.module.ts delete mode 100644 src/app/shared/index.ts delete mode 100644 src/app/shared/mat-shared.module.ts delete mode 100644 src/app/shared/shared.module.ts 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.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.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.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.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.ts b/src/app/components/filters-dropdown/frame-order-filters/frame-order-filters.component.ts index a4658b58d..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 @@ -4,22 +4,6 @@ import { FormsModule } from '@angular/forms'; 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'; @@ -31,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', @@ -48,19 +35,9 @@ enum FilterPanel { 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.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.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.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.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.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.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.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.ts b/src/app/components/header/header-buttons/header-buttons.component.ts index 6e33c56c4..06598938e 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); 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.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.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.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.ts b/src/app/components/header/info-bar/info-bar.component.ts index cf2dedf9f..2e2444c88 100644 --- a/src/app/components/header/info-bar/info-bar.component.ts +++ b/src/app/components/header/info-bar/info-bar.component.ts @@ -11,8 +11,15 @@ 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'; import { DispDataDisclaimerComponent } from '@components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component'; import { MatDialog } from '@angular/material/dialog'; +import { MatIcon } from '@angular/material/icon'; // Declare GTM dataLayer array. declare global { @@ -25,7 +32,16 @@ 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, + MatIcon, + ], }) export class InfoBarComponent implements OnInit, OnDestroy { private store$ = inject>(Store); 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.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.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.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.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.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.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.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.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.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.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.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.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.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.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 086b40362..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,13 +4,14 @@ [matMenuTriggerFor]="layerMenu" aria-label="Map projection view" > - @if (layerType === layerTypes.SATELLITE) { - +
+ @if (layerType === layerTypes.SATELLITE) { terrain - - } @else { - directions_car - } + } @else { + directions_car + } +
+ diff --git a/src/app/components/map/map-controls/layer-selector/layer-selector.component.ts b/src/app/components/map/map-controls/layer-selector/layer-selector.component.ts index b7caac31a..ce1300358 100644 --- a/src/app/components/map/map-controls/layer-selector/layer-selector.component.ts +++ b/src/app/components/map/map-controls/layer-selector/layer-selector.component.ts @@ -10,12 +10,33 @@ import * as models from '@models'; import * as searchStore from '@store/search'; import { MapService, ScreenSizeService } from '@services'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { AsyncPipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { MatDivider } from '@angular/material/list'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { MatRadioButton } from '@angular/material/radio'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-layer-selector', templateUrl: './layer-selector.component.html', styleUrls: ['./layer-selector.component.scss'], - standalone: false, + imports: [ + MatButton, + MatMenuTrigger, + + MatIcon, + MatMenu, + MatMenuItem, + MatDivider, + MatCheckbox, + + MatRadioButton, + AsyncPipe, + TranslateModule, + ], }) export class LayerSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/map/map-controls/layer-selector/layer-selector.module.ts b/src/app/components/map/map-controls/layer-selector/layer-selector.module.ts deleted file mode 100644 index 8c17f4641..000000000 --- a/src/app/components/map/map-controls/layer-selector/layer-selector.module.ts +++ /dev/null @@ -1,28 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; -import { MatMenuModule } from '@angular/material/menu'; - -import { LayerSelectorComponent } from './layer-selector.component'; -import { GridlinesSelectorModule } from '@components/map/map-controls/gridlines-selector'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { SharedModule } from '@shared'; -import { MatRadioModule } from '@angular/material/radio'; - -@NgModule({ - declarations: [LayerSelectorComponent], - imports: [ - CommonModule, - MatButtonToggleModule, - MatMenuModule, - MatSharedModule, - MatCheckboxModule, - MatRadioModule, - GridlinesSelectorModule, - SharedModule, - ], - exports: [LayerSelectorComponent], -}) -export class LayerSelectorModule {} 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.ts b/src/app/components/map/map-controls/view-selector/view-selector.component.ts index 7f0d1b008..3ac66d355 100644 --- a/src/app/components/map/map-controls/view-selector/view-selector.component.ts +++ b/src/app/components/map/map-controls/view-selector/view-selector.component.ts @@ -6,6 +6,10 @@ import { AppState } from '@store'; import * as mapStore from '@store/map'; import * as searchStore from '@store/search'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; import { MapViewType, SearchType } from '@models'; // Declare GTM dataLayer array. @@ -19,7 +23,15 @@ declare global { selector: 'app-view-selector', templateUrl: './view-selector.component.html', styleUrls: ['./view-selector.component.scss'], - standalone: false, + imports: [ + MatButton, + MatMenuTrigger, + + MatIcon, + MatMenu, + MatMenuItem, + TranslateModule, + ], }) export class ViewSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -46,8 +58,11 @@ export class ViewSelectorComponent implements OnInit, OnDestroy { 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)) { + if ( + this.isDisplacementSearch && + (this.view === MapViewType.ARCTIC || + this.view === MapViewType.ANTARCTIC) + ) { this.store$.dispatch(new mapStore.SetMapView(MapViewType.EQUATORIAL)); } }), 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.ts b/src/app/components/map/map.component.ts index 0c410dd94..b30b3d232 100644 --- a/src/app/components/map/map.component.ts +++ b/src/app/components/map/map.component.ts @@ -45,6 +45,19 @@ import Geometry from 'ol/geom/Geometry'; import { MatDialog } from '@angular/material/dialog'; 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 +69,23 @@ 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, + ], }) export class MapComponent implements OnInit, OnDestroy { private store$ = inject>(Store); 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.ts b/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.ts index e74799cd9..715ec794e 100644 --- a/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.ts +++ b/src/app/components/results-menu/baseline-results-menu/baseline-results-menu.component.ts @@ -21,6 +21,22 @@ import { import { SubSink } from 'subsink'; import * as models from '@models'; +import { NgClass, 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 { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { MatButton } from '@angular/material/button'; +import { BaselineChartComponent } from '../../baseline-chart/baseline-chart.component'; +import { TranslateModule } from '@ngx-translate/core'; enum CardViews { LIST = 0, @@ -34,7 +50,26 @@ enum CardViews { './baseline-results-menu.component.scss', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatCard, + MatCardSubtitle, + ScenesListHeaderComponent, + ScenesListComponent, + SceneDetailComponent, + MatButtonToggleGroup, + MatButtonToggle, + MatTooltip, + MatIcon, + MatMenuTrigger, + OnDemandAddMenuComponent, + MatMenu, + MatMenuItem, + MatButton, + NgClass, + BaselineChartComponent, + AsyncPipe, + TranslateModule, + ], }) export class BaselineResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(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.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.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.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.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.ts b/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.ts index ca3f57ec9..7b2b1b6af 100644 --- a/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.ts +++ b/src/app/components/results-menu/sbas-results-menu/sbas-results-menu.component.ts @@ -8,7 +8,7 @@ import { inject, } from '@angular/core'; import { Observable, Subject } from 'rxjs'; -import { ResizeEvent } from 'angular-resizable-element'; +import { ResizeEvent, ResizableModule } from 'angular-resizable-element'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; @@ -21,6 +21,21 @@ import { ScreenSizeService, DatasetForProductService } from '@services'; import { SubSink } from 'subsink'; import { map } from 'rxjs/operators'; +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 { SceneMetadataComponent } from '@components/shared/scene-metadata/scene-metadata.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { SbasSlidersComponent } from './sbas-sliders/sbas-sliders.component'; +import { DocsModalComponent } from '@components/shared/docs-modal/docs-modal.component'; +import { SBASChartComponent } from '../../sbas-chart/sbas-chart.component'; +import { SbasSlidersTwoComponent } from './sbas-sliders-two/sbas-sliders-two.component'; +import { TranslateModule } from '@ngx-translate/core'; enum CardViews { LIST = 0, @@ -34,7 +49,24 @@ enum CardViews { './sbas-results-menu.component.scss', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatCard, + MatCardSubtitle, + ScenesListHeaderComponent, + ScenesListComponent, + + SceneMetadataComponent, + MatTooltip, + ResizableModule, + MatIcon, + MatButtonToggleGroup, + MatButtonToggle, + SbasSlidersComponent, + DocsModalComponent, + SBASChartComponent, + SbasSlidersTwoComponent, + TranslateModule, + ], }) export class SBASResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(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.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.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.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.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.ts b/src/app/components/results-menu/scene-files/scene-file/scene-file.component.ts index 44a43e612..64e46c382 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,12 +26,61 @@ 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 { 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); @@ -61,7 +110,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) 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.ts b/src/app/components/results-menu/scene-files/scene-files.component.ts index 485c2ed39..3f3cfe6d9 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 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.ts b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.ts index e0148df73..776de5345 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 @@ -45,12 +45,50 @@ import { CodeExportType, } from '@components/shared/code-export'; 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); 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.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.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.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.ts b/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.ts index f038db240..0b6d58e11 100644 --- a/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.ts +++ b/src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.ts @@ -2,12 +2,25 @@ import { Component, Input, Output, EventEmitter, inject } from '@angular/core'; import * as services from '@services'; import * as models from '@models'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatMenuTrigger } from '@angular/material/menu'; +import { Hyp3JobStatusBadgeComponent } from '@components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component'; +import { OnDemandAddMenuComponent } from '@components/shared/on-demand-add-menu/on-demand-add-menu.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scene-controls', templateUrl: './scene-controls.component.html', styleUrls: ['./scene-controls.component.scss'], - standalone: false, + imports: [ + MatIcon, + MatTooltip, + MatMenuTrigger, + Hyp3JobStatusBadgeComponent, + OnDemandAddMenuComponent, + TranslateModule, + ], }) export class SceneControlsComponent { private hyp3 = inject(services.Hyp3ApiService); 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.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 index d526581db..1d741fe9d 100644 --- 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 @@ -6,9 +6,9 @@ import { MatDialogContent, MatDialogRef, } from '@angular/material/dialog'; -import { SharedModule } from '@shared'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { TranslateService } from '@ngx-translate/core'; +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', @@ -41,9 +41,10 @@ import { SubSink } from 'subsink'; MatDialogContent, MatButton, MatDialogClose, - SharedModule, - DocsModalModule, + DocsModalComponent, + TranslateModule, ], + standalone: true, }) export class DispDataDisclaimerComponent implements OnInit, OnDestroy { dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts index f0a89ea84..4d998740e 100644 --- a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts +++ b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.component.ts @@ -19,7 +19,7 @@ import { Subject, withLatestFrom, } from 'rxjs'; -import { ResizeEvent } from 'angular-resizable-element'; +import { ResizeEvent, ResizableModule } from 'angular-resizable-element'; import { AppState } from '@store'; import * as searchStore from '@store/search'; @@ -49,12 +49,22 @@ import { MatDialogContent, MatDialogRef, } from '@angular/material/dialog'; -import { MatButton } from '@angular/material/button'; +import { MatButton, MatIconButton } from '@angular/material/button'; import { PointHistoryState } from '@services/point-history.service'; import { MatSnackBar, MatSnackBarConfig } from '@angular/material/snack-bar'; import { AsfLanguageService } from '@services/asf-language.service'; -import { SharedModule } from '@shared'; +import { NgTemplateOutlet, AsyncPipe, KeyValuePipe } from '@angular/common'; +import { MatCard, MatCardSubtitle } from '@angular/material/card'; +import { ScenesListHeaderComponent } from '../scenes-list-header/scenes-list-header.component'; +import { MatCheckbox } from '@angular/material/checkbox'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { MatButtonToggle } from '@angular/material/button-toggle'; +import { TimeseriesChartComponent } from '../../timeseries-chart/timeseries-chart.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { AoiIconPipe } from '@pipes/aoi-icon.pipe'; export interface Task { aoi: string; @@ -83,7 +93,24 @@ export interface PointSeries { './timeseries-results-menu.component.scss', '../results-menu.component.scss', ], - standalone: false, + imports: [ + MatCard, + MatCardSubtitle, + ScenesListHeaderComponent, + MatCheckbox, + MatIconButton, + MatTooltip, + MatIcon, + NgTemplateOutlet, + MatProgressSpinner, + ResizableModule, + MatButtonToggle, + TimeseriesChartComponent, + AsyncPipe, + KeyValuePipe, + TranslateModule, + AoiIconPipe, + ], }) export class TimeseriesResultsMenuComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -449,7 +476,7 @@ export class TimeseriesResultsMenuComponent implements OnInit, OnDestroy { MatDialogContent, MatButton, MatDialogClose, - SharedModule, + TranslateModule, ], }) export class ConfirmationDialog { diff --git a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts b/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts deleted file mode 100644 index 545a8de8d..000000000 --- a/src/app/components/results-menu/timeseries-results-menu/timeseries-results-menu.module.ts +++ /dev/null @@ -1,61 +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 { TimeseriesResultsMenuComponent } from './timeseries-results-menu.component'; -import { SharedModule } from '@shared'; -import { MatIconModule } from '@angular/material/icon'; -import { ScenesListModule } from '../scenes-list'; -import { ScenesListHeaderModule } from '../scenes-list-header'; -import { SceneMetadataModule } from '@components/shared/scene-metadata'; -import { TimeseriesChartModule } from '@components/timeseries-chart/timeseries-chart.module'; -import { ResizableModule } from 'angular-resizable-element'; -import { MatRadioModule } from '@angular/material/radio'; -import { PipesModule } from '@pipes'; -import { MatTab, MatTabGroup } from '@angular/material/tabs'; -import { TimeseriesChartTemporalSliderComponent } from '@components/timeseries-chart/timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component'; -import { MatCheckbox } from '@angular/material/checkbox'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { - MatAccordion, - MatExpansionPanel, - MatExpansionPanelDescription, - MatExpansionPanelTitle, - MatExpansionPanelHeader, -} from '@angular/material/expansion'; - -@NgModule({ - declarations: [TimeseriesResultsMenuComponent], - imports: [ - CommonModule, - MatMenuModule, - MatIconModule, - MatSharedModule, - MatButtonToggleModule, - FontAwesomeModule, - SharedModule, - ScenesListModule, - ScenesListHeaderModule, - SceneMetadataModule, - TimeseriesChartModule, - ResizableModule, - MatRadioModule, - PipesModule, - MatTabGroup, - MatTab, - TimeseriesChartTemporalSliderComponent, - MatCheckbox, - MatProgressSpinnerModule, - MatAccordion, - MatExpansionPanel, - MatExpansionPanelHeader, - MatExpansionPanelTitle, - MatExpansionPanelDescription, - ], - exports: [TimeseriesResultsMenuComponent], -}) -export class TimeseriesResultsMenuModule {} diff --git a/src/app/components/sbas-chart/sbas-chart.component.ts b/src/app/components/sbas-chart/sbas-chart.component.ts index 868e83c96..db2283aa0 100644 --- a/src/app/components/sbas-chart/sbas-chart.component.ts +++ b/src/app/components/sbas-chart/sbas-chart.component.ts @@ -20,6 +20,7 @@ import * as uiStore from '@store/ui'; import { SubSink } from 'subsink'; import { ScenesService, PairService } from '@services'; import { CMRProduct, CMRProductPair } from '@models'; +import { ResizedDirective } from '../../directives/resized.directive'; export enum ChartDatasets { MASTER = 0, @@ -35,7 +36,7 @@ export enum ChartDatasets { selector: 'app-sbas-chart', templateUrl: './sbas-chart.component.html', styleUrls: ['./sbas-chart.component.scss'], - standalone: false, + imports: [ResizedDirective], }) export class SBASChartComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/sbas-chart/sbas-chart.module.ts b/src/app/components/sbas-chart/sbas-chart.module.ts deleted file mode 100644 index 33fc6005a..000000000 --- a/src/app/components/sbas-chart/sbas-chart.module.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; - -import { ResizedEventModule } from '@directives/resized.directive'; - -import { SBASChartComponent } from './sbas-chart.component'; - -@NgModule({ - declarations: [SBASChartComponent], - imports: [CommonModule, MatSharedModule, ResizedEventModule], - exports: [SBASChartComponent], -}) -export class SBASChartModule {} diff --git a/src/app/components/shared/aoi-options/aoi-options.component.ts b/src/app/components/shared/aoi-options/aoi-options.component.ts index 87e2c7492..ca192300c 100644 --- a/src/app/components/shared/aoi-options/aoi-options.component.ts +++ b/src/app/components/shared/aoi-options/aoi-options.component.ts @@ -8,7 +8,7 @@ import { OnDestroy, inject, } from '@angular/core'; -import { NgForm } from '@angular/forms'; +import { NgForm, FormsModule } from '@angular/forms'; import { Subject } from 'rxjs'; import { tap, delay } from 'rxjs/operators'; @@ -23,6 +23,19 @@ import { SubSink } from 'subsink'; import { getSearchType, SetSearchOutOfDate } from '@store/search'; import { getIsFiltersMenuOpen, getIsResultsMenuOpen } from '@store/ui'; import { SetGeocode } from '@store/filters'; +import { MatIcon } from '@angular/material/icon'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { + MatFormField, + MatLabel, + MatInput, + MatSuffix, +} from '@angular/material/input'; +import { CdkTextareaAutosize } from '@angular/cdk/text-field'; +import { GeocodeSelectorComponent } from './geocode-selector/geocode-selector.component'; +import { FileUploadDialogComponent } from './file-upload/file-upload-dialog/file-upload-dialog.component'; +import { TranslateModule } from '@ngx-translate/core'; // Declare GTM dataLayer array. declare global { @@ -35,7 +48,21 @@ declare global { selector: 'app-aoi-options', templateUrl: './aoi-options.component.html', styleUrls: ['./aoi-options.component.scss'], - standalone: false, + imports: [ + MatIcon, + MatIconButton, + MatTooltip, + FormsModule, + MatFormField, + MatLabel, + CdkTextareaAutosize, + MatInput, + MatButton, + MatSuffix, + GeocodeSelectorComponent, + FileUploadDialogComponent, + TranslateModule, + ], }) export class AoiOptionsComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/aoi-options/aoi-options.module.ts b/src/app/components/shared/aoi-options/aoi-options.module.ts deleted file mode 100644 index a8b4b9f03..000000000 --- a/src/app/components/shared/aoi-options/aoi-options.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatInputModule } from '@angular/material/input'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; - -import { MatSharedModule } from '@shared'; - -import { FileUploadModule } from './file-upload'; -import { AoiOptionsComponent } from './aoi-options.component'; -import { DrawSelectorComponent } from './draw-selector/draw-selector.component'; -import { InteractionSelectorComponent } from './interaction-selector'; -import { SharedModule } from '@shared'; -import { GeocodeSelectorComponent } from './geocode-selector/geocode-selector.component'; -import { MatAutocompleteModule } from '@angular/material/autocomplete'; -import { MatSlideToggle } from '@angular/material/slide-toggle'; -import { PipesModule } from '@pipes'; - -@NgModule({ - declarations: [ - AoiOptionsComponent, - DrawSelectorComponent, - InteractionSelectorComponent, - GeocodeSelectorComponent, - ], - imports: [ - CommonModule, - MatButtonToggleModule, - FormsModule, - MatInputModule, - MatMenuModule, - MatSharedModule, - FileUploadModule, - SharedModule, - MatAutocompleteModule, - MatSlideToggle, - PipesModule, - ], - exports: [ - AoiOptionsComponent, - DrawSelectorComponent, - InteractionSelectorComponent, - ], -}) -export class AoiOptionsModule {} diff --git a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html index e86b6eeea..1eb5bc053 100644 --- a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html +++ b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html @@ -5,36 +5,29 @@ [matMenuTriggerFor]="drawMenu" aria-label="Map projection view" > - @if (drawMode === types.POINT) { - +
+ @if (drawMode === types.POINT) { place - - } - @if (drawMode === types.LINESTRING) { - + } + @if (drawMode === types.LINESTRING) { timeline - - } - @if (drawMode === types.POLYGON) { - + } + @if (drawMode === types.POLYGON) { - - } - @if (drawMode === types.BOX) { - + } + @if (drawMode === types.BOX) { format_shapes - - } - @if (drawMode === types.CIRCLE) { - + } + @if (drawMode === types.CIRCLE) { radio_button_unchecked - - } + } +
+ } @else { diff --git a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts index 35aa65bb6..4b755877e 100644 --- a/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts +++ b/src/app/components/shared/aoi-options/draw-selector/draw-selector.component.ts @@ -15,12 +15,29 @@ import { SearchType, } from '@models'; import { ThemePalette } from '@angular/material/core'; +import { TitleCasePipe } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import { MatSlideToggle } from '@angular/material/slide-toggle'; +import { TranslateModule } from '@ngx-translate/core'; +import { AoiIconPipe } from '@pipes/aoi-icon.pipe'; @Component({ selector: 'app-draw-selector', templateUrl: './draw-selector.component.html', styleUrls: ['./draw-selector.component.scss'], - standalone: false, + imports: [ + MatButton, + MatMenuTrigger, + MatIcon, + MatSlideToggle, + MatMenu, + MatMenuItem, + TitleCasePipe, + TranslateModule, + AoiIconPipe, + ], }) export class DrawSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/aoi-options/file-upload/file-upload-dialog/file-upload-dialog.component.ts b/src/app/components/shared/aoi-options/file-upload/file-upload-dialog/file-upload-dialog.component.ts index 2f6944263..22d1bb722 100644 --- a/src/app/components/shared/aoi-options/file-upload/file-upload-dialog/file-upload-dialog.component.ts +++ b/src/app/components/shared/aoi-options/file-upload/file-upload-dialog/file-upload-dialog.component.ts @@ -18,6 +18,13 @@ import { AppState } from '@store'; import { DrawNewPolygon } from '@store/map'; import * as models from '@models'; +import { AsyncPipe } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +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'; enum FileErrors { TOO_LARGE = 'Too large', @@ -28,7 +35,15 @@ enum FileErrors { selector: 'app-file-upload-dialog', templateUrl: 'file-upload-dialog.component.html', styleUrls: ['./file-upload-dialog.component.scss'], - standalone: false, + imports: [ + MatButton, + MatProgressSpinner, + MatButtonToggle, + MatTooltip, + MatIcon, + AsyncPipe, + TranslateModule, + ], }) export class FileUploadDialogComponent implements OnInit, OnDestroy { private mapService = inject(MapService); diff --git a/src/app/components/shared/aoi-options/file-upload/file-upload.component.ts b/src/app/components/shared/aoi-options/file-upload/file-upload.component.ts index 3afbf65e7..d3fe4bb24 100644 --- a/src/app/components/shared/aoi-options/file-upload/file-upload.component.ts +++ b/src/app/components/shared/aoi-options/file-upload/file-upload.component.ts @@ -20,7 +20,6 @@ import { MapInteractionModeType } from '@models'; selector: 'app-file-upload', templateUrl: './file-upload.component.html', styleUrls: ['./file-upload.component.css'], - standalone: false, }) export class FileUploadComponent implements OnInit, OnDestroy { dialog = inject(MatDialog); diff --git a/src/app/components/shared/aoi-options/file-upload/file-upload.module.ts b/src/app/components/shared/aoi-options/file-upload/file-upload.module.ts deleted file mode 100644 index fb9e01317..000000000 --- a/src/app/components/shared/aoi-options/file-upload/file-upload.module.ts +++ /dev/null @@ -1,36 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatDialogModule } from '@angular/material/dialog'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatListModule } from '@angular/material/list'; -import { MatProgressBarModule } from '@angular/material/progress-bar'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared/mat-shared.module'; -import { FileUploadComponent } from './file-upload.component'; -import { FileUploadDialogComponent } from './file-upload-dialog'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [FileUploadComponent, FileUploadDialogComponent], - imports: [ - CommonModule, - FormsModule, - SharedModule, - - MatDialogModule, - MatFormFieldModule, - MatInputModule, - MatListModule, - MatProgressBarModule, - MatProgressSpinnerModule, - MatButtonToggleModule, - - MatSharedModule, - ], - exports: [FileUploadComponent, FileUploadDialogComponent], -}) -export class FileUploadModule {} diff --git a/src/app/components/shared/aoi-options/geocode-selector/geocode-selector.component.ts b/src/app/components/shared/aoi-options/geocode-selector/geocode-selector.component.ts index e41f8dfa6..5b3f042b3 100644 --- a/src/app/components/shared/aoi-options/geocode-selector/geocode-selector.component.ts +++ b/src/app/components/shared/aoi-options/geocode-selector/geocode-selector.component.ts @@ -19,12 +19,31 @@ import { Store } from '@ngrx/store'; import { getGeocodeArea } from '@store/filters'; import { Feature } from 'ol'; import * as models from '@models'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { + MatAutocompleteTrigger, + MatAutocomplete, +} from '@angular/material/autocomplete'; +import { FormsModule } from '@angular/forms'; +import {} from '@angular/common'; +import { MatOption } from '@angular/material/select'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-geocode-selector', templateUrl: './geocode-selector.component.html', styleUrls: ['./geocode-selector.component.scss'], - standalone: false, + imports: [ + MatFormField, + MatLabel, + MatInput, + MatAutocompleteTrigger, + FormsModule, + MatAutocomplete, + + MatOption, + TranslateModule, + ], }) export class GeocodeSelectorComponent implements OnInit, OnDestroy { private http = inject(HttpClient); diff --git a/src/app/components/shared/aoi-options/index.ts b/src/app/components/shared/aoi-options/index.ts deleted file mode 100644 index c28193657..000000000 --- a/src/app/components/shared/aoi-options/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './aoi-options.module'; diff --git a/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.ts b/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.ts index ff7651ca5..382160163 100644 --- a/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.ts +++ b/src/app/components/shared/aoi-options/interaction-selector/interaction-selector.component.ts @@ -1,5 +1,8 @@ import { Component, OnInit, ViewChild, OnDestroy, inject } from '@angular/core'; -import { MatButtonToggle } from '@angular/material/button-toggle'; +import { + MatButtonToggle, + MatButtonToggleGroup, +} from '@angular/material/button-toggle'; import { SubSink } from 'subsink'; import { Store } from '@ngrx/store'; @@ -11,12 +14,28 @@ import { MapInteractionModeType, SearchType } from '@models'; import * as services from '@services'; import * as models from '@models'; import * as searchStore from '@store/search'; +import { DrawSelectorComponent } from '../draw-selector/draw-selector.component'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { AsyncPipe } from '@angular/common'; +import { FileUploadDialogComponent } from '../file-upload/file-upload-dialog/file-upload-dialog.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-interaction-selector', templateUrl: './interaction-selector.component.html', styleUrls: ['./interaction-selector.component.scss'], - standalone: false, + imports: [ + MatButtonToggleGroup, + DrawSelectorComponent, + MatButtonToggle, + MatTooltip, + MatIcon, + + FileUploadDialogComponent, + AsyncPipe, + TranslateModule, + ], }) export class InteractionSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.component.ts b/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.component.ts index f5cabbd84..244c52289 100644 --- a/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.component.ts +++ b/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.component.ts @@ -6,11 +6,13 @@ import * as filtersStore from '@store/filters'; import * as searchStore from '@store/search'; import * as uiStore from '@store/ui'; import { SubSink } from 'subsink'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-cancel-filter-changes', templateUrl: './cancel-filter-changes.component.html', styleUrls: ['./cancel-filter-changes.component.scss'], - standalone: false, + imports: [MatButton, TranslateModule], }) export class CancelFilterChangesComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.module.ts b/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.module.ts deleted file mode 100644 index a867d5375..000000000 --- a/src/app/components/shared/cancel-filter-changes/cancel-filter-changes.module.ts +++ /dev/null @@ -1,21 +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 { CancelFilterChangesComponent } from './cancel-filter-changes.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [CancelFilterChangesComponent], - imports: [ - CommonModule, - MatSharedModule, - MatButtonToggleModule, - MatMenuModule, - SharedModule, - ], - exports: [CancelFilterChangesComponent], -}) -export class CancelFilterChangesModule {} diff --git a/src/app/components/shared/cancel-filter-changes/index.ts b/src/app/components/shared/cancel-filter-changes/index.ts deleted file mode 100644 index a7c4175b9..000000000 --- a/src/app/components/shared/cancel-filter-changes/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './cancel-filter-changes.module'; diff --git a/src/app/components/shared/cart-toggle/cart-toggle.component.ts b/src/app/components/shared/cart-toggle/cart-toggle.component.ts index 111b03077..9ff014edc 100644 --- a/src/app/components/shared/cart-toggle/cart-toggle.component.ts +++ b/src/app/components/shared/cart-toggle/cart-toggle.component.ts @@ -1,10 +1,14 @@ import { Component, Input, Output, EventEmitter } from '@angular/core'; +import { MatIconButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-cart-toggle', templateUrl: './cart-toggle.component.html', styleUrls: ['./cart-toggle.component.scss'], - standalone: false, + imports: [MatIconButton, MatTooltip, MatIcon, TranslateModule], }) export class CartToggleComponent { @Output() toggle = new EventEmitter(); diff --git a/src/app/components/shared/cart-toggle/cart-toggle.module.ts b/src/app/components/shared/cart-toggle/cart-toggle.module.ts deleted file mode 100644 index d8bf748bc..000000000 --- a/src/app/components/shared/cart-toggle/cart-toggle.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { CartToggleComponent } from './cart-toggle.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [CartToggleComponent], - imports: [CommonModule, MatSharedModule, SharedModule], - exports: [CartToggleComponent], -}) -export class CartToggleModule {} diff --git a/src/app/components/shared/cart-toggle/index.ts b/src/app/components/shared/cart-toggle/index.ts index 93e5877d9..ccd795c6c 100644 --- a/src/app/components/shared/cart-toggle/index.ts +++ b/src/app/components/shared/cart-toggle/index.ts @@ -1,2 +1 @@ export * from './cart-toggle.component'; -export * from './cart-toggle.module'; diff --git a/src/app/components/shared/clear-button/clear-button.component.ts b/src/app/components/shared/clear-button/clear-button.component.ts index 52c053962..9b1715326 100644 --- a/src/app/components/shared/clear-button/clear-button.component.ts +++ b/src/app/components/shared/clear-button/clear-button.component.ts @@ -3,12 +3,14 @@ import { Component, inject } from '@angular/core'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as searchStore from '@store/search'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-clear-button', templateUrl: './clear-button.component.html', styleUrls: ['./clear-button.component.css'], - standalone: false, + imports: [MatButton, TranslateModule], }) export class ClearButtonComponent { private store$ = inject>(Store); diff --git a/src/app/components/shared/clear-button/clear-button.module.ts b/src/app/components/shared/clear-button/clear-button.module.ts deleted file mode 100644 index 4a87cfe36..000000000 --- a/src/app/components/shared/clear-button/clear-button.module.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { ClearButtonComponent } from './clear-button.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [ClearButtonComponent], - imports: [CommonModule, MatSharedModule, SharedModule], - exports: [ClearButtonComponent], -}) -export class ClearButtonModule {} diff --git a/src/app/components/shared/clear-button/index.ts b/src/app/components/shared/clear-button/index.ts deleted file mode 100644 index 79385b75d..000000000 --- a/src/app/components/shared/clear-button/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './clear-button.module'; diff --git a/src/app/components/shared/code-export/code-export.component.ts b/src/app/components/shared/code-export/code-export.component.ts index b9c6ce0fc..4e08cc66a 100644 --- a/src/app/components/shared/code-export/code-export.component.ts +++ b/src/app/components/shared/code-export/code-export.component.ts @@ -6,12 +6,23 @@ import { AfterViewInit, inject, } from '@angular/core'; -import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { + MatDialogRef, + MAT_DIALOG_DATA, + MatDialogTitle, + MatDialogContent, + MatDialogActions, + MatDialogClose, +} from '@angular/material/dialog'; import { NotificationService } from '@services'; import { ClipboardService } from 'ngx-clipboard'; import { SaveSearchDialogComponent } from '../save-search-dialog'; import Prism from 'prismjs'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { DocsModalComponent } from '../docs-modal/docs-modal.component'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; export enum CodeExportType { ASF_SEARCH, @@ -22,7 +33,16 @@ export enum CodeExportType { selector: 'app-code-export', templateUrl: './code-export.component.html', styleUrls: ['./code-export.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + MatDialogActions, + DocsModalComponent, + MatButton, + MatDialogClose, + TranslateModule, + ], }) export class CodeExportComponent implements OnInit, AfterViewInit { dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/shared/code-export/code-export.module.ts b/src/app/components/shared/code-export/code-export.module.ts deleted file mode 100644 index 6564db459..000000000 --- a/src/app/components/shared/code-export/code-export.module.ts +++ /dev/null @@ -1,32 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CodeExportComponent } from './code-export.component'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; - -import { DocsModalModule } from '../docs-modal'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatSharedModule } from '@shared'; - -import 'prismjs/components/prism-python'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [CodeExportComponent], - imports: [ - CommonModule, - MatDialogModule, - MatSharedModule, - MatSelectModule, - MatButtonToggleModule, - MatIconModule, - MatMenuModule, - DocsModalModule, - SharedModule, - ], - exports: [CodeExportComponent], -}) -export class CodeExportModule {} diff --git a/src/app/components/shared/code-export/index.ts b/src/app/components/shared/code-export/index.ts index cf253e4b6..d5d0bbc88 100644 --- a/src/app/components/shared/code-export/index.ts +++ b/src/app/components/shared/code-export/index.ts @@ -1,2 +1 @@ -export * from './code-export.module'; export * from './code-export.component'; diff --git a/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.component.ts b/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.component.ts index b6b35e13c..e7bd38a3f 100644 --- a/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.component.ts +++ b/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.component.ts @@ -15,12 +15,22 @@ import { IconDefinition } from '@fortawesome/free-solid-svg-icons'; import { ClipboardService } from 'ngx-clipboard'; import { NotificationService } from '@services/notification.service'; import { CopyIcons } from '@models'; +import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; @Component({ selector: 'app-copy-to-clipboard', templateUrl: './copy-to-clipboard.component.html', styleUrls: ['./copy-to-clipboard.component.css'], - standalone: false, + imports: [ + FontAwesomeModule, + MatTooltip, + MatMenuTrigger, + MatMenu, + + MatMenuItem, + ], }) export class CopyToClipboardComponent implements OnDestroy { private clipboardService = inject(ClipboardService); diff --git a/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.module.ts b/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.module.ts deleted file mode 100644 index 8f2809747..000000000 --- a/src/app/components/shared/copy-to-clipboard/copy-to-clipboard.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CopyToClipboardComponent } from './copy-to-clipboard.component'; - -import { MatSharedModule } from '@shared'; -import { MatMenuModule } from '@angular/material/menu'; -import { ClipboardModule } from 'ngx-clipboard'; -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; - -@NgModule({ - declarations: [CopyToClipboardComponent], - imports: [ - CommonModule, - FontAwesomeModule, - ClipboardModule, - MatSharedModule, - MatMenuModule, - ], - exports: [CopyToClipboardComponent], -}) -export class CopyToClipboardModule {} diff --git a/src/app/components/shared/copy-to-clipboard/index.ts b/src/app/components/shared/copy-to-clipboard/index.ts index f67186d7e..c75baa4ca 100644 --- a/src/app/components/shared/copy-to-clipboard/index.ts +++ b/src/app/components/shared/copy-to-clipboard/index.ts @@ -1,2 +1 @@ export * from './copy-to-clipboard.component'; -export * from './copy-to-clipboard.module'; diff --git a/src/app/components/shared/docs-modal/docs-modal.component.ts b/src/app/components/shared/docs-modal/docs-modal.component.ts index d3b991e8a..f6fa7fc9b 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.ts +++ b/src/app/components/shared/docs-modal/docs-modal.component.ts @@ -19,10 +19,20 @@ // import { Component, Input, OnInit, OnDestroy, inject } from '@angular/core'; -import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; +import { + MatDialog, + MAT_DIALOG_DATA, + MatDialogContent, + MatDialogActions, + MatDialogClose, +} from '@angular/material/dialog'; import { DomSanitizer } from '@angular/platform-browser'; -import { TranslateService } from '@ngx-translate/core'; +import { TranslateService, TranslateModule } from '@ngx-translate/core'; import { SubSink } from 'subsink'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { MatButton } from '@angular/material/button'; export interface DialogData { rawUrl: string; @@ -33,7 +43,7 @@ export interface DialogData { selector: 'app-docs-modal', templateUrl: './docs-modal.component.html', styleUrls: ['./docs-modal.component.scss'], - standalone: false, + imports: [MatTooltip, MatIcon, TranslateModule], }) export class DocsModalComponent implements OnInit, OnDestroy { dialog = inject(MatDialog); @@ -115,7 +125,14 @@ export class DocsModalComponent implements OnInit, OnDestroy { selector: 'app-docs-modal-iframe', templateUrl: 'docs-modal-iframe.html', styleUrls: ['docs-modal-iframe.scss'], - standalone: false, + imports: [ + CdkScrollable, + MatDialogContent, + MatDialogActions, + MatButton, + MatDialogClose, + TranslateModule, + ], }) export class DocsModalIframeComponent { data = inject(MAT_DIALOG_DATA); diff --git a/src/app/components/shared/docs-modal/docs-modal.module.ts b/src/app/components/shared/docs-modal/docs-modal.module.ts deleted file mode 100644 index 320b92f77..000000000 --- a/src/app/components/shared/docs-modal/docs-modal.module.ts +++ /dev/null @@ -1,24 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatSharedModule } from '@shared'; -import { - DocsModalComponent, - DocsModalIframeComponent, -} from './docs-modal.component'; -import { MatIconModule } from '@angular/material/icon'; -import { MatDialogModule } from '@angular/material/dialog'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DocsModalComponent, DocsModalIframeComponent], - imports: [ - CommonModule, - MatSharedModule, - MatIconModule, - MatDialogModule, - SharedModule, - ], - exports: [DocsModalComponent, DocsModalIframeComponent], -}) -export class DocsModalModule {} diff --git a/src/app/components/shared/docs-modal/index.ts b/src/app/components/shared/docs-modal/index.ts index f621afad4..e69de29bb 100644 --- a/src/app/components/shared/docs-modal/index.ts +++ b/src/app/components/shared/docs-modal/index.ts @@ -1 +0,0 @@ -export * from './docs-modal.module'; diff --git a/src/app/components/shared/download-file-button/download-file-button.component.ts b/src/app/components/shared/download-file-button/download-file-button.component.ts index 548e54fac..6d33a1f6e 100644 --- a/src/app/components/shared/download-file-button/download-file-button.component.ts +++ b/src/app/components/shared/download-file-button/download-file-button.component.ts @@ -30,12 +30,24 @@ import * as userStore from '@store/user'; import { SubSink } from 'subsink'; import { AuthService, NotificationService } from '@services'; import { HttpClient, HttpEventType } from '@angular/common/http'; +import { MatIconButton, MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-download-file-button', templateUrl: './download-file-button.component.html', styleUrls: ['./download-file-button.component.scss'], - standalone: false, + imports: [ + MatIconButton, + MatTooltip, + MatIcon, + MatButton, + MatProgressSpinner, + TranslateModule, + ], }) export class DownloadFileButtonComponent implements OnInit, AfterViewInit { private downloadService = inject(DownloadService); diff --git a/src/app/components/shared/download-file-button/download-file-button.module.ts b/src/app/components/shared/download-file-button/download-file-button.module.ts deleted file mode 100644 index 5ef451bf0..000000000 --- a/src/app/components/shared/download-file-button/download-file-button.module.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { DownloadFileButtonComponent } from './download-file-button.component'; -import { MatButtonModule } from '@angular/material/button'; -import { MatTooltipModule } from '@angular/material/tooltip'; -import { MatProgressSpinnerModule } from '@angular/material/progress-spinner'; -import { MatIconModule } from '@angular/material/icon'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DownloadFileButtonComponent], - exports: [DownloadFileButtonComponent], - imports: [ - CommonModule, - MatButtonModule, - MatTooltipModule, - MatProgressSpinnerModule, - MatIconModule, - SharedModule, - ], -}) -export class DownloadFileButtonModule {} diff --git a/src/app/components/shared/event-metadata/event-metadata.component.ts b/src/app/components/shared/event-metadata/event-metadata.component.ts index 7c017ae62..0f4ae4665 100644 --- a/src/app/components/shared/event-metadata/event-metadata.component.ts +++ b/src/app/components/shared/event-metadata/event-metadata.component.ts @@ -4,12 +4,32 @@ import { Store } from '@ngrx/store'; import { AppState } from '@store'; import moment from 'moment'; import * as filtersStore from '@store/filters'; +import { MatIcon } from '@angular/material/icon'; +import { + MatMenuTrigger, + MatMenu, + MatMenuContent, + MatMenuItem, +} from '@angular/material/menu'; +import { ShortDateTimePipe } from '@pipes/short-date.pipe'; +import { QuakePipe, VolcanoPipe } from '@pipes/sarviews-event.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-event-metadata', templateUrl: './event-metadata.component.html', styleUrls: ['./event-metadata.component.scss'], - standalone: false, + imports: [ + MatIcon, + MatMenuTrigger, + MatMenu, + MatMenuContent, + MatMenuItem, + ShortDateTimePipe, + QuakePipe, + VolcanoPipe, + TranslateModule, + ], }) export class EventMetadataComponent { private store$ = inject>(Store); diff --git a/src/app/components/shared/event-metadata/event-metadata.module.ts b/src/app/components/shared/event-metadata/event-metadata.module.ts deleted file mode 100644 index e12c34a57..000000000 --- a/src/app/components/shared/event-metadata/event-metadata.module.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { EventMetadataComponent } from './event-metadata.component'; -import { PipesModule } from '@pipes'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatIconModule } from '@angular/material/icon'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [EventMetadataComponent], - imports: [ - CommonModule, - PipesModule, - MatMenuModule, - MatIconModule, - SharedModule, - ], - exports: [EventMetadataComponent], -}) -export class EventMetadataModule {} diff --git a/src/app/components/shared/event-product-metadata/event-product-metadata.component.ts b/src/app/components/shared/event-product-metadata/event-product-metadata.component.ts index 0fa36cc63..746bb8c9b 100644 --- a/src/app/components/shared/event-product-metadata/event-product-metadata.component.ts +++ b/src/app/components/shared/event-product-metadata/event-product-metadata.component.ts @@ -1,5 +1,8 @@ import { Component, Input } from '@angular/core'; import * as models from '@models'; +import {} from '@angular/common'; +import { ShortDateTimePipe } from '@pipes/short-date.pipe'; +import { TranslateModule } from '@ngx-translate/core'; interface IEventProductMetadata { path: number; @@ -22,7 +25,7 @@ enum Polarizations { selector: 'app-event-product-metadata', templateUrl: './event-product-metadata.component.html', styleUrls: ['./event-product-metadata.component.scss'], - standalone: false, + imports: [ShortDateTimePipe, TranslateModule], }) export class EventProductMetadataComponent { @Input() set product(value: models.SarviewsProduct) { diff --git a/src/app/components/shared/event-product-metadata/event-product-metadata.module.ts b/src/app/components/shared/event-product-metadata/event-product-metadata.module.ts deleted file mode 100644 index a48280ab1..000000000 --- a/src/app/components/shared/event-product-metadata/event-product-metadata.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { EventProductMetadataComponent } from './event-product-metadata.component'; -import { PipesModule } from '@pipes'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [EventProductMetadataComponent], - imports: [CommonModule, PipesModule, SharedModule], - exports: [EventProductMetadataComponent], -}) -export class EventProductMetadataModule {} diff --git a/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.component.ts b/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.component.ts index a5adbdae9..4e452378b 100644 --- a/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.component.ts +++ b/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.component.ts @@ -8,12 +8,29 @@ import { SetEventProductSorting, } from '@store/filters'; import { SubSink } from 'subsink'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import {} from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-event-product-sort-selector', templateUrl: './event-product-sort-selector.component.html', styleUrls: ['./event-product-sort-selector.component.scss'], - standalone: false, + imports: [ + MatButtonToggleGroup, + MatButtonToggle, + MatMenuTrigger, + MatIcon, + MatMenu, + + MatMenuItem, + TranslateModule, + ], }) export class EventProductSortSelectorComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.module.ts b/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.module.ts deleted file mode 100644 index df5ac261b..000000000 --- a/src/app/components/shared/event-product-sort-selector/event-product-sort-selector.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { EventProductSortSelectorComponent } from './event-product-sort-selector.component'; - -import { MatSelectModule } from '@angular/material/select'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatIconModule } from '@angular/material/icon'; -import { MatMenuModule } from '@angular/material/menu'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [EventProductSortSelectorComponent], - imports: [ - CommonModule, - MatSelectModule, - MatButtonToggleModule, - MatIconModule, - MatMenuModule, - SharedModule, - ], - exports: [EventProductSortSelectorComponent], -}) -export class EventProductSortSelectorModule {} diff --git a/src/app/components/shared/file-name/file-name.component.ts b/src/app/components/shared/file-name/file-name.component.ts index be8640861..0c02eb90f 100644 --- a/src/app/components/shared/file-name/file-name.component.ts +++ b/src/app/components/shared/file-name/file-name.component.ts @@ -5,12 +5,13 @@ import { map } from 'rxjs/operators'; import { ScreenSizeService } from '@services'; import { SearchType } from '@models'; +import { TruncateModule } from '@yellowspot/ng-truncate'; @Component({ selector: 'app-file-name', templateUrl: './file-name.component.html', styleUrls: ['./file-name.component.scss'], - standalone: false, + imports: [TruncateModule], }) export class FileNameComponent implements OnInit, OnDestroy { private screenSize = inject(ScreenSizeService); diff --git a/src/app/components/shared/file-name/file-name.module.ts b/src/app/components/shared/file-name/file-name.module.ts deleted file mode 100644 index 777eab375..000000000 --- a/src/app/components/shared/file-name/file-name.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { TruncateModule } from '@yellowspot/ng-truncate'; - -import { FileNameComponent } from './file-name.component'; - -@NgModule({ - declarations: [FileNameComponent], - imports: [CommonModule, TruncateModule], - exports: [FileNameComponent], -}) -export class FileNameModule {} diff --git a/src/app/components/shared/file-name/index.ts b/src/app/components/shared/file-name/index.ts index f0f1f3fc3..7f518fe17 100644 --- a/src/app/components/shared/file-name/index.ts +++ b/src/app/components/shared/file-name/index.ts @@ -1,2 +1 @@ export * from './file-name.component'; -export * from './file-name.module'; diff --git a/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.ts b/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.ts index 787059be0f..ecd830c91 100644 --- a/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.ts +++ b/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.ts @@ -15,12 +15,15 @@ import { Store } from '@ngrx/store'; import * as models from '@models'; import * as hyp3Store from '@store/hyp3'; import * as queueStore from '@store/queue'; +import { MatChip } from '@angular/material/chips'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-hyp3-job-status-badge', templateUrl: './hyp3-job-status-badge.component.html', styleUrls: ['./hyp3-job-status-badge.component.scss'], - standalone: false, + imports: [MatChip, MatMenuTrigger, MatMenu, MatMenuItem, TranslateModule], }) export class Hyp3JobStatusBadgeComponent implements OnInit { private hyp3 = inject(Hyp3ApiService); diff --git a/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.module.ts b/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.module.ts deleted file mode 100644 index dfc16b305..000000000 --- a/src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.module.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatChipsModule } from '@angular/material/chips'; - -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatButtonModule } from '@angular/material/button'; -import { Hyp3JobStatusBadgeComponent } from './hyp3-job-status-badge.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [Hyp3JobStatusBadgeComponent], - imports: [ - CommonModule, - MatChipsModule, - MatFormFieldModule, - MatMenuModule, - MatButtonModule, - SharedModule, - ], - exports: [Hyp3JobStatusBadgeComponent], -}) -export class Hyp3JobStatusBadgeModule {} diff --git a/src/app/components/shared/hyp3-job-status-badge/index.ts b/src/app/components/shared/hyp3-job-status-badge/index.ts index 87a3b94eb..da8c988fe 100644 --- a/src/app/components/shared/hyp3-job-status-badge/index.ts +++ b/src/app/components/shared/hyp3-job-status-badge/index.ts @@ -1,2 +1 @@ -export * from './hyp3-job-status-badge.module'; export * from './hyp3-job-status-badge.component'; diff --git a/src/app/components/shared/hyp3-url/hyp3-url.component.ts b/src/app/components/shared/hyp3-url/hyp3-url.component.ts index fbf7eee88..e01da7481 100644 --- a/src/app/components/shared/hyp3-url/hyp3-url.component.ts +++ b/src/app/components/shared/hyp3-url/hyp3-url.component.ts @@ -4,12 +4,13 @@ import { SubSink } from 'subsink'; import * as services from '@services'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; +import { MatIcon } from '@angular/material/icon'; @Component({ selector: 'app-hyp3-url', templateUrl: './hyp3-url.component.html', styleUrls: ['./hyp3-url.component.scss'], - standalone: false, + imports: [MatIcon], }) export class Hyp3UrlComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/hyp3-url/hyp3-url.module.ts b/src/app/components/shared/hyp3-url/hyp3-url.module.ts deleted file mode 100644 index 1ba9256e8..000000000 --- a/src/app/components/shared/hyp3-url/hyp3-url.module.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { Hyp3UrlComponent } from '@components/shared/hyp3-url/hyp3-url.component'; -import { MatIconModule } from '@angular/material/icon'; - -@NgModule({ - declarations: [Hyp3UrlComponent], - imports: [CommonModule, MatIconModule], - exports: [Hyp3UrlComponent], -}) -export class Hyp3UrlModule {} diff --git a/src/app/components/shared/max-results-selector/api-link-dialog/api-link-dialog.component.ts b/src/app/components/shared/max-results-selector/api-link-dialog/api-link-dialog.component.ts index 6f474bd27..34b66ae05 100644 --- a/src/app/components/shared/max-results-selector/api-link-dialog/api-link-dialog.component.ts +++ b/src/app/components/shared/max-results-selector/api-link-dialog/api-link-dialog.component.ts @@ -3,17 +3,59 @@ import { ClipboardService } from 'ngx-clipboard'; import { BehaviorSubject, combineLatest } from 'rxjs'; import { map, withLatestFrom, filter, tap } from 'rxjs/operators'; -import { MatDialogRef } from '@angular/material/dialog'; +import { + MatDialogRef, + MatDialogTitle, + MatDialogContent, + MatDialogActions, + MatDialogClose, +} from '@angular/material/dialog'; import { SubSink } from 'subsink'; import * as services from '@services'; import { asfWebsite } from '@models'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { FormsModule } from '@angular/forms'; +import { + MatFormField, + MatLabel, + MatInput, + MatSuffix, +} from '@angular/material/input'; +import { MatSelect, MatOption } from '@angular/material/select'; +import { CdkTextareaAutosize } from '@angular/cdk/text-field'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { DocsModalComponent } from '../../docs-modal/docs-modal.component'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-api-link-dialog', templateUrl: './api-link-dialog.component.html', styleUrls: ['./api-link-dialog.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + FormsModule, + MatFormField, + MatLabel, + MatInput, + MatSelect, + + MatOption, + CdkTextareaAutosize, + + MatIcon, + MatSuffix, + MatTooltip, + MatDialogActions, + DocsModalComponent, + MatButton, + MatDialogClose, + TranslateModule, + ], }) export class ApiLinkDialogComponent implements OnInit, OnDestroy { private asfApiService = inject(services.AsfApiService); diff --git a/src/app/components/shared/max-results-selector/max-results-selector.component.ts b/src/app/components/shared/max-results-selector/max-results-selector.component.ts index 5f67a4afd..2c4d6a51f 100644 --- a/src/app/components/shared/max-results-selector/max-results-selector.component.ts +++ b/src/app/components/shared/max-results-selector/max-results-selector.component.ts @@ -9,12 +9,31 @@ import * as scenesStore from '@store/scenes'; import * as models from '@models'; import { SubSink } from 'subsink'; import { PairService, ScenesService } from '@services'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import { + FaIconLibrary, + FontAwesomeModule, +} from '@fortawesome/angular-fontawesome'; +import { DocsModalComponent } from '../docs-modal/docs-modal.component'; +import { TranslateModule } from '@ngx-translate/core'; +import { fas, faSpinner } from '@fortawesome/free-solid-svg-icons'; @Component({ selector: 'app-max-results-selector', templateUrl: './max-results-selector.component.html', styleUrls: ['./max-results-selector.component.scss'], - standalone: false, + imports: [ + MatMenuTrigger, + MatIcon, + FontAwesomeModule, + MatMenu, + + MatMenuItem, + DocsModalComponent, + TranslateModule, + FontAwesomeModule, + ], }) export class MaxResultsSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); @@ -35,7 +54,12 @@ export class MaxResultsSelectorComponent implements OnInit, OnDestroy { public possibleMaxResults = [250, 1000]; private subs = new SubSink(); + constructor() { + const library = inject(FaIconLibrary); + library.addIconPacks(fas); + library.addIcons(faSpinner); + } ngOnInit() { this.subs.add( this.store$ diff --git a/src/app/components/shared/max-results-selector/max-results-selector.module.ts b/src/app/components/shared/max-results-selector/max-results-selector.module.ts deleted file mode 100644 index defb1e994..000000000 --- a/src/app/components/shared/max-results-selector/max-results-selector.module.ts +++ /dev/null @@ -1,47 +0,0 @@ -import { NgModule, inject } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatMenuModule } from '@angular/material/menu'; -import { MatInputModule } from '@angular/material/input'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; -import { MatDialogModule } from '@angular/material/dialog'; - -import { - FontAwesomeModule, - FaIconLibrary, -} from '@fortawesome/angular-fontawesome'; -import { faSpinner, fas } from '@fortawesome/free-solid-svg-icons'; - -import { MaxResultsSelectorComponent } from './max-results-selector.component'; -import { ApiLinkDialogComponent } from './api-link-dialog/api-link-dialog.component'; -import { ClipboardModule } from 'ngx-clipboard'; -import { SharedModule } from '@shared'; -import { DocsModalModule } from '@components/shared/docs-modal'; - -@NgModule({ - declarations: [MaxResultsSelectorComponent, ApiLinkDialogComponent], - imports: [ - CommonModule, - FormsModule, - FontAwesomeModule, - MatMenuModule, - MatInputModule, - MatSelectModule, - MatSharedModule, - MatDialogModule, - ClipboardModule, - SharedModule, - DocsModalModule, - ], - exports: [MaxResultsSelectorComponent], -}) -export class MaxResultsSelectorModule { - constructor() { - const library = inject(FaIconLibrary); - - library.addIconPacks(fas); - library.addIcons(faSpinner); - } -} diff --git a/src/app/components/shared/on-demand-add-menu/closest-pair/closest-pair.component.ts b/src/app/components/shared/on-demand-add-menu/closest-pair/closest-pair.component.ts index 50e9a8f9a..154344fb5 100644 --- a/src/app/components/shared/on-demand-add-menu/closest-pair/closest-pair.component.ts +++ b/src/app/components/shared/on-demand-add-menu/closest-pair/closest-pair.component.ts @@ -8,11 +8,14 @@ import { PairService } from '@services'; import { CMRProduct } from '@models'; import { getMasterName, getScenes } from '@store/scenes'; import { getTemporalRange } from '@store/filters'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { MatMenuItem } from '@angular/material/menu'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-closest-pair', templateUrl: './closest-pair.component.html', styleUrls: ['./closest-pair.component.scss'], - standalone: false, + imports: [MatFormField, MatLabel, MatInput, MatMenuItem, TranslateModule], }) export class ClosestPairComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts index 946be60ff..8e7ef231d 100644 --- a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts +++ b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts @@ -1,5 +1,10 @@ import { Component, OnInit, Input, ViewChild, inject } from '@angular/core'; -import { MatMenu } from '@angular/material/menu'; +import { + MatMenu, + MatMenuContent, + MatMenuItem, + MatMenuTrigger, +} from '@angular/material/menu'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as queueStore from '@store/queue'; @@ -18,12 +23,29 @@ import { getSelectedDataset, getShouldUseFramesForReference, } from '@store/filters'; +import { NgPlural, NgPluralCase, DecimalPipe } from '@angular/common'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-on-demand-add-menu', templateUrl: './on-demand-add-menu.component.html', styleUrls: ['./on-demand-add-menu.component.scss'], - standalone: false, + imports: [ + MatMenu, + MatMenuContent, + + MatMenuItem, + + MatTooltip, + MatMenuTrigger, + MatIcon, + NgPlural, + NgPluralCase, + DecimalPipe, + TranslateModule, + ], }) export class OnDemandAddMenuComponent implements OnInit { private store$ = inject>(Store); diff --git a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.module.ts b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.module.ts deleted file mode 100644 index 7dfe73dba..000000000 --- a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatInputModule } from '@angular/material/input'; - -import { MatSharedModule } from '@shared'; - -import { OnDemandAddMenuComponent } from './on-demand-add-menu.component'; -import { ClosestPairComponent } from './closest-pair/closest-pair.component'; - -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [OnDemandAddMenuComponent, ClosestPairComponent], - imports: [ - CommonModule, - MatMenuModule, - MatSharedModule, - MatInputModule, - FormsModule, - SharedModule, - ], - exports: [OnDemandAddMenuComponent], -}) -export class OnDemandAddMenuModule {} diff --git a/src/app/components/shared/save-search-dialog/index.ts b/src/app/components/shared/save-search-dialog/index.ts index 6a1d4cb3f..80a7afa83 100644 --- a/src/app/components/shared/save-search-dialog/index.ts +++ b/src/app/components/shared/save-search-dialog/index.ts @@ -1,2 +1 @@ -export * from './save-search-dialog.module'; export * from './save-search-dialog.component'; diff --git a/src/app/components/shared/save-search-dialog/save-search-dialog.component.ts b/src/app/components/shared/save-search-dialog/save-search-dialog.component.ts index 85dfa3350..36bc8d396 100644 --- a/src/app/components/shared/save-search-dialog/save-search-dialog.component.ts +++ b/src/app/components/shared/save-search-dialog/save-search-dialog.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 { v1 as uuid } from 'uuid'; import { combineLatest } from 'rxjs'; @@ -15,12 +21,33 @@ import { SavedSearchService, NotificationService } from '@services'; import * as models from '@models'; import { AsfLanguageService } from '@services/asf-language.service'; +import { CdkScrollable } from '@angular/cdk/scrolling'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatInput, MatHint } from '@angular/material/input'; +import { SearchFiltersComponent } from '../../sidebar/saved-searches/saved-search/search-filters/search-filters.component'; +import { MatButton } from '@angular/material/button'; +import { UpperCasePipe, TitleCasePipe } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-save-search-dialog', templateUrl: './save-search-dialog.component.html', styleUrls: ['./save-search-dialog.component.scss'], - standalone: false, + imports: [ + MatDialogTitle, + CdkScrollable, + MatDialogContent, + FormsModule, + MatFormField, + MatInput, + MatHint, + SearchFiltersComponent, + MatDialogActions, + MatButton, + UpperCasePipe, + TitleCasePipe, + TranslateModule, + ], }) export class SaveSearchDialogComponent implements OnInit { dialogRef = inject>(MatDialogRef); diff --git a/src/app/components/shared/save-search-dialog/save-search-dialog.module.ts b/src/app/components/shared/save-search-dialog/save-search-dialog.module.ts deleted file mode 100644 index 3407a8c01..000000000 --- a/src/app/components/shared/save-search-dialog/save-search-dialog.module.ts +++ /dev/null @@ -1,26 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatInputModule } from '@angular/material/input'; - -import { MatSharedModule } from '@shared'; - -import { SaveSearchDialogComponent } from './save-search-dialog.component'; -import { SearchFiltersModule } from '@components/sidebar/saved-searches/saved-search/search-filters'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SaveSearchDialogComponent], - imports: [ - CommonModule, - MatDialogModule, - MatInputModule, - FormsModule, - MatSharedModule, - SearchFiltersModule, - SharedModule, - ], - exports: [SaveSearchDialogComponent], -}) -export class SaveSearchDialogModule {} diff --git a/src/app/components/shared/scene-metadata/index.ts b/src/app/components/shared/scene-metadata/index.ts index b50aee41c..24f524e8a 100644 --- a/src/app/components/shared/scene-metadata/index.ts +++ b/src/app/components/shared/scene-metadata/index.ts @@ -1,2 +1 @@ -export * from './scene-metadata.module'; export * from './scene-metadata.component'; diff --git a/src/app/components/shared/scene-metadata/scene-metadata.component.ts b/src/app/components/shared/scene-metadata/scene-metadata.component.ts index 52fa9dcf9..973c4f4ac 100644 --- a/src/app/components/shared/scene-metadata/scene-metadata.component.ts +++ b/src/app/components/shared/scene-metadata/scene-metadata.component.ts @@ -8,12 +8,35 @@ import * as filtersStore from '@store/filters'; import * as models from '@models'; import { PropertyService } from '@services'; +import { UpperCasePipe } from '@angular/common'; +import { MatIcon } from '@angular/material/icon'; +import { + MatMenuTrigger, + MatMenu, + MatMenuItem, + MatMenuContent, +} from '@angular/material/menu'; +import { MatTooltip } from '@angular/material/tooltip'; +import { ShortDateTimePipe } from '@pipes/short-date.pipe'; +import { JoinPipe } from '@pipes/join.pipe'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-scene-metadata', templateUrl: './scene-metadata.component.html', styleUrls: ['./scene-metadata.component.scss'], - standalone: false, + imports: [ + MatIcon, + MatMenuTrigger, + MatMenu, + MatMenuItem, + MatTooltip, + MatMenuContent, + UpperCasePipe, + ShortDateTimePipe, + JoinPipe, + TranslateModule, + ], }) export class SceneMetadataComponent implements OnInit, OnDestroy { prop = inject(PropertyService); diff --git a/src/app/components/shared/scene-metadata/scene-metadata.module.ts b/src/app/components/shared/scene-metadata/scene-metadata.module.ts deleted file mode 100644 index a9840514d..000000000 --- a/src/app/components/shared/scene-metadata/scene-metadata.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; - -import { MatMenuModule } from '@angular/material/menu'; -import { PipesModule } from '@pipes'; -import { MatSharedModule } from '@shared'; -import { SceneMetadataComponent } from './scene-metadata.component'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SceneMetadataComponent], - imports: [ - CommonModule, - MatSharedModule, - PipesModule, - MatMenuModule, - SharedModule, - ], - exports: [SceneMetadataComponent], -}) -export class SceneMetadataModule {} diff --git a/src/app/components/shared/search-button/search-button.component.ts b/src/app/components/shared/search-button/search-button.component.ts index af4c9c4df..a5e343f78 100644 --- a/src/app/components/shared/search-button/search-button.component.ts +++ b/src/app/components/shared/search-button/search-button.component.ts @@ -28,6 +28,23 @@ import { import { ApiLinkDialogComponent } from '../max-results-selector/api-link-dialog/api-link-dialog.component'; import { ScreenSizeService } from '@services'; import * as models from '@models'; +import { + NgStyle, + AsyncPipe, + UpperCasePipe, + TitleCasePipe, + KeyValuePipe, +} from '@angular/common'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { MatButton } from '@angular/material/button'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatDivider } from '@angular/material/list'; +import { TranslateModule } from '@ngx-translate/core'; // Declare GTM dataLayer array. declare global { @@ -40,7 +57,24 @@ declare global { selector: 'app-search-button', templateUrl: './search-button.component.html', styleUrls: ['./search-button.component.scss'], - standalone: false, + imports: [ + MatButtonToggleGroup, + MatButtonToggle, + MatButton, + MatMenuTrigger, + MatIcon, + NgStyle, + MatTooltip, + MatMenu, + MatMenuItem, + MatDivider, + + AsyncPipe, + UpperCasePipe, + TitleCasePipe, + KeyValuePipe, + TranslateModule, + ], }) export class SearchButtonComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/search-button/search-button.module.ts b/src/app/components/shared/search-button/search-button.module.ts deleted file mode 100644 index aef8b6024..000000000 --- a/src/app/components/shared/search-button/search-button.module.ts +++ /dev/null @@ -1,25 +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 { SearchButtonComponent } from './search-button.component'; -import { SaveSearchDialogModule } from '@components/shared/save-search-dialog'; -// import { CodeExportModule } from '@components/shared/code-export' -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SearchButtonComponent], - imports: [ - CommonModule, - MatSharedModule, - MatButtonToggleModule, - MatMenuModule, - SaveSearchDialogModule, - SharedModule, - // CodeExportModule - ], - exports: [SearchButtonComponent], -}) -export class SearchButtonModule {} diff --git a/src/app/components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component.ts b/src/app/components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component.ts index 8032dd114..41569469b 100644 --- a/src/app/components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component.ts +++ b/src/app/components/shared/selectors/baseline-frame-reference-toggle/baseline-frame-reference-toggle.component.ts @@ -1,5 +1,4 @@ import { Component, OnInit, inject } from '@angular/core'; -import { SharedModule } from '@shared'; import { beta } from '@models'; import * as filtersStore from '@store/filters'; import { AppState } from '@store'; @@ -7,10 +6,11 @@ import { Store } from '@ngrx/store'; import { MatSlideToggleModule } from '@angular/material/slide-toggle'; import { FormsModule } from '@angular/forms'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-baseline-frame-reference-toggle', - imports: [SharedModule, MatSlideToggleModule, FormsModule], + imports: [TranslateModule, MatSlideToggleModule, FormsModule], templateUrl: './baseline-frame-reference-toggle.component.html', styleUrl: './baseline-frame-reference-toggle.component.scss', }) diff --git a/src/app/components/shared/selectors/burst-selector/burst-selector.component.ts b/src/app/components/shared/selectors/burst-selector/burst-selector.component.ts index a3cf5513d..70eb0cb9c 100644 --- a/src/app/components/shared/selectors/burst-selector/burst-selector.component.ts +++ b/src/app/components/shared/selectors/burst-selector/burst-selector.component.ts @@ -1,9 +1,10 @@ import { Component } from '@angular/core'; +import { FullBurstSelectorComponent } from './full-burst-selector/full-burst-selector.component'; @Component({ selector: 'app-burst-selector', templateUrl: './burst-selector.component.html', styleUrls: ['./burst-selector.component.scss'], - standalone: false, + imports: [FullBurstSelectorComponent], }) export class BurstSelectorComponent {} diff --git a/src/app/components/shared/selectors/burst-selector/burst-selector.module.ts b/src/app/components/shared/selectors/burst-selector/burst-selector.module.ts deleted file mode 100644 index fd88abc88..000000000 --- a/src/app/components/shared/selectors/burst-selector/burst-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 { SharedModule } from '@shared'; - -import { BurstSelectorComponent } from './burst-selector.component'; - -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatExpansionModule } from '@angular/material/expansion'; -import { MatInputModule } from '@angular/material/input'; -import { MatSharedModule } from '@shared'; -import { FullBurstSelectorComponent } from './full-burst-selector/full-burst-selector.component'; -@NgModule({ - declarations: [BurstSelectorComponent, FullBurstSelectorComponent], - imports: [ - CommonModule, - MatFormFieldModule, - MatExpansionModule, - MatInputModule, - FormsModule, - MatSharedModule, - SharedModule, - ], - exports: [BurstSelectorComponent], -}) -export class BurstSelectorModule {} diff --git a/src/app/components/shared/selectors/burst-selector/full-burst-selector/full-burst-selector.component.ts b/src/app/components/shared/selectors/burst-selector/full-burst-selector/full-burst-selector.component.ts index ffd37bfee..14bb39416 100644 --- a/src/app/components/shared/selectors/burst-selector/full-burst-selector/full-burst-selector.component.ts +++ b/src/app/components/shared/selectors/burst-selector/full-burst-selector/full-burst-selector.component.ts @@ -13,6 +13,9 @@ import * as filtersStore from '@store/filters'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { SearchType } from '@models'; +import { AsyncPipe } from '@angular/common'; +import { MatFormField, MatLabel, MatInput } from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-full-burst-selector', templateUrl: './full-burst-selector.component.html', @@ -20,7 +23,7 @@ import { SearchType } from '@models'; './full-burst-selector.component.scss', '../burst-selector.component.scss', ], - standalone: false, + imports: [MatFormField, MatLabel, MatInput, AsyncPipe, TranslateModule], }) export class FullBurstSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/burst-selector/index.ts b/src/app/components/shared/selectors/burst-selector/index.ts index 911599e3a..07198048f 100644 --- a/src/app/components/shared/selectors/burst-selector/index.ts +++ b/src/app/components/shared/selectors/burst-selector/index.ts @@ -1,2 +1 @@ export * from './burst-selector.component'; -export * from './burst-selector.module'; diff --git a/src/app/components/shared/selectors/circle-slider/circle-slider.component.ts b/src/app/components/shared/selectors/circle-slider/circle-slider.component.ts index f94008563..fcac65d18 100644 --- a/src/app/components/shared/selectors/circle-slider/circle-slider.component.ts +++ b/src/app/components/shared/selectors/circle-slider/circle-slider.component.ts @@ -13,11 +13,15 @@ import * as d3 from 'd3'; import * as models from '@models'; import { ScreenSizeService } from '@services'; import { Subscription } from 'rxjs'; +import { MatMiniFabButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-circle-slider', templateUrl: './circle-slider.component.html', styleUrls: ['./circle-slider.component.scss'], - standalone: false, + imports: [MatMiniFabButton, MatTooltip, MatIcon, TranslateModule], }) export class CircleSliderComponent implements OnInit, OnChanges, OnDestroy { private screenSize = inject(ScreenSizeService); diff --git a/src/app/components/shared/selectors/circle-slider/circle-slider.module.ts b/src/app/components/shared/selectors/circle-slider/circle-slider.module.ts deleted file mode 100644 index 226757b04..000000000 --- a/src/app/components/shared/selectors/circle-slider/circle-slider.module.ts +++ /dev/null @@ -1,35 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { CircleSliderComponent } from './circle-slider.component'; - -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { MatIconModule } from '@angular/material/icon'; -import { MatButtonModule } from '@angular/material/button'; -import { MatSharedModule } from '@shared'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [CircleSliderComponent], - imports: [ - MatSharedModule, - CommonModule, - FormsModule, - ReactiveFormsModule, - MatDatepickerModule, - MatFormFieldModule, - MatInputModule, - MatSlideToggleModule, - MatSliderModule, - MatIconModule, - MatButtonModule, - SharedModule, - ], - exports: [CircleSliderComponent], -}) -export class CircleSliderModule {} diff --git a/src/app/components/shared/selectors/dataset-selector/dataset-selector.component.ts b/src/app/components/shared/selectors/dataset-selector/dataset-selector.component.ts index 355e56740..4e3a45823 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset-selector.component.ts +++ b/src/app/components/shared/selectors/dataset-selector/dataset-selector.component.ts @@ -9,8 +9,16 @@ import { import * as models from '@models'; import { ScreenSizeService } from '@services'; -import { MatMenuTrigger } from '@angular/material/menu'; +import { MatMenuTrigger, MatMenu, MatMenuItem } from '@angular/material/menu'; import { DateRange } from '@models'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { MatLabel } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatIcon } from '@angular/material/icon'; +import { MatCardActions } from '@angular/material/card'; +import { DocsModalComponent } from '../../docs-modal/docs-modal.component'; +import { TranslateModule } from '@ngx-translate/core'; // Declare GTM dataLayer array. declare global { @@ -23,7 +31,21 @@ declare global { selector: 'app-dataset-selector', templateUrl: './dataset-selector.component.html', styleUrls: ['./dataset-selector.component.scss'], - standalone: false, + imports: [ + MatLabel, + MatButton, + MatMenuTrigger, + MatMenu, + + MatMenuItem, + MatTooltip, + MatIcon, + NgClass, + MatCardActions, + DocsModalComponent, + AsyncPipe, + TranslateModule, + ], }) export class DatasetSelectorComponent { private screenSize = inject(ScreenSizeService); diff --git a/src/app/components/shared/selectors/dataset-selector/dataset-selector.module.ts b/src/app/components/shared/selectors/dataset-selector/dataset-selector.module.ts deleted file mode 100644 index 1ffea0777..000000000 --- a/src/app/components/shared/selectors/dataset-selector/dataset-selector.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; - -import { MatListModule } from '@angular/material/list'; -import { MatMenuModule } from '@angular/material/menu'; -import { MatSelectModule } from '@angular/material/select'; -import { MatSharedModule } from '@shared'; -import { DatasetSelectorComponent } from './dataset-selector.component'; -import { DatasetComponent } from './dataset/dataset.component'; -import { MatBadgeModule } from '@angular/material/badge'; -import { DocsModalModule } from '@components/shared/docs-modal'; -import { SharedModule } from '@shared'; - -@NgModule({ - imports: [ - CommonModule, - FormsModule, - FontAwesomeModule, - MatMenuModule, - MatSelectModule, - MatListModule, - MatSharedModule, - MatBadgeModule, - DocsModalModule, - SharedModule, - ], - declarations: [DatasetSelectorComponent, DatasetComponent], - exports: [DatasetSelectorComponent, DatasetComponent], -}) -export class DatasetSelectorModule {} diff --git a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.ts b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.ts index caaa87696..2d8fe7a88 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.ts +++ b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.ts @@ -3,12 +3,13 @@ import { Component, Input } from '@angular/core'; import { faInfoCircle } from '@fortawesome/free-solid-svg-icons'; import { Dataset, DateRange } from '@models'; +import { MatIcon } from '@angular/material/icon'; @Component({ selector: 'app-dataset', templateUrl: './dataset.component.html', styleUrls: ['./dataset.component.scss'], - standalone: false, + imports: [MatIcon], }) export class DatasetComponent { @Input() dataset: Dataset; diff --git a/src/app/components/shared/selectors/dataset-selector/index.ts b/src/app/components/shared/selectors/dataset-selector/index.ts deleted file mode 100644 index baa354d68..000000000 --- a/src/app/components/shared/selectors/dataset-selector/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dataset-selector.module'; diff --git a/src/app/components/shared/selectors/date-range/date-range.component.ts b/src/app/components/shared/selectors/date-range/date-range.component.ts index a1ca38ba4..636277216 100644 --- a/src/app/components/shared/selectors/date-range/date-range.component.ts +++ b/src/app/components/shared/selectors/date-range/date-range.component.ts @@ -11,20 +11,52 @@ import { Subject } from 'rxjs'; import { tap, delay, map } from 'rxjs/operators'; import moment from 'moment'; import { SubSink } from 'subsink'; -import { UntypedFormGroup, UntypedFormControl } from '@angular/forms'; -import { MatDatepickerInputEvent } from '@angular/material/datepicker'; +import { + UntypedFormGroup, + UntypedFormControl, + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; +import { + MatDatepickerInputEvent, + MatDatepickerInput, + MatDatepickerToggle, + MatDatepicker, +} from '@angular/material/datepicker'; import { DateAdapter } from '@angular/material/core'; import { NotificationService, ScreenSizeService } from '@services'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import * as uiStore from '@store/ui'; import * as models from '@models'; +import { NgClass } from '@angular/common'; +import { + MatFormField, + MatLabel, + MatInput, + MatHint, + MatSuffix, +} from '@angular/material/input'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-date-range', templateUrl: './date-range.component.html', styleUrls: ['./date-range.component.scss'], - standalone: false, + imports: [ + FormsModule, + ReactiveFormsModule, + NgClass, + MatFormField, + MatLabel, + MatInput, + MatDatepickerInput, + MatHint, + MatDatepickerToggle, + MatSuffix, + MatDatepicker, + TranslateModule, + ], }) export class DateRangeComponent implements OnInit, OnDestroy { private notificationService = inject(NotificationService); diff --git a/src/app/components/shared/selectors/date-range/date-range.module.ts b/src/app/components/shared/selectors/date-range/date-range.module.ts deleted file mode 100644 index 83478ebc2..000000000 --- a/src/app/components/shared/selectors/date-range/date-range.module.ts +++ /dev/null @@ -1,29 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { DateRangeComponent } from './date-range.component'; - -import { FormsModule, ReactiveFormsModule } from '@angular/forms'; - -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [DateRangeComponent], - imports: [ - CommonModule, - FormsModule, - ReactiveFormsModule, - MatDatepickerModule, - MatFormFieldModule, - MatInputModule, - MatSlideToggleModule, - MatSliderModule, - SharedModule, - ], - exports: [DateRangeComponent], -}) -export class DateRangeModule {} diff --git a/src/app/components/shared/selectors/date-selector/date-selector.component.ts b/src/app/components/shared/selectors/date-selector/date-selector.component.ts index dd564e9d8..d89d711ac 100644 --- a/src/app/components/shared/selectors/date-selector/date-selector.component.ts +++ b/src/app/components/shared/selectors/date-selector/date-selector.component.ts @@ -20,12 +20,18 @@ import * as searchStore from '@store/search'; import { DateRangeExtrema, SearchType } from '@models'; import { DateExtremaService } from '@services'; +import { DateRangeComponent } from '../date-range/date-range.component'; +import { AsyncPipe } from '@angular/common'; +import { MAT_MOMENT_DATE_ADAPTER_OPTIONS } from '@angular/material-moment-adapter'; @Component({ selector: 'app-date-selector', templateUrl: './date-selector.component.html', styleUrls: ['./date-selector.component.scss'], - standalone: false, + imports: [DateRangeComponent, AsyncPipe], + providers: [ + { provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }, + ], }) export class DateSelectorComponent implements OnInit, OnDestroy { private store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/date-selector/date-selector.module.ts b/src/app/components/shared/selectors/date-selector/date-selector.module.ts deleted file mode 100644 index 3a835b5f4..000000000 --- a/src/app/components/shared/selectors/date-selector/date-selector.module.ts +++ /dev/null @@ -1,40 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { MatDatepickerModule } from '@angular/material/datepicker'; -import { MatFormFieldModule } from '@angular/material/form-field'; -import { MatInputModule } from '@angular/material/input'; -import { MatSlideToggleModule } from '@angular/material/slide-toggle'; -import { MatSliderModule } from '@angular/material/slider'; -import { DateRangeModule } from '../date-range/date-range.module'; - -import { - MAT_MOMENT_DATE_ADAPTER_OPTIONS, - MatMomentDateModule, -} from '@angular/material-moment-adapter'; - -import { MatSharedModule } from '@shared'; -import { DateSelectorComponent } from './date-selector.component'; - -@NgModule({ - declarations: [DateSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatDatepickerModule, - MatMomentDateModule, - MatSlideToggleModule, - MatFormFieldModule, - MatInputModule, - MatSliderModule, - DateRangeModule, - - MatSharedModule, - ], - providers: [ - { provide: MAT_MOMENT_DATE_ADAPTER_OPTIONS, useValue: { useUtc: true } }, - ], - exports: [DateSelectorComponent], -}) -export class DateSelectorModule {} diff --git a/src/app/components/shared/selectors/date-selector/index.ts b/src/app/components/shared/selectors/date-selector/index.ts index a09f41466..2212ce28e 100644 --- a/src/app/components/shared/selectors/date-selector/index.ts +++ b/src/app/components/shared/selectors/date-selector/index.ts @@ -1,2 +1 @@ export * from './date-selector.component'; -export * from './date-selector.module'; diff --git a/src/app/components/shared/selectors/flight-direction-selector/flight-direction-selector.component.ts b/src/app/components/shared/selectors/flight-direction-selector/flight-direction-selector.component.ts index 1bcd5ba4e..2f8b4f165 100644 --- a/src/app/components/shared/selectors/flight-direction-selector/flight-direction-selector.component.ts +++ b/src/app/components/shared/selectors/flight-direction-selector/flight-direction-selector.component.ts @@ -1,7 +1,6 @@ import { Component, Input, inject } from '@angular/core'; import { MatOptionModule } from '@angular/material/core'; import { MatSelectModule } from '@angular/material/select'; -import { SharedModule } from '@shared'; import * as models from '@models'; import { MatFormFieldModule } from '@angular/material/form-field'; import { Store } from '@ngrx/store'; @@ -10,6 +9,7 @@ import { AppState } from '@store'; import * as filtersStore from '@store/filters'; import { PropertyService } from '@services'; import { AsyncPipe } from '@angular/common'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-flight-direction-selector', @@ -17,7 +17,7 @@ import { AsyncPipe } from '@angular/common'; MatSelectModule, MatOptionModule, MatFormFieldModule, - SharedModule, + TranslateModule, AsyncPipe, ], templateUrl: './flight-direction-selector.component.html', diff --git a/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.component.ts b/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.component.ts index 57f509337..cd2074bb3 100644 --- a/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.component.ts +++ b/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.component.ts @@ -1,16 +1,23 @@ import { Component, OnInit, inject } from '@angular/core'; -import { MatSelectChange } from '@angular/material/select'; +import { + MatSelectChange, + MatSelect, + MatOption, +} from '@angular/material/select'; import * as models from '@models'; import { Store } from '@ngrx/store'; import { AppState } from '@store'; import { getHyp3ProductTypes, SetHyp3ProductTypes } 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-hyp3-job-type-selector', templateUrl: './hyp3-job-type-selector.component.html', styleUrls: ['./hyp3-job-type-selector.component.scss'], - standalone: false, + imports: [MatFormField, MatSelect, MatOption, TranslateModule], }) export class Hyp3JobTypeSelectorComponent implements OnInit { store$ = inject>(Store); diff --git a/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.module.ts b/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.module.ts deleted file mode 100644 index 7653cc7f2..000000000 --- a/src/app/components/shared/selectors/hyp3-job-type-selector/hyp3-job-type-selector.module.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { MatCheckboxModule } from '@angular/material/checkbox'; -import { MatSelectModule } from '@angular/material/select'; -import { FormsModule } from '@angular/forms'; -import { SharedModule } from '@shared'; - -import { Hyp3JobTypeSelectorComponent } from './hyp3-job-type-selector.component'; - -@NgModule({ - declarations: [Hyp3JobTypeSelectorComponent], - imports: [ - CommonModule, - FormsModule, - MatCheckboxModule, - MatSelectModule, - SharedModule, - ], - exports: [Hyp3JobTypeSelectorComponent], -}) -export class Hyp3JobTypeSelectorModule {} 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.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.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.ts b/src/app/components/shared/selectors/mission-selector/mission-selector.component.ts index f97cd34d5..be3c7951a 100644 --- a/src/app/components/shared/selectors/mission-selector/mission-selector.component.ts +++ b/src/app/components/shared/selectors/mission-selector/mission-selector.component.ts @@ -1,5 +1,10 @@ import { Component, OnInit, OnDestroy, inject } from '@angular/core'; -import { UntypedFormBuilder, UntypedFormGroup } from '@angular/forms'; +import { + UntypedFormBuilder, + UntypedFormGroup, + FormsModule, + ReactiveFormsModule, +} from '@angular/forms'; import { startWith, map, tap } from 'rxjs/operators'; import { SubSink } from 'subsink'; @@ -9,6 +14,16 @@ import { AppState } from '@store'; import * as filtersStore from '@store/filters'; import * as models from '@models'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { MatIcon } from '@angular/material/icon'; +import { MatTooltip } from '@angular/material/tooltip'; +import { MatDivider, MatNavList, MatListItem } from '@angular/material/list'; +import { + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkVirtualForOf, +} from '@angular/cdk/scrolling'; +import { TranslateModule } from '@ngx-translate/core'; export interface StateGroup { letter: string; @@ -25,7 +40,22 @@ export const _filter = (opt: string[], value: string): string[] => { 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.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.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.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.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.ts b/src/app/components/shared/selectors/product-science-selector/product-science-selector.component.ts index aa76a8ec9..734f06824 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 { 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.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.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.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.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.ts b/src/app/components/shared/selectors/search-type-selector/search-type-selector.component.ts index cb0f81adf..10ee18f34 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'; @@ -20,7 +20,13 @@ import * as models from '@models'; import { 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, TitleCasePipe } 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,7 +39,22 @@ 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, + TitleCasePipe, + TranslateModule, + ], }) export class SearchTypeSelectorComponent implements OnInit, OnDestroy { translate = inject(TranslateService); 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.ts b/src/app/components/shared/selectors/season-selector/season-selector.component.ts index 5ecfae8f4..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); 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.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.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.ts b/src/app/components/sidebar/save-user-filters/save-user-filters.component.ts index 3bfc7877b..c5962552f 100644 --- a/src/app/components/sidebar/save-user-filters/save-user-filters.component.ts +++ b/src/app/components/sidebar/save-user-filters/save-user-filters.component.ts @@ -9,11 +9,22 @@ import * as models from '@models'; import { SubSink } from 'subsink'; import { map } from 'rxjs/operators'; import { ScreenSizeService } from '@services'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { SaveUserFilterComponent } from './save-user-filter/save-user-filter.component'; +import { MatButton } from '@angular/material/button'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-save-user-filters', templateUrl: './save-user-filters.component.html', styleUrls: ['./save-user-filters.component.scss'], - standalone: false, + imports: [ + NgClass, + + SaveUserFilterComponent, + MatButton, + AsyncPipe, + TranslateModule, + ], }) export class SaveUserFiltersComponent implements OnInit, OnDestroy { private store$ = inject>(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.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.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.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.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.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.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.ts b/src/app/components/sidebar/saved-searches/saved-searches.component.ts index 57ec33104..e82a26006 100644 --- a/src/app/components/sidebar/saved-searches/saved-searches.component.ts +++ b/src/app/components/sidebar/saved-searches/saved-searches.component.ts @@ -25,12 +25,35 @@ import { SaveSearchDialogComponent } from '@components/shared/save-search-dialog import * as models from '@models'; import { AsfLanguageService } from '@services/asf-language.service'; +import { NgClass, AsyncPipe } from '@angular/common'; +import { + MatButtonToggleGroup, + MatButtonToggle, +} from '@angular/material/button-toggle'; +import { FormsModule } from '@angular/forms'; +import { MatFormField, MatInput } from '@angular/material/input'; +import { MatButton } from '@angular/material/button'; +import { SavedSearchComponent } from './saved-search/saved-search.component'; +import { TranslateModule } from '@ngx-translate/core'; @Component({ selector: 'app-saved-searches', templateUrl: './saved-searches.component.html', styleUrls: ['./saved-searches.component.scss'], - standalone: false, + imports: [ + NgClass, + + MatButtonToggleGroup, + MatButtonToggle, + FormsModule, + MatFormField, + MatInput, + MatButton, + + SavedSearchComponent, + AsyncPipe, + TranslateModule, + ], }) export class SavedSearchesComponent implements OnInit, OnDestroy { private dialog = inject(MatDialog); diff --git a/src/app/components/sidebar/saved-searches/saved-searches.module.ts b/src/app/components/sidebar/saved-searches/saved-searches.module.ts deleted file mode 100644 index 9659c36b3..000000000 --- a/src/app/components/sidebar/saved-searches/saved-searches.module.ts +++ /dev/null @@ -1,33 +0,0 @@ -import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { FormsModule } from '@angular/forms'; - -import { PipesModule } from '@pipes'; -import { MatListModule } from '@angular/material/list'; -import { MatDialogModule } from '@angular/material/dialog'; -import { MatInputModule } from '@angular/material/input'; -import { MatButtonToggleModule } from '@angular/material/button-toggle'; -import { MatSharedModule } from '@shared'; - -import { SavedSearchesComponent } from './saved-searches.component'; -import { SavedSearchComponent } from './saved-search/saved-search.component'; -import { SearchFiltersModule } from './saved-search/search-filters'; -import { SharedModule } from '@shared'; - -@NgModule({ - declarations: [SavedSearchesComponent, SavedSearchComponent], - imports: [ - CommonModule, - FormsModule, - MatInputModule, - MatListModule, - MatDialogModule, - MatButtonToggleModule, - MatSharedModule, - PipesModule, - SearchFiltersModule, - SharedModule, - ], - exports: [SavedSearchesComponent], -}) -export class SavedSearchesModule {} 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-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 38ec9bf5e..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,7 +10,6 @@ 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'; @@ -25,7 +24,6 @@ import { ScreenSizeService } from '@services'; MatIconModule, MatButtonToggleModule, MatInputModule, - DocsModalModule, FormsModule, MatMenu, MatMenuItem, diff --git a/src/app/components/timeseries-chart/timeseries-chart.component.ts b/src/app/components/timeseries-chart/timeseries-chart.component.ts index 72f0678c9..33d510e28 100644 --- a/src/app/components/timeseries-chart/timeseries-chart.component.ts +++ b/src/app/components/timeseries-chart/timeseries-chart.component.ts @@ -30,12 +30,28 @@ import { SubSink } from 'subsink'; import { AsfLanguageService } from '@services/asf-language.service'; import { NetcdfService } from '@services'; import * as models from '@models'; -import { CdkVirtualScrollViewport } from '@angular/cdk/scrolling'; +import { + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkScrollable, +} from '@angular/cdk/scrolling'; import * as uiStore from '@store/ui'; // import {hidden} from '@services/map/polygon.style'; // import {style} from '@angular/animations'; import { linearRegression, linearRegressionLine } from './regression-line'; import { types } from 'sass'; +import { NgStyle } from '@angular/common'; +import { MatButton } from '@angular/material/button'; +import { ResizedDirective } from '../../directives/resized.directive'; +import { ContextMenuTriggerDirective } from '../../directives/context-menu.directive'; +import { TimeseriesChartExportComponent } from './timeseries-chart-export/timeseries-chart-export.component'; +import { ChartModalComponent } from '@components/shared/chart-modal/chart-modal.component'; +import { TimeseriesChartZoomComponent } from './timeseries-chart-zoom/timeseries-chart-zoom.component'; +import { MatProgressSpinner } from '@angular/material/progress-spinner'; +import { MatMenu, MatMenuContent } from '@angular/material/menu'; +import { TimeseriesChartTemporalSliderComponent } from './timeseries-chart-temporal-slider/timeseries-chart-temporal-slider.component'; +import { MatIcon } from '@angular/material/icon'; +import { TranslateModule } from '@ngx-translate/core'; interface TimeSeriesFit { seriesNumber: number; @@ -58,7 +74,25 @@ const unSelectedColor = '#9F9F9F9F'; templateUrl: './timeseries-chart.component.html', styleUrl: './timeseries-chart.component.scss', encapsulation: ViewEncapsulation.None, - standalone: false, + imports: [ + NgStyle, + MatButton, + CdkVirtualScrollViewport, + CdkFixedSizeVirtualScroll, + CdkScrollable, + + ResizedDirective, + ContextMenuTriggerDirective, + TimeseriesChartExportComponent, + ChartModalComponent, + TimeseriesChartZoomComponent, + MatProgressSpinner, + MatMenu, + MatMenuContent, + TimeseriesChartTemporalSliderComponent, + MatIcon, + TranslateModule, + ], }) export class TimeseriesChartComponent implements OnInit, OnDestroy { private store$ = inject>(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/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/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/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)); From 2653b985f9768eaee05c0259e2b45ada94d2ea07 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Wed, 17 Dec 2025 14:45:18 -0800 Subject: [PATCH 13/34] Andy/6335 (#2374) * DS-6335 Identifying GCOV (Geocoded Polarimetric Covariance) as the recommended product in the NISAR Science Filters * DS-6335 Sci-Prod Recommended Made text more readable in Dark Mode * npm run lint -- --fix --- .../product-science-selector.component.html | 9 +++---- .../product-science-selector.component.scss | 3 +++ .../product-science-selector.component.ts | 5 +++- src/karma.conf.js | 24 +++++++++---------- 4 files changed, 24 insertions(+), 17 deletions(-) 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 3df3a4dd0..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,15 +17,16 @@ class="sci-prod-optgroup" > @for (sciProd of group.sciProd; track sciProd) { - {{ - sciProd.viewValue - }} + {{ sciProd.viewValue }} } } } - *{{ 'RECOMMENDED_PRODUCT' | translate }} + *{{ '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 93a1d3b1d..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; 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 734f06824..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 @@ -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/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: '', }); }; From 478b6f4c63c86a0c4a0e796fd18b9d8fb61f25d6 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 19 Dec 2025 15:41:22 -0800 Subject: [PATCH 14/34] Revamped William's Pull Request for Changing On Demand Job Names (#2375) * Add ability to update a jobs project name * fix: formatting * Add ability to nuke all loaded jobs * Make Help more easily seen on Filter's panel. * DS-6336 Text modified to be translatable. * Lint space * feat: Update to use jobs patch endpoint * Update src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Round 1 of revamping the UI * Fix console error related to translation. * Bulk rename uses new dialog * npm run lint -- --fix * On Demand search reloads after bulk rename * npm run lint -- --fix * Resolving issues from merging with test * Snackbar message for renaming jobs * Adding multi-lingual support to rename dialog And a few other UI tweaks. * Edit Validation Added checks for empty project name entry or only spaces. Also validate that the jobs were successfully renamed and provided error handling. Will provide error notification with toast. * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/app/store/scenes/scenes.action.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix for flight direction graphics not appearing in Displacement I think this is an unreported bug resulting from the recent Angular upgrade. * Show projects that are going to be renamed with the bulk operation. * Update uniqueProjectNames filtering * Fix: update job count in dialog * Fix single job rename * Many Changes * Added list of projects and associated job counts in a sortable table * Limited project name input to 100 characters * Prevent user from changing names of projects for other users * Progress Bar I've implemented a two-phase dialog that handles the rename operation internally with a determinate progress bar. * Deterministic Progress Bar The Project Rename dialog box now is augmented with a couple more screens indicating renaming progress and completion. * UI Improvements * Auto-focus the input field * Show the new name in the confirmation message * Show specific project names if failed I've implemented the feature to show which specific project names failed to rename in the completion phase. * Show Time Estimate for Bulk Rename Completion I've implemented the estimated time remaining feature for large batch rename operations. Here's what was added: How it works: The estimated time is calculated based on the elapsed time and number of completed batches It only displays for operations with 1000+ jobs (to avoid showing for small, quick operations) The time is displayed in a user-friendly format (e.g., "< 1 min", "~1 min", "~5 min") * Project Rename Title Updated Updated the table to William's suggestions. * npm run lint -- --fix * Update src/app/store/scenes/scenes.action.ts Co-authored-by: William Horn * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: William Horn * Created three named interfaces at the top of hyp3-api.service.ts * RenameProgressInfo - Progress info with percent and estimated time remaining * RenameResult - Final result with success/failed counts and failed project names *RenameWithProgressResult - The composite return type containing both observables I also changed a 'sneaky' 3 into a constant * Update src/app/components/shared/project-name-dialog/project-name-dialog.component.ts Co-authored-by: William Horn * Tyler Suggestions Fixed - Red toast regression Fixed - Missing unnamed projects * Tyler Suggestions #2 Fixed - Empty string validation feedback Fixed - Checkbox disclaimer with empty string * Tyler Suggestions #3 Fixed - Remove dialog service abstraction Fixed - Convert getter to signal/computed * Tyler Suggestions #4 Fixed - Use SubSink pattern consistently Fixed - Moved constructor logic to ngOnInit * Tyler Suggestions #5 Fixed - Material Table with Sorting in-place Reviewing the idea of using the Material Stepper consideration, I don't think it is a good fit. The phases are not user-navigated steps, they're system-driven and there is no option for backward navigation. * npm run lint -- --fix * Conformity & Best Practices #2 - Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * Conformity & Best Practices * Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * npm run lint -- --fix * Made the table header 'sticky' * Fixed Table Header for Dark-Theme * Show estimated time for 5+ jobs It was 1000+ before but Tools wants to see it always. * Warn about Abort I added a @HostListener for the window:beforeunload event that triggers only when the dialog is in the processing phase. This will: - Show the browser's native "Leave site?" confirmation dialog when the user tries to close the tab/window or navigate away - Only trigger during the processing phase - users can freely close during input, complete, or error phases - Let the browser handle the UI (modern browsers don't allow custom messages for security reasons) --------- Co-authored-by: William Horn Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .gitignore | 1 + .../timeseries-header.component.html | 6 +- .../scene-file/scene-file.component.html | 6 + .../scene-file/scene-file.component.ts | 26 ++ .../scene-files/scene-files.component.html | 4 + .../scene-files/scene-files.component.ts | 14 + .../scenes-list-header.component.html | 35 +++ .../scenes-list-header.component.ts | 40 +++ .../shared/project-name-dialog/index.ts | 5 + .../project-name-dialog.component.html | 222 ++++++++++++++ .../project-name-dialog.component.scss | 188 ++++++++++++ .../project-name-dialog.component.ts | 272 ++++++++++++++++++ src/app/services/hyp3/hyp3-api.service.ts | 140 ++++++++- src/app/services/hyp3/hyp3-job.service.ts | 2 +- src/app/services/notification.service.ts | 2 + src/app/store/scenes/scenes.action.ts | 8 + src/app/store/scenes/scenes.reducer.ts | 20 ++ src/assets/i18n/de.json | 23 ++ src/assets/i18n/en.json | 23 ++ src/assets/i18n/es.json | 23 ++ 20 files changed, 1055 insertions(+), 5 deletions(-) create mode 100644 src/app/components/shared/project-name-dialog/index.ts create mode 100644 src/app/components/shared/project-name-dialog/project-name-dialog.component.html create mode 100644 src/app/components/shared/project-name-dialog/project-name-dialog.component.scss create mode 100644 src/app/components/shared/project-name-dialog/project-name-dialog.component.ts diff --git a/.gitignore b/.gitignore index 1dc9b1154..d8cb675af 100644 --- a/.gitignore +++ b/.gitignore @@ -45,3 +45,4 @@ local-serve.sh # Claude Code .claude/ CLAUDE.md +TRANSLATIONS_SCRATCH.md 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 88b167654..49bdff026 100644 --- a/src/app/components/header/timeseries-header/timeseries-header.component.html +++ b/src/app/components/header/timeseries-header/timeseries-header.component.html @@ -16,7 +16,7 @@ class="invert-icon" alt="Azimuth" height="65" - width="auto" + width="65" /> } @if (flightDesc) { @@ -25,7 +25,7 @@ class="invert-icon" alt="Azimuth" height="65" - width="auto" + width="65" /> } @@ -45,7 +45,7 @@ [class.flip-icon]="flightDesc" alt="Line of Site" height="70" - width="auto" + width="84" /> 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 fff76914b..21b8b2867 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 @@ -151,6 +151,12 @@
{{ 'PROJECT_NAME' | translate }}: {{ product.metadata.job.name }} +
} 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 64e46c382..6f87995e0 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 @@ -43,6 +43,11 @@ import { 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'; @@ -87,6 +92,7 @@ export class SceneFileComponent implements OnInit, OnDestroy { private store$ = inject>(Store); env = inject(EnvironmentService); private onDemand = inject(OnDemandService); + private dialog = inject(MatDialog); @Input() product: models.CMRProduct; @Input() isQueued: boolean; @@ -102,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; @@ -209,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(); 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 0eefa4efb..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 @@ -19,6 +19,7 @@ (toggle)="onToggleQueueProduct(product)" (unzip)="onOpenUnzipProduct($event)" (queueHyp3Job)="onQueueHyp3Job($event)" + (renameJobProjectName)="onRenameJobProjectName(product, $event)" [loadingHyp3JobName]="loadingHyp3JobName" [isUserLoggedIn]="isUserLoggedIn" [product]="product" @@ -35,6 +36,7 @@ (toggle)="onToggleQueueProduct(product)" (unzip)="onOpenUnzipProduct($event)" (queueHyp3Job)="onQueueHyp3Job($event)" + (renameJobProjectName)="onRenameJobProjectName(product, $event)" [loadingHyp3JobName]="loadingHyp3JobName" [isUserLoggedIn]="isUserLoggedIn" [product]="product" @@ -149,6 +151,7 @@ (unzip)="onOpenUnzipProduct($event)" (closeProduct)="onCloseProduct($event)" (queueHyp3Job)="onQueueHyp3Job($event)" + (renameJobProjectName)="onRenameJobProjectName(product, $event)" [isUserLoggedIn]="isUserLoggedIn" [product]="product" [validHyp3JobTypes]="validJobTypesByProduct[product.id]" @@ -171,6 +174,7 @@ (unzip)="onOpenUnzipProduct($event)" (closeProduct)="onCloseProduct($event)" (queueHyp3Job)="onQueueHyp3Job($event)" + (renameJobProjectName)="onRenameJobProjectName(product, $event)" [isUserLoggedIn]="isUserLoggedIn" [product]="product" [loadingHyp3JobName]="loadingHyp3JobName" 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 3f3cfe6d9..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 @@ -365,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/scenes-list-header/scenes-list-header.component.html b/src/app/components/results-menu/scenes-list-header/scenes-list-header.component.html index b25b79023..94a5cd52c 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 @@ -310,6 +310,41 @@
+
+
+ +
+
+
+ + + edit + + +
+
+
+ + +
+ +
+ } @if (searchType === SearchTypes.BASELINE) {
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 776de5345..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,6 +44,11 @@ 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, @@ -678,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/shared/project-name-dialog/index.ts b/src/app/components/shared/project-name-dialog/index.ts new file mode 100644 index 000000000..c6526b119 --- /dev/null +++ b/src/app/components/shared/project-name-dialog/index.ts @@ -0,0 +1,5 @@ +export { + ProjectNameDialogComponent, + ProjectNameDialogData, + ProjectNameDialogResult, +} from './project-name-dialog.component'; diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html new file mode 100644 index 000000000..2f278b3b3 --- /dev/null +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html @@ -0,0 +1,222 @@ + +@if (phase === 'input') { +
+

+ {{ + (jobCount > 1 ? 'EDIT_ALL_PROJECT_NAMES' : 'EDIT_PROJECT_NAME') + | translate + }} +

+ @if (isDisabledByUserFilter) { +

+ {{ 'CANNOT_RENAME_PROJECTS_FOR' | translate }}: {{ filterUserId }} +

+ } +
+ +
+ + + {{ 'PROJECT_NAME' | translate }} + + {{ projectName()?.length || 0 }}/100 + @if (!projectName()?.trim()) { + {{ 'PROJECT_NAME_REQUIRED' | translate }} + } @else if (projectName()?.length >= 100) { + {{ 'PROJECT_NAME_MAX_LENGTH' | translate }} + } + + + @if (dataSource.data.length > 0) { +

+ {{ 'PROJECTS_SELECTED' | translate }} +

+
+ + + + + + + + + + + + + + + +
+ {{ 'PROJECT_NAME' | translate }} + {{ entry.name }} + {{ 'JOBS' | translate }} + + {{ entry.count }} +
+
+ + @if (!isDisabledByUserFilter && isValid()) { + + {{ + (projectCount === 1 + ? 'CONFIRM_RENAME_SINGLE' + : 'CONFIRM_RENAME_MULTIPLE' + ) + | translate + : { + projectCount: projectCount, + jobCount: jobCount, + newName: projectName()?.trim(), + } + }} + + } + } + + + + + + +
+} + + +@if (phase === 'processing') { +
+

{{ 'RENAMING_JOBS' | translate }}

+
+ + +
+ +

{{ progress }}%

+ @if (formattedTimeRemaining()) { +

+ {{ 'ESTIMATED_TIME_REMAINING' | translate }}: + {{ formattedTimeRemaining() }} +

+ } +
+ + + + + +} + + +@if (phase === 'complete') { +
+

{{ 'RENAME_COMPLETE' | translate }}

+
+ + +
+ @if (failedCount === 0) { +

+ {{ 'RENAME_SUCCESS' | translate: { count: successCount } }} +

+ } @else if (successCount === 0) { +

+ {{ 'RENAME_ALL_FAILED' | translate: { count: failedCount } }} +

+ } @else { +

+ {{ + 'RENAME_PARTIAL_SUCCESS' + | translate: { success: successCount, failed: failedCount } + }} +

+ } + + @if (failedProjectNames.length > 0) { +
+

+ {{ 'FAILED_PROJECTS' | translate }}: +

+
    + @for (name of failedProjectNames; track $index) { +
  • {{ name }}
    • + } +
+
+ } +
+ + + + + +} + + +@if (phase === 'error') { +
+

{{ 'ERROR' | translate }}

+
+ + +
+

+ {{ 'RENAME_ERROR' | translate }} +

+
+ + + + + +} diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss b/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss new file mode 100644 index 000000000..946a24eb5 --- /dev/null +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss @@ -0,0 +1,188 @@ +// Scoped to this dialog to prevent global style pollution +// since ViewEncapsulation.None is used +app-project-name-dialog { + .mat-mdc-dialog-title { + padding-top: 24px !important; + + &::before { + display: none; + } + } + + .dialog-title { + margin: 0; + } + + .dialog-subtitle { + margin: 4px 0 0 0; + opacity: 0.7; + font-size: 14px; + + &.job-count-warning, + &.cannot-rename-warning { + color: #f44336; + opacity: 1; + font-weight: 500; + } + } + + .project-name-field { + width: 100%; + + .mat-mdc-text-field-wrapper { + padding-top: 0; + } + } + + .projects-label { + margin: 16px 0 8px 0; + opacity: 0.7; + font-size: 14px; + + &.bold { + font-weight: 500; + opacity: 1; + } + } + + .projects-table-wrapper { + border: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 4px; + margin-bottom: 8px; + overflow: hidden; + + &.scrollable { + max-height: 220px; + overflow-y: auto; + } + } + + .projects-table { + width: 100%; + + // Sticky header so it stays visible while scrolling + th.mat-mdc-header-cell { + position: sticky; + top: 0; + z-index: 1; + // Default light theme background + background-color: white; + + // Dark theme background + .theme-dark & { + background-color: #424242; + } + } + + .job-count-header, + .job-count-cell { + text-align: right; + width: 80px; + } + } + + // Confirmation checkbox + .confirmation-checkbox { + display: block; + margin-top: 32px; + + .mdc-form-field { + align-items: flex-start; + } + + .mdc-checkbox { + margin-top: -9px; + + .mdc-checkbox__ripple, + .mat-mdc-checkbox-ripple { + display: none; + } + } + } + + // Progress bar styles + .progress-container { + text-align: center; + padding: 24px 0; + + mat-progress-bar { + margin-bottom: 16px; + } + + .progress-text { + margin: 0; + font-size: 18px; + font-weight: 500; + } + + .estimated-time { + margin: 8px 0 0 0; + font-size: 13px; + opacity: 0.7; + } + } + + // Result styles + .result-container { + text-align: center; + padding: 16px 0; + + p { + margin: 0; + font-size: 14px; + } + + .result-success { + color: #4caf50; + } + + .result-warning { + color: #ff9800; + } + + .result-error { + color: #f44336; + } + } + + // Failed projects list + .failed-projects { + margin-top: 16px; + text-align: left; + + .failed-projects-label { + font-size: 14px; + font-weight: 500; + color: #f44336; + margin-bottom: 8px; + } + + .failed-projects-list { + margin: 0; + padding-left: 20px; + font-size: 13px; + border: 1px solid rgba(0, 0, 0, 0.12); + border-radius: 4px; + padding: 8px 8px 8px 28px; + + &.scrollable { + max-height: 120px; + overflow-y: auto; + } + + li { + padding: 2px 0; + } + } + } +} + +// Remove underline from sort header - must be outside app-project-name-dialog +// scope because dialog content renders in CDK overlay. +// The underline appears on keyboard/program focused states. +.projects-table { + [mat-sort-header].cdk-keyboard-focused .mat-sort-header-container, + [mat-sort-header].cdk-program-focused .mat-sort-header-container { + border-bottom: none; + } +} diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts b/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts new file mode 100644 index 000000000..f0fd90c57 --- /dev/null +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts @@ -0,0 +1,272 @@ +import { + Component, + inject, + AfterViewInit, + ViewChild, + ElementRef, + OnDestroy, + OnInit, + signal, + computed, + ViewEncapsulation, + HostListener, +} from '@angular/core'; +import { FormsModule } from '@angular/forms'; +import { + MatDialogRef, + MAT_DIALOG_DATA, + MatDialogTitle, + MatDialogContent, + MatDialogActions, +} from '@angular/material/dialog'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; +import { MatButtonModule } from '@angular/material/button'; +import { MatProgressBarModule } from '@angular/material/progress-bar'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { + MatTableDataSource, + MatTable, + MatColumnDef, + MatHeaderCellDef, + MatHeaderCell, + MatCellDef, + MatCell, + MatHeaderRowDef, + MatHeaderRow, + MatRowDef, + MatRow, +} from '@angular/material/table'; +import { MatSort, MatSortModule } from '@angular/material/sort'; +import { TranslateModule, TranslateService } from '@ngx-translate/core'; +import { SubSink } from 'subsink'; + +import * as models from '@models'; +import { Hyp3ApiService } from '@services'; + +export interface ProjectEntry { + name: string; + count: number; +} + +export type DialogPhase = 'input' | 'processing' | 'complete' | 'error'; + +export interface ProjectNameDialogData { + currentName: string; + products?: models.CMRProduct[]; + loggedInUserId?: string; + filterUserId?: string; +} + +export interface ProjectNameDialogResult { + newName: string; + success: number; + failed: number; +} + +@Component({ + selector: 'app-project-name-dialog', + templateUrl: './project-name-dialog.component.html', + styleUrls: ['./project-name-dialog.component.scss'], + standalone: true, + encapsulation: ViewEncapsulation.None, + imports: [ + FormsModule, + MatDialogTitle, + MatDialogContent, + MatDialogActions, + MatFormFieldModule, + MatInputModule, + MatButtonModule, + MatProgressBarModule, + MatCheckboxModule, + MatTable, + MatSortModule, + MatColumnDef, + MatHeaderCellDef, + MatHeaderCell, + MatCellDef, + MatCell, + MatHeaderRowDef, + MatHeaderRow, + MatRowDef, + MatRow, + TranslateModule, + ], +}) +export class ProjectNameDialogComponent + implements OnInit, AfterViewInit, OnDestroy +{ + @ViewChild('projectNameInput') projectNameInput: ElementRef; + @ViewChild(MatSort) sort: MatSort; + + private dialogRef = + inject>(MatDialogRef); + private data = inject(MAT_DIALOG_DATA); + private hyp3Api = inject(Hyp3ApiService); + private translateService = inject(TranslateService); + + // Use signals for reactive state + public projectName = signal(''); + public jobCount: number | null = null; + public projectCount = 0; + public isDisabledByUserFilter = false; + public filterUserId: string; + public confirmationChecked = false; + + // Material table with sorting + public dataSource = new MatTableDataSource([]); + public readonly displayedColumns: string[] = ['name', 'count']; + + // Two-phase UI state + public phase: DialogPhase = 'input'; + public progress = 0; + public estimatedSecondsRemaining = signal(null); + public successCount = 0; + public failedCount = 0; + public failedProjectNames: string[] = []; + + // Computed values (only recalculate when dependencies change) + public isValid = computed(() => this.projectName().trim().length > 0); + + public formattedTimeRemaining = computed(() => { + // Only show estimated time for operations of 5+ jobs + if (this.jobCount < 5 || this.estimatedSecondsRemaining() === null) { + return null; + } + + const seconds = this.estimatedSecondsRemaining(); + if (seconds < 60) { + return `< 1 min`; + } + + const minutes = Math.ceil(seconds / 60); + return `~${minutes} min`; + }); + + private subs = new SubSink(); + + ngOnInit(): void { + this.projectName.set(this.data.currentName); + + // Disable input if filtering by a different user's jobs + const { loggedInUserId, filterUserId } = this.data; + this.filterUserId = filterUserId; + if (filterUserId && loggedInUserId && filterUserId !== loggedInUserId) { + this.isDisabledByUserFilter = true; + } + + const products = this.data?.products; + this.jobCount = products?.length; + + if (products) { + const unnamedLabel = this.translateService.instant( + 'PROJECT_NAME_UNNAMED', + ); + const counts = new Map(); + products.forEach((product) => { + const name = product.metadata?.job?.name || unnamedLabel; + counts.set(name, (counts.get(name) || 0) + 1); + }); + + // Convert to array for Material table + const entries: ProjectEntry[] = Array.from(counts.entries()).map( + ([name, count]) => ({ name, count }), + ); + this.dataSource.data = entries; + this.projectCount = counts.size; + } + + // Prevent closing during processing + this.dialogRef.disableClose = false; + } + + ngAfterViewInit(): void { + // Connect MatSort to dataSource for automatic sorting + if (this.sort) { + this.dataSource.sort = this.sort; + } + + // Auto-focus the input field after the view is initialized + setTimeout(() => { + if (this.projectNameInput && !this.isDisabledByUserFilter) { + this.projectNameInput.nativeElement.focus(); + } + }); + } + + public onCancel(): void { + this.dialogRef.close(); + } + + public onSave(): void { + if (!this.isValid()) { + return; + } + + const trimmedName = this.projectName().trim(); + + // If no products, just return the name (single-file rename flow) + if (!this.data.products || this.data.products.length === 0) { + this.dialogRef.close(trimmedName); + return; + } + + // Transition to processing phase for bulk rename + this.phase = 'processing'; + this.dialogRef.disableClose = true; + this.progress = 0; + + const { progress$, result$ } = this.hyp3Api.updateJobsNameWithProgress$( + this.data.products, + trimmedName, + ); + + // Subscribe to progress updates + this.subs.add( + progress$.subscribe(({ percent, estimatedSecondsRemaining }) => { + this.progress = percent; + this.estimatedSecondsRemaining.set(estimatedSecondsRemaining); + }), + ); + + // Subscribe to final result + this.subs.add( + result$.subscribe({ + next: ({ success, failed, failedProjectNames }) => { + this.successCount = success; + this.failedCount = failed; + this.failedProjectNames = failedProjectNames; + this.phase = 'complete'; + this.dialogRef.disableClose = false; + }, + error: () => { + this.phase = 'error'; + this.dialogRef.disableClose = false; + }, + }), + ); + } + + public onDone(): void { + const result: ProjectNameDialogResult = { + newName: this.projectName().trim(), + success: this.successCount, + failed: this.failedCount, + }; + this.dialogRef.close(result); + } + + @HostListener('window:beforeunload', ['$event']) + onBeforeUnload(event: BeforeUnloadEvent): void { + if (this.phase === 'processing') { + event.preventDefault(); + // Modern browsers ignore custom messages, but returnValue is still required + event.returnValue = ''; + } + } + + ngOnDestroy(): void { + this.subs.unsubscribe(); + } +} 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/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/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/i18n/de.json b/src/assets/i18n/de.json index b40865ea1..710f679de 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", @@ -590,6 +606,13 @@ "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_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 44a83788e..b88ab00a2 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -123,6 +123,9 @@ "CAMPAIGN_SELECTOR": "Campaign Selector", "CANADAS_OPEN_LICENSE": "Canada's Open Government License", "CANCEL": "Cancel", + "CANNOT_RENAME_PROJECTS_FOR": "You cannot rename projects for", + "CONFIRM_RENAME_MULTIPLE": "Yes! I really want to rename these {{projectCount}} projects ({{jobCount}} jobs) to \"{{newName}}\".", + "CONFIRM_RENAME_SINGLE": "Yes! I really want to rename this 1 project ({{jobCount}} jobs) to \"{{newName}}\".", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(center column) and Files column (right) will populate.", "CHARACTERS": "characters", "CHART": "Chart", @@ -283,12 +286,16 @@ "EDIT_FILTERS": "Edit Filters", "EDIT_LIST": "Edit List", "EDIT_NAME": "Edit name", + "EDIT_ALL_PROJECT_NAMES": "Edit All Project Names", + "EDIT_PROJECT_NAME": "Edit Project Name", "EMAIL": "email", "END": "End", "END_DATE": "End Date", "ENTER_A_NAME_FOR_YOUR_SEARCH_IN_THE_SAVE_SEARCH_DIALOG": "Enter a name for your search in the Save Search dialog.", "ENVIRONMENT_FILE": "Environment File", "EQUATORIAL_MAP_VIEW": "Equatorial Map View", + "ERROR": "Error", + "ESTIMATED_TIME_REMAINING": "Estimated time remaining", "ERS_DESC": "Primarily SAR imagery within the ASF and the McMurdo, Antarctica, station masks. Data is suitable for interferometry.", "EVENT": "Event", "EVENT_DATE": "Event Date", @@ -307,6 +314,7 @@ "EXPORT_API": "Export API", "EXPORT_PYTHON": "Export Python", "FAILED": "Failed", + "FAILED_PROJECTS": "Failed projects", "FALSE": "},false);", "FARADAY_ROTATION": "Faraday Rotation", "FEEDBACK": " Feedback", @@ -666,7 +674,15 @@ "PRODUCTS_IN_YOUR_QUEUE_MAY_REQUIRE_A_RESTRICTED_DATASET_AGREEMENT": "Products in your queue may require a restricted dataset agreement.", "PRODUCTS_TO_DOWNLOADS_FROM_SELECTED_EVENT": "products to downloads from selected event", "PROFILE": "Profile", + "PROJECT": "Project", "PROJECT_NAME": "Project Name", + "PROJECT_NAME_MAX_LENGTH": "Project name cannot exceed 100 characters", + "PROJECT_NAME_REQUIRED": "Project name is required", + "PROJECT_NAME_UNNAMED": "(unnamed)", + "PROJECT_NAME_UPDATE_ALL_TOOLTIP": "Update project name for all loaded jobs", + "PROJECT_NAME_UPDATE_FOR_JOBS": "Update project name for {{count}} jobs", + "PROJECTS_SELECTED": "Projects Selected", + "PROJECTS_TO_RENAME": "Projects to rename:", "PUSH_PIN": "push_pin", "PYTHON_PY": "python (.py)", "QUAKE": "quake", @@ -709,6 +725,13 @@ "RESTRICTED_DATA_USE_AGREEMENT": "Restricted Data Use Agreement", "RESUBMIT_JOB": "Resubmit Job", "RESUBMIT_PROJECT": "Resubmit Project", + "RENAME_ALL_FAILED": "Failed to rename {{count}} job(s).", + "RENAME_COMPLETE": "Rename Complete", + "RENAME_ERROR": "An error occurred while renaming jobs.", + "RENAME_PARTIAL_SUCCESS": "Renamed {{success}} job(s). {{failed}} failed.", + "RENAME_SUCCESS": "Successfully renamed {{count}} job(s).", + "RENAMING_JOBS": "Renaming jobs...", + "WILL_RENAME_JOBS": "This will rename {{count}} job(s).", "RESULTS_TO_ON_DEMAND_QUEUE": "results to On Demand queue", "RESULTS_WILL_NOW_CONTAIN_ONLY_SCENES_WITH_THE_SAME_PATH_AND_FRAME": "results will now contain only scenes with the same path and frame.", "REVIEW": "Review", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index c103dffd9..ba4d9b069 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -123,6 +123,9 @@ "CAMPAIGN_SELECTOR": "Selector de Campaña", "CANADAS_OPEN_LICENSE": "Licencia de Gobierno Abierto de Canadá", "CANCEL": "Cancelar", + "CANNOT_RENAME_PROJECTS_FOR": "No puede cambiar el nombre de los proyectos de", + "CONFIRM_RENAME_MULTIPLE": "¡Sí! Realmente quiero renombrar estos {{projectCount}} proyectos ({{jobCount}} trabajos) a \"{{newName}}\".", + "CONFIRM_RENAME_SINGLE": "¡Sí! Realmente quiero renombrar este 1 proyecto ({{jobCount}} trabajos) a \"{{newName}}\".", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(columna central) y la columna Archivos (derecha) se completarán.", "CHARACTERS": "caracteres", "CHART": "Gráfico", @@ -283,12 +286,16 @@ "EDIT_FILTERS": "Editar filtros", "EDIT_LIST": "Lista de edición", "EDIT_NAME": "Editar nombre", + "EDIT_ALL_PROJECT_NAMES": "Editar Todos los Nombres de Proyecto", + "EDIT_PROJECT_NAME": "Editar Nombre del Proyecto", "EMAIL": "correo electrónico", "END": "Fin", "END_DATE": "Fecha Final", "ENTER_A_NAME_FOR_YOUR_SEARCH_IN_THE_SAVE_SEARCH_DIALOG": "Ingrese un nombre para su búsqueda en el cuadro de diálogo Guardar búsqueda.", "ENVIRONMENT_FILE": "Archivo de entorno", "EQUATORIAL_MAP_VIEW": "Ver Mapa Ecuatorial", + "ERROR": "Error", + "ESTIMATED_TIME_REMAINING": "Tiempo restante estimado", "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.", "EVENT": "Evento", "EVENT_DATE": "Fecha del evento", @@ -307,6 +314,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", @@ -667,7 +675,15 @@ "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_MAX_LENGTH": "El nombre del proyecto no puede exceder 100 caracteres", + "PROJECT_NAME_REQUIRED": "El nombre del proyecto es obligatorio", + "PROJECT_NAME_UNNAMED": "(sin nombre)", + "PROJECT_NAME_UPDATE_ALL_TOOLTIP": "Actualizar nombre del proyecto para todos los trabajos cargados", + "PROJECT_NAME_UPDATE_FOR_JOBS": "Actualizar nombre del proyecto para {{count}} trabajos", + "PROJECTS_SELECTED": "Proyectos Seleccionados", + "PROJECTS_TO_RENAME": "Proyectos a renombrar:", "PUSH_PIN": "chincheta", "PYTHON_PY": "python (.py)", "QUAKE": "terremoto", @@ -710,6 +726,13 @@ "RESTRICTED_DATA_USE_AGREEMENT": "Acuerdo de Uso de Datos Restringidos", "RESUBMIT_JOB": "Reenviar trabajo", "RESUBMIT_PROJECT": "Reenviar Proyecto", + "RENAME_ALL_FAILED": "Error al renombrar {{count}} trabajo(s).", + "RENAME_COMPLETE": "Cambio de nombre completado", + "RENAME_ERROR": "Ocurrió un error al renombrar los trabajos.", + "RENAME_PARTIAL_SUCCESS": "Se renombraron {{success}} trabajo(s). {{failed}} fallaron.", + "RENAME_SUCCESS": "Se renombraron {{count}} trabajo(s) exitosamente.", + "RENAMING_JOBS": "Renombrando trabajos...", + "WILL_RENAME_JOBS": "Se renombrarán {{count}} trabajo(s).", "RESULTS_TO_ON_DEMAND_QUEUE": "resultados a la lista On Demand", "RESULTS_WILL_NOW_CONTAIN_ONLY_SCENES_WITH_THE_SAME_PATH_AND_FRAME": "los resultados ahora contendrán solo escenas con la misma ruta y marco.", "REVIEW": "Revisar", From f3ab1832d1332fea0bd29aa1eee7fa550706457b Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Tue, 6 Jan 2026 10:15:06 -0800 Subject: [PATCH 15/34] Andy/radio button toggle (#2378) * Add ability to update a jobs project name * fix: formatting * Add ability to nuke all loaded jobs * Make Help more easily seen on Filter's panel. * DS-6336 Text modified to be translatable. * Lint space * feat: Update to use jobs patch endpoint * Update src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Round 1 of revamping the UI * Fix console error related to translation. * Bulk rename uses new dialog * npm run lint -- --fix * On Demand search reloads after bulk rename * npm run lint -- --fix * Resolving issues from merging with test * Snackbar message for renaming jobs * Adding multi-lingual support to rename dialog And a few other UI tweaks. * Edit Validation Added checks for empty project name entry or only spaces. Also validate that the jobs were successfully renamed and provided error handling. Will provide error notification with toast. * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/app/store/scenes/scenes.action.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix for flight direction graphics not appearing in Displacement I think this is an unreported bug resulting from the recent Angular upgrade. * Show projects that are going to be renamed with the bulk operation. * Update uniqueProjectNames filtering * Fix: update job count in dialog * Fix single job rename * Many Changes * Added list of projects and associated job counts in a sortable table * Limited project name input to 100 characters * Prevent user from changing names of projects for other users * Progress Bar I've implemented a two-phase dialog that handles the rename operation internally with a determinate progress bar. * Deterministic Progress Bar The Project Rename dialog box now is augmented with a couple more screens indicating renaming progress and completion. * UI Improvements * Auto-focus the input field * Show the new name in the confirmation message * Show specific project names if failed I've implemented the feature to show which specific project names failed to rename in the completion phase. * Show Time Estimate for Bulk Rename Completion I've implemented the estimated time remaining feature for large batch rename operations. Here's what was added: How it works: The estimated time is calculated based on the elapsed time and number of completed batches It only displays for operations with 1000+ jobs (to avoid showing for small, quick operations) The time is displayed in a user-friendly format (e.g., "< 1 min", "~1 min", "~5 min") * Project Rename Title Updated Updated the table to William's suggestions. * npm run lint -- --fix * Update src/app/store/scenes/scenes.action.ts Co-authored-by: William Horn * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: William Horn * Created three named interfaces at the top of hyp3-api.service.ts * RenameProgressInfo - Progress info with percent and estimated time remaining * RenameResult - Final result with success/failed counts and failed project names *RenameWithProgressResult - The composite return type containing both observables I also changed a 'sneaky' 3 into a constant * Update src/app/components/shared/project-name-dialog/project-name-dialog.component.ts Co-authored-by: William Horn * Tyler Suggestions Fixed - Red toast regression Fixed - Missing unnamed projects * Tyler Suggestions #2 Fixed - Empty string validation feedback Fixed - Checkbox disclaimer with empty string * Tyler Suggestions #3 Fixed - Remove dialog service abstraction Fixed - Convert getter to signal/computed * Tyler Suggestions #4 Fixed - Use SubSink pattern consistently Fixed - Moved constructor logic to ngOnInit * Tyler Suggestions #5 Fixed - Material Table with Sorting in-place Reviewing the idea of using the Material Stepper consideration, I don't think it is a good fit. The phases are not user-navigated steps, they're system-driven and there is no option for backward navigation. * npm run lint -- --fix * Conformity & Best Practices #2 - Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * Conformity & Best Practices * Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * npm run lint -- --fix * Made the table header 'sticky' * Fixed Table Header for Dark-Theme * Show estimated time for 5+ jobs It was 1000+ before but Tools wants to see it always. * Warn about Abort I added a @HostListener for the window:beforeunload event that triggers only when the dialog is in the processing phase. This will: - Show the browser's native "Leave site?" confirmation dialog when the user tries to close the tab/window or navigate away - Only trigger during the processing phase - users can freely close during input, complete, or error phases - Let the browser handle the UI (modern browsers don't allow custom messages for security reasons) * Add toggle for removing project names in update dialog * feat(project-name-dialog): replace button toggle with radio buttons - Replace mat-button-toggle-group with mat-radio-group for cleaner UX - Input field now visually nested under "Rename" radio option - Add singular/plural translation keys for radio labels (en, es, de) - Add accessible aria-label to radio group - Update styles for radio group layout and disabled state - Add docs/ to .gitignore * Update src/assets/i18n/es.json Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/app/components/shared/project-name-dialog/project-name-dialog.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Bug Fix A single job rename didn't reflect the count of '1' in the dialog for renaming a job. It now does. --------- Co-authored-by: William Horn Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .gitignore | 1 + .../project-name-dialog.component.html | 103 ++++++++++++------ .../project-name-dialog.component.scss | 24 +++- .../project-name-dialog.component.ts | 13 ++- src/assets/i18n/de.json | 4 + src/assets/i18n/en.json | 8 +- src/assets/i18n/es.json | 8 +- 7 files changed, 124 insertions(+), 37 deletions(-) diff --git a/.gitignore b/.gitignore index d8cb675af..bbb61b064 100644 --- a/.gitignore +++ b/.gitignore @@ -46,3 +46,4 @@ local-serve.sh .claude/ CLAUDE.md TRANSLATIONS_SCRATCH.md +docs/ diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html index 2f278b3b3..ad685235b 100644 --- a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html @@ -16,25 +16,52 @@

- - {{ 'PROJECT_NAME' | translate }} - - {{ projectName()?.length || 0 }}/100 - @if (!projectName()?.trim()) { - {{ 'PROJECT_NAME_REQUIRED' | translate }} - } @else if (projectName()?.length >= 100) { - {{ 'PROJECT_NAME_MAX_LENGTH' | translate }} - } - + + + @if (jobCount <= 1) { + {{ 'RENAME_JOB_TO' | translate }} + } @else { + {{ 'RENAME_JOBS_TO' | translate: { count: jobCount } }} + } + + + + {{ 'PROJECT_NAME' | translate }} + + {{ projectName()?.length || 0 }}/100 + @if (!projectName()?.trim()) { + {{ 'PROJECT_NAME_REQUIRED' | translate }} + } @else if (projectName()?.length >= 100) { + {{ 'PROJECT_NAME_MAX_LENGTH' | translate }} + } + + + + @if (projectCount <= 1) { + {{ 'REMOVE_PROJECT_NAME' | translate }} + } @else { + {{ 'REMOVE_PROJECT_NAMES' | translate: { count: projectCount } }} + } + + @if (dataSource.data.length > 0) {

@@ -86,18 +113,32 @@

[(ngModel)]="confirmationChecked" name="confirmationChecked" > - {{ - (projectCount === 1 - ? 'CONFIRM_RENAME_SINGLE' - : 'CONFIRM_RENAME_MULTIPLE' - ) - | translate - : { - projectCount: projectCount, - jobCount: jobCount, - newName: projectName()?.trim(), - } - }} + @if (isEditMode()) { + {{ + (projectCount === 1 + ? 'CONFIRM_RENAME_SINGLE' + : 'CONFIRM_RENAME_MULTIPLE' + ) + | translate + : { + projectCount: projectCount, + jobCount: jobCount, + newName: projectName()?.trim(), + } + }} + } @else { + {{ + (projectCount === 1 + ? 'CONFIRM_REMOVE_SINGLE' + : 'CONFIRM_REMOVE_MULTIPLE' + ) + | translate + : { + projectCount: projectCount, + jobCount: jobCount, + } + }} + } } } diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss b/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss index 946a24eb5..fa95893eb 100644 --- a/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.scss @@ -26,12 +26,34 @@ app-project-name-dialog { } } + // Radio group layout for edit/remove toggle + .project-edit-radio-group { + display: flex; + flex-direction: column; + gap: 8px; + margin-bottom: 16px; + } + .project-name-field { - width: 100%; + margin-left: 32px; + width: calc(100% - 32px); .mat-mdc-text-field-wrapper { padding-top: 0; } + + // Subtle disabled state when "Remove" is selected + &.disabled { + opacity: 0.5; + pointer-events: none; + } + } + + // Radio button label sizing + .mat-mdc-radio-button { + .mdc-label { + font-size: 14px; + } } .projects-label { diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts b/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts index f0fd90c57..d5b5e5a10 100644 --- a/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.ts @@ -37,6 +37,7 @@ import { MatRowDef, MatRow, } from '@angular/material/table'; +import { MatRadioModule } from '@angular/material/radio'; import { MatSort, MatSortModule } from '@angular/material/sort'; import { TranslateModule, TranslateService } from '@ngx-translate/core'; import { SubSink } from 'subsink'; @@ -92,6 +93,7 @@ export interface ProjectNameDialogResult { MatRowDef, MatRow, TranslateModule, + MatRadioModule, ], }) export class ProjectNameDialogComponent @@ -125,9 +127,14 @@ export class ProjectNameDialogComponent public successCount = 0; public failedCount = 0; public failedProjectNames: string[] = []; + public projectEditType = signal<'edit' | 'remove'>('edit'); // Computed values (only recalculate when dependencies change) - public isValid = computed(() => this.projectName().trim().length > 0); + public isEditMode = computed(() => this.projectEditType() === 'edit'); + public isRemoveMode = computed(() => this.projectEditType() === 'remove'); + public isValid = computed( + () => this.projectName().trim().length > 0 || this.isRemoveMode(), + ); public formattedTimeRemaining = computed(() => { // Only show estimated time for operations of 5+ jobs @@ -157,7 +164,7 @@ export class ProjectNameDialogComponent } const products = this.data?.products; - this.jobCount = products?.length; + this.jobCount = products?.length ?? 1; if (products) { const unnamedLabel = this.translateService.instant( @@ -204,7 +211,7 @@ export class ProjectNameDialogComponent return; } - const trimmedName = this.projectName().trim(); + const trimmedName = this.isEditMode() ? this.projectName().trim() : null; // If no products, just return the name (single-file rename flow) if (!this.data.products || this.data.products.length === 0) { diff --git a/src/assets/i18n/de.json b/src/assets/i18n/de.json index 710f679de..2849fc25a 100644 --- a/src/assets/i18n/de.json +++ b/src/assets/i18n/de.json @@ -597,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.", @@ -609,6 +611,8 @@ "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...", diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index b88ab00a2..8e5f2fa6a 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -126,6 +126,8 @@ "CANNOT_RENAME_PROJECTS_FOR": "You cannot rename projects for", "CONFIRM_RENAME_MULTIPLE": "Yes! I really want to rename these {{projectCount}} projects ({{jobCount}} jobs) to \"{{newName}}\".", "CONFIRM_RENAME_SINGLE": "Yes! I really want to rename this 1 project ({{jobCount}} jobs) to \"{{newName}}\".", + "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).", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(center column) and Files column (right) will populate.", "CHARACTERS": "characters", "CHART": "Chart", @@ -713,6 +715,8 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Remove file from downloads", "REMOVE_FILE_FROM_QUEUE": "Remove file from queue", "REMOVE_JOB": "Remove job", + "REMOVE_PROJECT_NAME": "Remove 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", @@ -728,6 +732,8 @@ "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_SUCCESS": "Successfully renamed {{count}} job(s).", "RENAMING_JOBS": "Renaming jobs...", @@ -1050,4 +1056,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 ba4d9b069..2f32c1015 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -126,6 +126,8 @@ "CANNOT_RENAME_PROJECTS_FOR": "No puede cambiar el nombre de los proyectos de", "CONFIRM_RENAME_MULTIPLE": "¡Sí! Realmente quiero renombrar estos {{projectCount}} proyectos ({{jobCount}} trabajos) a \"{{newName}}\".", "CONFIRM_RENAME_SINGLE": "¡Sí! Realmente quiero renombrar este 1 proyecto ({{jobCount}} trabajos) a \"{{newName}}\".", + "CONFIRM_REMOVE_MULTIPLE": "¡Sí! Realmente quiero eliminar estos {{projectCount}} proyectos ({{jobCount}} trabajos).", + "CONFIRM_REMOVE_SINGLE": "¡Sí! Realmente quiero eliminar este 1 proyecto ({{jobCount}} trabajos).", "CENTER_COLUMN_AND_FILES_COLUMN_RIGHT_WILL_POPULATE": "(columna central) y la columna Archivos (derecha) se completarán.", "CHARACTERS": "caracteres", "CHART": "Gráfico", @@ -714,6 +716,8 @@ "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 nombre del proyecto", + "REMOVE_PROJECT_NAMES": "Eliminar {{count}} nombres de proyecto", "REMOVE_RED_EYE": "quitar_ojo_rojo", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Eliminar archivos de escena de las descargas", "REMOVE_SERIES": "Eliminar serie", @@ -729,6 +733,8 @@ "RENAME_ALL_FAILED": "Error al renombrar {{count}} trabajo(s).", "RENAME_COMPLETE": "Cambio de nombre completado", "RENAME_ERROR": "Ocurrió un error al renombrar los trabajos.", + "RENAME_JOB_TO": "Renombrar trabajo a:", + "RENAME_JOBS_TO": "Renombrar {{count}} trabajos a:", "RENAME_PARTIAL_SUCCESS": "Se renombraron {{success}} trabajo(s). {{failed}} fallaron.", "RENAME_SUCCESS": "Se renombraron {{count}} trabajo(s) exitosamente.", "RENAMING_JOBS": "Renombrando trabajos...", @@ -1051,4 +1057,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 +} From 9fff7be707f553bb7e19db45e804414b2272e43c Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Tue, 6 Jan 2026 15:45:53 -0800 Subject: [PATCH 16/34] Andy/radio button toggle (#2380) * Add ability to update a jobs project name * fix: formatting * Add ability to nuke all loaded jobs * Make Help more easily seen on Filter's panel. * DS-6336 Text modified to be translatable. * Lint space * feat: Update to use jobs patch endpoint * Update src/app/components/filters-dropdown/dataset-filters/dataset-filters.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Round 1 of revamping the UI * Fix console error related to translation. * Bulk rename uses new dialog * npm run lint -- --fix * On Demand search reloads after bulk rename * npm run lint -- --fix * Resolving issues from merging with test * Snackbar message for renaming jobs * Adding multi-lingual support to rename dialog And a few other UI tweaks. * Edit Validation Added checks for empty project name entry or only spaces. Also validate that the jobs were successfully renamed and provided error handling. Will provide error notification with toast. * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/app/store/scenes/scenes.action.ts Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Fix for flight direction graphics not appearing in Displacement I think this is an unreported bug resulting from the recent Angular upgrade. * Show projects that are going to be renamed with the bulk operation. * Update uniqueProjectNames filtering * Fix: update job count in dialog * Fix single job rename * Many Changes * Added list of projects and associated job counts in a sortable table * Limited project name input to 100 characters * Prevent user from changing names of projects for other users * Progress Bar I've implemented a two-phase dialog that handles the rename operation internally with a determinate progress bar. * Deterministic Progress Bar The Project Rename dialog box now is augmented with a couple more screens indicating renaming progress and completion. * UI Improvements * Auto-focus the input field * Show the new name in the confirmation message * Show specific project names if failed I've implemented the feature to show which specific project names failed to rename in the completion phase. * Show Time Estimate for Bulk Rename Completion I've implemented the estimated time remaining feature for large batch rename operations. Here's what was added: How it works: The estimated time is calculated based on the elapsed time and number of completed batches It only displays for operations with 1000+ jobs (to avoid showing for small, quick operations) The time is displayed in a user-friendly format (e.g., "< 1 min", "~1 min", "~5 min") * Project Rename Title Updated Updated the table to William's suggestions. * npm run lint -- --fix * Update src/app/store/scenes/scenes.action.ts Co-authored-by: William Horn * Update src/app/services/hyp3/hyp3-api.service.ts Co-authored-by: William Horn * Created three named interfaces at the top of hyp3-api.service.ts * RenameProgressInfo - Progress info with percent and estimated time remaining * RenameResult - Final result with success/failed counts and failed project names *RenameWithProgressResult - The composite return type containing both observables I also changed a 'sneaky' 3 into a constant * Update src/app/components/shared/project-name-dialog/project-name-dialog.component.ts Co-authored-by: William Horn * Tyler Suggestions Fixed - Red toast regression Fixed - Missing unnamed projects * Tyler Suggestions #2 Fixed - Empty string validation feedback Fixed - Checkbox disclaimer with empty string * Tyler Suggestions #3 Fixed - Remove dialog service abstraction Fixed - Convert getter to signal/computed * Tyler Suggestions #4 Fixed - Use SubSink pattern consistently Fixed - Moved constructor logic to ngOnInit * Tyler Suggestions #5 Fixed - Material Table with Sorting in-place Reviewing the idea of using the Material Stepper consideration, I don't think it is a good fit. The phases are not user-navigated steps, they're system-driven and there is no option for backward navigation. * npm run lint -- --fix * Conformity & Best Practices #2 - Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * Conformity & Best Practices * Removed stale SCSS styles: Cleaned up .sortable, .sort-indicator, .projects-table-body-container, and custom table styling that was no longer needed after switching to Material table * Made dialog injects private: Changed dialogRef and data from public to private to match codebase pattern * Added readonly to displayedColumns: Added readonly modifier since the array never changes * Fixed track function: Changed track name to track $index to handle potential duplicate project names in the failed list * Made "(unnamed)" multilingual * Tweaks Made the Project Rename table sorted by Project Name by default and eliminated the use of ::ng-deep in the Project Rename scss files. * npm run lint -- --fix * Made the table header 'sticky' * Fixed Table Header for Dark-Theme * Show estimated time for 5+ jobs It was 1000+ before but Tools wants to see it always. * Warn about Abort I added a @HostListener for the window:beforeunload event that triggers only when the dialog is in the processing phase. This will: - Show the browser's native "Leave site?" confirmation dialog when the user tries to close the tab/window or navigate away - Only trigger during the processing phase - users can freely close during input, complete, or error phases - Let the browser handle the UI (modern browsers don't allow custom messages for security reasons) * Add toggle for removing project names in update dialog * feat(project-name-dialog): replace button toggle with radio buttons - Replace mat-button-toggle-group with mat-radio-group for cleaner UX - Input field now visually nested under "Rename" radio option - Add singular/plural translation keys for radio labels (en, es, de) - Add accessible aria-label to radio group - Update styles for radio group layout and disabled state - Add docs/ to .gitignore * Update src/assets/i18n/es.json Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/app/components/shared/project-name-dialog/project-name-dialog.component.scss Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Bug Fix A single job rename didn't reflect the count of '1' in the dialog for renaming a job. It now does. * Project Name Extras Logic was added to show the Project Name in the right metadata column to jobs without Project names and to give the user the ability to add a name. Several other lint and code cleanup tasks were done as well. --------- Co-authored-by: William Horn Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../scene-file/scene-file.component.html | 70 +++++-------------- .../scene-file/scene-file.component.scss | 16 ++++- .../scene-file/scene-file.component.ts | 5 +- .../scene-files/scene-files.component.scss | 2 +- .../search-type-selector.component.ts | 2 - src/app/models/cmr-product.model.ts | 2 +- 6 files changed, 39 insertions(+), 58 deletions(-) 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 21b8b2867..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,40 +1,4 @@ - @if (false) { - - @if (!isUnzipLoading && !isOpen) { - - keyboard_arrow_right - - } - @if (isOpen) { - - keyboard_arrow_down - - } - @if (isUnzipLoading) { -
- -
- } - - } - @@ -88,7 +52,6 @@ prompt="{{ 'COPY_FILE_ID' | translate }}" > - - @if (product.metadata.job.name) { -
- {{ 'PROJECT_NAME' | translate }}: +
+ {{ 'PROJECT_NAME' | translate }}: + @if (product.metadata.job.name) { {{ product.metadata.job.name }} - -
- } + } @else { +  {{ + 'PROJECT_NAME_UNNAMED' | translate + }} + } + +
{{ 'JOB_SUBMITTED' | translate }}: @@ -185,8 +152,8 @@ } - @for (param of paramsList; track param) { -
+ @for (param of paramsList; track param; let first = $first) { +
{{ param.name }}: {{ param.val }}
} @@ -215,12 +182,13 @@ } @if ((searchType$ | async) === searchTypes.CUSTOM_PRODUCTS) { - + @if (isExpired(product.metadata.job)) {
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 8f5911b61..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 @@ -17,7 +17,7 @@ > @for (event of filteredEvents$ | async; track event) { -
+
@if (!!event.description) { {{ event.description }} 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 4ed8bef7e..dd1bf0025 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 @@ -48,11 +48,6 @@
{{ type.nameKey | translate }} - @if (type.nameKey === 'DISPLACEMENT') { - {{ - 'NEW' | translate | titlecase - }} - }
diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html index ad685235b..7ef970cab 100644 --- a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html @@ -116,8 +116,8 @@

@if (isEditMode()) { {{ (projectCount === 1 - ? 'CONFIRM_RENAME_SINGLE' - : 'CONFIRM_RENAME_MULTIPLE' + ? ('CONFIRM_RENAME_SINGLE' | translate) + : ('CONFIRM_RENAME_MULTIPLE' | translate) ) | translate : { @@ -129,8 +129,8 @@

} @else { {{ (projectCount === 1 - ? 'CONFIRM_REMOVE_SINGLE' - : 'CONFIRM_REMOVE_MULTIPLE' + ? ('CONFIRM_REMOVE_SINGLE' | translate) + : ('CONFIRM_REMOVE_MULTIPLE' | translate) ) | translate : { From 09112f8b544de07f34155e54db458f6a5c7fdefe Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Wed, 7 Jan 2026 19:17:32 -0500 Subject: [PATCH 22/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state --- src/assets/i18n/en.json | 3 ++- src/assets/i18n/es.json | 15 ++++++++------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 2340874f3..001158b54 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -142,7 +142,7 @@ "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": "Haga clic en el mapa una vez para especificar la esquina de inicio, mueva el ratón 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": "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.", @@ -249,6 +249,7 @@ "DEVELOPER": "Developer", "DIRECTION": "Direction", "DISABLE": "Disable", + "DISCLAIMER": "Disclaimer", "DISP_DOI": "DISP DOI", "DISPLACEMENT": "Displacement", "DISPLACEMENT_DATA_DISCLAIMER": "Displacement Data Disclaimer", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 5bf026291..c2f54d489 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -142,7 +142,7 @@ "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 ratón 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.", @@ -154,7 +154,7 @@ "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": "Confirmar eliminar varios", "CONFIRM_RENAME_MULTIPLE": "Confirmar renombrar múltiples", - "CONFIRM_RENAME_SINGLE": "Sí! Realmente quiero renombrar este 1 proyecto ({{jobCount}} trabajos) a \"{{newName}}\".", + "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", @@ -167,7 +167,7 @@ "COPY_FILE_IDS": "Copiar ID de archivos", "COPY_FILE_URLS_TO_CLIPBOARD": " Copiar URL de Archivo al portapapeles", "COPY_IDS_URLS": "Copiar IDs/URLs", - "COPY_JOB_ID": "Copiar ID de tarea", + "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", @@ -249,6 +249,7 @@ "DEVELOPER": "Desarrollador", "DIRECTION": "Dirección", "DISABLE": "Desactivar", + "DISCLAIMER": "Aviso legal", "DISP_DOI": "DOI de desplazamiento", "DISPLACEMENT": "Desplazamiento", "DISPLACEMENT_DATA_DISCLAIMER": "Aviso legal sobre los datos de desplazamiento", @@ -412,7 +413,7 @@ "HY_P3_API_URL": "URL de la API de HyP3", "HY_P3_USER_GUIDE": "Guía del usuario de HyP3", "HYP3_AVAILABLE": "Disponible para procesamiento On Demand (HyP3)", - "HYP3_JOB_IDS_INFO_BAR": "Barra informativa de ID de tareas 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,", @@ -427,7 +428,7 @@ "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).", @@ -462,8 +463,8 @@ "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_ID": "ID de la Tarea", - "JOB_IDS_SELECTOR": "Selector de ID de tareas", + "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", From 3bb2e303578bd6ab13fbda1b220a35f682915224 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Wed, 7 Jan 2026 19:21:17 -0500 Subject: [PATCH 23/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state From ac1a672abd85feb2a7e7ae134e3dd061e97b9108 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Wed, 7 Jan 2026 19:46:28 -0500 Subject: [PATCH 24/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state --- src/assets/i18n/en.json | 31 +++++++++++++++---------------- src/assets/i18n/es.json | 17 ++++++++--------- 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 001158b54..8927bf6e0 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -37,7 +37,7 @@ "ADVANCED_FEATURES": "Advanced Features", "AIRSAR_DESC": "AIRSAR was an all-weather imaging tool able to penetrate through clouds and collect data at night. The longer wavelengths could also penetrate into the forest canopy and...", "ALL": "all", - "ALL_AOIS": "All AOIs", + "ALL_AOIS": "Todas las AOIs", "ALL_DATASETS_AND_THIS_LIST_CAN_CHANGE": "all datasets, and this list can change.", "ALL_HELP_AND_TUTORIALS": "All Help & Tutorials", "ALL_OF_THE_OTHER_SEARCH_FILTERS_OF_INTEREST_TO_YOU_TO_CREATE_THE_SEARCH_EXACTLY_AS_YOU_LIKE_IT": "all of the other search filters of interest to you to create the search exactly as you like it.", @@ -71,7 +71,7 @@ "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", @@ -142,7 +142,7 @@ "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": "Haga clic en el mapa una vez para especificar la esquina de inicio, mueva el ratón y, a continuación, vuelva a hacer clic para finalizar el cuadro.", + "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.", @@ -152,7 +152,8 @@ "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": "Confirm remove multiple", + "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": "Confirm rename multiple", "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}`;", @@ -183,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", @@ -216,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", @@ -254,7 +255,7 @@ "DISPLACEMENT": "Displacement", "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 Earth's surface, covering North America.", + "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": "Displacement Filters", "DISPLACEMENT_SEARCH": "Displacement Search", "DISPLAYED_IF_YOU_WISH_TO_UNDO_THIS_ACTION": "displayed if you wish to undo this action.", @@ -329,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", @@ -448,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", @@ -575,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": "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": "Observational Filters", "OF": "of", "OF_THE_BOUNDING_BOX_OR_TO_DELETE_THE_BOUNDING_BOX": "of the bounding box, or to delete the bounding box.", @@ -589,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.", @@ -608,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.", @@ -674,7 +675,7 @@ "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", @@ -729,7 +730,6 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Remove file from downloads", "REMOVE_FILE_FROM_QUEUE": "Remove file from queue", "REMOVE_JOB": "Remove job", - "REMOVE_PROJECT_NAME": "Remove 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", @@ -744,7 +744,7 @@ "RENAME_PROJECTS": "Rename Projects", "RENAME_SUCCESS": "Rename success", "RENAMING_JOBS": "Renaming jobs...", - "REQUEUE_PROJECT": "Add Project to Queue", + "REQUEUE_PROJECT": "Renombrar el proyecto", "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", @@ -932,7 +932,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.", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index c2f54d489..e4269ba2e 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -37,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.", @@ -142,7 +142,7 @@ "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 en el mapa una vez para especificar la esquina de inicio, mueva el ratón y, a continuación, vuelva a hacer clic para finalizar el cuadro.", + "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.", @@ -152,7 +152,8 @@ "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": "Confirmar eliminar varios", + "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": "Confirmar renombrar 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}`;", @@ -254,7 +255,7 @@ "DISPLACEMENT": "Desplazamiento", "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 en la superficie de la Tierra, cubriendo América del Norte.", + "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.", @@ -575,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.", @@ -729,7 +730,6 @@ "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 nombre del proyecto", "REMOVE_PROJECT_NAMES": "Eliminar {{count}} nombres de proyecto", "REMOVE_RED_EYE": "quitar_ojo_rojo", "REMOVE_SCENE_FILES_FROM_DOWNLOADS": "Eliminar archivos de escena de las descargas", @@ -744,7 +744,7 @@ "RENAME_PROJECTS": "Renombrar proyectos", "RENAME_SUCCESS": "Éxito de cambio de nombre", "RENAMING_JOBS": "Renombrar los puestos...", - "REQUEUE_PROJECT": "Agregar proyecto a la lista", + "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", @@ -932,7 +932,6 @@ "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.", @@ -1034,7 +1033,7 @@ "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).", From 93d44df868318d4cfe52e666ab48a0f29435380f Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Wed, 7 Jan 2026 20:01:58 -0500 Subject: [PATCH 25/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state --- src/assets/i18n/en.json | 2 +- src/assets/i18n/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 8927bf6e0..9f07a00c3 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -154,7 +154,7 @@ "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": "Confirm rename multiple", + "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();", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index e4269ba2e..b2c9921e7 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -154,7 +154,7 @@ "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": "Confirmar renombrar múltiples", + "CONFIRM_RENAME_MULTIPLE": "Confirmar ¡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();", From 58d5a6e918eb721a50f38938b429245aada74b67 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Wed, 7 Jan 2026 20:03:19 -0500 Subject: [PATCH 26/34] Updated translations from Phrase (#2391) phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state Co-authored-by: yoreley777 --- src/assets/i18n/en.json | 2 +- src/assets/i18n/es.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 8927bf6e0..9f07a00c3 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -154,7 +154,7 @@ "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": "Confirm rename multiple", + "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();", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index e4269ba2e..b2c9921e7 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -154,7 +154,7 @@ "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": "Confirmar renombrar múltiples", + "CONFIRM_RENAME_MULTIPLE": "Confirmar ¡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();", From 177e89bbb2e61cf691dbf402be26b0277d9637ad Mon Sep 17 00:00:00 2001 From: yoreley777 Date: Wed, 7 Jan 2026 17:11:22 -0800 Subject: [PATCH 27/34] Yoreley/dec 27 (#2392) * NEW KEYS - 2026 * Remove "New" tag from Displacement Search type * Translate No processing options for KEY * Hyp3 - keys * HyP3 * Fix CONFIRM_RENAME_MULTIPLE and CONFIRM_REMOVE_SINGLE --- .../project-name-dialog.component.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html index 7ef970cab..ad685235b 100644 --- a/src/app/components/shared/project-name-dialog/project-name-dialog.component.html +++ b/src/app/components/shared/project-name-dialog/project-name-dialog.component.html @@ -116,8 +116,8 @@

@if (isEditMode()) { {{ (projectCount === 1 - ? ('CONFIRM_RENAME_SINGLE' | translate) - : ('CONFIRM_RENAME_MULTIPLE' | translate) + ? 'CONFIRM_RENAME_SINGLE' + : 'CONFIRM_RENAME_MULTIPLE' ) | translate : { @@ -129,8 +129,8 @@

} @else { {{ (projectCount === 1 - ? ('CONFIRM_REMOVE_SINGLE' | translate) - : ('CONFIRM_REMOVE_MULTIPLE' | translate) + ? 'CONFIRM_REMOVE_SINGLE' + : 'CONFIRM_REMOVE_MULTIPLE' ) | translate : { From 3cf6e7f8d6555f9467fceca17a06b5d9c74a1608 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Thu, 8 Jan 2026 09:56:21 -0800 Subject: [PATCH 28/34] Andy/ds 6227 displacemen story map (#2390) * feat(services): add DisplacementDisclaimerService for shared dialog access * feat(map): add OPERA disclaimer logo to map template * style(map): add OPERA logo positioning and hover effects * feat(map): wire up OPERA logo click to open disclaimer dialog * refactor(info-bar): remove displacement disclaimer text link * refactor(info-bar): remove unused disclaimer dialog code Remove the onOpenDispDataDisclaimer method and related imports (MatDialog, DispDataDisclaimerComponent, MatIcon) since the disclaimer functionality has been moved to the OPERA logo in the map component. * style: fix prettier formatting in map template * feat(search-type-selector): add disclaimer link for Displacement search Add subtle italic "Disclaimer" text below the Search Type selector that opens the OPERA data disclaimer dialog. Only visible when Displacement search type is active. * fix(search-type-selector): adjust disclaimer link size and fix click - Reduce font-size from 14px to 12px to match header text - Use grey color to match "Radar Look Direction" styling - Add pointer-events: auto to ensure click handler works * fix(search-type-selector): update disclaimer styling and fix click - Add margin-left: 10px - Change text to "*Disclaimer" with initial caps - Add display: inline-block, position: relative, z-index: 10 - Use span instead of anchor tag - Add stopPropagation to prevent event bubbling * style(search-type-selector): move disclaimer down 2px * refactor(search-type-selector): use translation key for disclaimer Use 'DISCLAIMER' translation key with asterisk outside the translation. * feat(timeseries-results-menu): add disclaimer link to data credits Add "Disclaimer" link between "OPERA" and "License" in the data credits section that triggers the disclaimer modal. * npm run lint -- --fix --- .../header/info-bar/info-bar.component.html | 8 ------- .../header/info-bar/info-bar.component.ts | 14 ------------ .../processing-options.component.html | 4 +++- src/app/components/map/map.component.html | 13 ++++++++++++ src/app/components/map/map.component.scss | 17 +++++++++++++++ src/app/components/map/map.component.ts | 8 +++++++ .../scenes-list-header.component.html | 3 ++- .../timeseries-results-menu.component.html | 4 ++++ .../timeseries-results-menu.component.ts | 6 ++++++ .../search-type-selector.component.html | 8 +++++++ .../search-type-selector.component.scss | 17 +++++++++++++++ .../search-type-selector.component.ts | 11 +++++++++- .../displacement-disclaimer.service.ts | 20 ++++++++++++++++++ src/app/services/index.ts | 1 + src/assets/opera-disp-logo.png | Bin 0 -> 53158 bytes 15 files changed, 109 insertions(+), 25 deletions(-) create mode 100644 src/app/services/displacement-disclaimer.service.ts create mode 100644 src/assets/opera-disp-logo.png 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 ffd9f3344..8d0c2b851 100644 --- a/src/app/components/header/info-bar/info-bar.component.html +++ b/src/app/components/header/info-bar/info-bar.component.html @@ -27,14 +27,6 @@ {{ 'PRODUCT_TYPES' | translate }}: {{ eventProductTypes }} } - @if ((searchType$ | async) === searchTypes.DISPLACEMENT) { - - - - } @if (breakpoint > breakpoints.SMALL && !!startDate) { {{ 'START' | translate }}: {{ startDate | shortDate }} 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 2e2444c88..450963238 100644 --- a/src/app/components/header/info-bar/info-bar.component.ts +++ b/src/app/components/header/info-bar/info-bar.component.ts @@ -17,9 +17,6 @@ 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'; -import { DispDataDisclaimerComponent } from '@components/results-menu/timeseries-results-menu/timeseries-displacement-disclaimer-dialog.component'; -import { MatDialog } from '@angular/material/dialog'; -import { MatIcon } from '@angular/material/icon'; // Declare GTM dataLayer array. declare global { @@ -40,14 +37,12 @@ declare global { ShortDatePipe, JoinPipe, TranslateModule, - MatIcon, ], }) export class InfoBarComponent implements OnInit, OnDestroy { private store$ = inject>(Store); private screenSize = inject(services.ScreenSizeService); private hyp3 = inject(services.Hyp3ApiService); - private dialog = inject(MatDialog); public searchType: models.SearchType = models.SearchType.DATASET; public searchTypes = models.SearchType; public searchType$ = this.store$.select(searchStore.getSearchType); @@ -303,15 +298,6 @@ export class InfoBarComponent implements OnInit, OnDestroy { ); } - public onOpenDispDataDisclaimer() { - this.dialog.open(DispDataDisclaimerComponent, { - width: '550px', - height: '325px', - maxWidth: '550px', - maxHeight: '500px', - }); - } - ngOnDestroy() { this.subs.unsubscribe(); } 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 115178a3d..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 @@ -4,7 +4,9 @@ @if (selectedJobType.id === jobType.id) { @if (jobType.options.length === 0) {
-

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

+

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

} @else {
diff --git a/src/app/components/map/map.component.html b/src/app/components/map/map.component.html index 1c774c48f..3206a785e 100644 --- a/src/app/components/map/map.component.html +++ b/src/app/components/map/map.component.html @@ -93,6 +93,19 @@ } +@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 b30b3d232..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,6 +44,7 @@ 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'; @@ -85,6 +87,7 @@ enum FullscreenControls { AttributionsComponent, AsyncPipe, TranslateModule, + MatTooltipModule, ], }) export class MapComponent implements OnInit, OnDestroy { @@ -96,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; @@ -802,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/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 8d9deaa82..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 @@ -339,7 +339,8 @@
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 c81033b4e..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 @@ -244,6 +244,10 @@ >{{ 'DATA_COURTESY_OF' | translate }} OPERA | +  {{ 'DISCLAIMER' | translate }} + | (DOCUMENT); private language = inject(AsfLanguageService); @@ -459,6 +461,10 @@ export class TimeseriesResultsMenuComponent implements OnInit, OnDestroy { }); } + public onOpenDisclaimer(): void { + this.disclaimerService.open(); + } + public ngOnDestroy() { this.subs.unsubscribe(); this.pointHistoryService.clearPoints(); 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 dd1bf0025..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 @@ -24,6 +24,14 @@
+ @if (searchType === searchTypes.DISPLACEMENT) { + + *{{ 'DISCLAIMER' | translate }} + + }

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 d2f73fd4c..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 @@ -242,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 30c204ea9..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 @@ -18,7 +18,11 @@ 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, TranslateModule } from '@ngx-translate/core'; import { NgClass, AsyncPipe } from '@angular/common'; @@ -59,6 +63,7 @@ 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; @@ -241,6 +246,10 @@ export class SearchTypeSelectorComponent implements OnInit, OnDestroy { event.stopPropagation(); } + public onOpenDisclaimer(): void { + this.disclaimerService.open(); + } + ngOnDestroy() { this.subs.unsubscribe(); } 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/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/assets/opera-disp-logo.png b/src/assets/opera-disp-logo.png new file mode 100644 index 0000000000000000000000000000000000000000..0d6ea0339b364892b3142fa06b554061a434ac17 GIT binary patch literal 53158 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 FO#p(n(NF*Y literal 0 HcmV?d00001 From b37691be88a467e6bdcf043195294c32929a0e8e Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Thu, 8 Jan 2026 14:49:30 -0500 Subject: [PATCH 29/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state --- src/assets/i18n/en.json | 1 + src/assets/i18n/es.json | 7 ++++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 9f07a00c3..cc5b5f395 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -730,6 +730,7 @@ "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", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index b2c9921e7..bbf104679 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -154,7 +154,7 @@ "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": "Confirmar ¡Sí! Realmente quiero eliminar este 1 proyecto ({{jobCount}} trabajos). múltiples", + "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();", @@ -730,7 +730,8 @@ "REMOVE_FILE_FROM_DOWNLOADS": "Eliminar archivo de las descargas", "REMOVE_FILE_FROM_QUEUE": "Eliminar archivo de la lista", "REMOVE_JOB": "Quitar trabajo", - "REMOVE_PROJECT_NAMES": "Eliminar {{count}} nombres de proyecto", + "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", @@ -910,7 +911,7 @@ "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", "STREET": "Calle", "STREET_LAYER": "Capa de Calle", "SUBJECT": "sujeto : \"\",", From 9f256b03031a137b8788a39c4aa485a1cdb222f3 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Thu, 8 Jan 2026 17:23:58 -0500 Subject: [PATCH 30/34] Updated translations from Phrase phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state --- src/assets/i18n/en.json | 3 ++- src/assets/i18n/es.json | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index cc5b5f395..f59dae8b3 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -37,7 +37,7 @@ "ADVANCED_FEATURES": "Advanced Features", "AIRSAR_DESC": "AIRSAR was an all-weather imaging tool able to penetrate through clouds and collect data at night. The longer wavelengths could also penetrate into the forest canopy and...", "ALL": "all", - "ALL_AOIS": "Todas las AOIs", + "ALL_AOIS": "All AOIs", "ALL_DATASETS_AND_THIS_LIST_CAN_CHANGE": "all datasets, and this list can change.", "ALL_HELP_AND_TUTORIALS": "All Help & Tutorials", "ALL_OF_THE_OTHER_SEARCH_FILTERS_OF_INTEREST_TO_YOU_TO_CREATE_THE_SEARCH_EXACTLY_AS_YOU_LIKE_IT": "all of the other search filters of interest to you to create the search exactly as you like it.", @@ -835,6 +835,7 @@ "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.", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index bbf104679..0bad50242 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -835,6 +835,7 @@ "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.", From 7559c8f09ba86a1ef2e7140e146e445b5d6fa014 Mon Sep 17 00:00:00 2001 From: ASF Discovery Machine User <60239462+ASF-Discovery@users.noreply.github.com> Date: Thu, 8 Jan 2026 17:49:49 -0500 Subject: [PATCH 31/34] Updated translations from Phrase (#2396) phrase: update src/assets/i18n/en.json to latest state phrase: update src/assets/i18n/es.json to latest state Co-authored-by: Andrew Anderson --- src/assets/i18n/en.json | 7 ++++--- src/assets/i18n/es.json | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index f59dae8b3..186d95fe9 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -255,7 +255,7 @@ "DISPLACEMENT": "Displacement", "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": "Los productos de desplazamiento proporcionan información sobre los cambios antropogénicos y naturales de la superficie terrestre, cubriendo Norteamérica.", + "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.", @@ -576,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": "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.", + "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.", @@ -745,7 +745,7 @@ "RENAME_PROJECTS": "Rename Projects", "RENAME_SUCCESS": "Rename success", "RENAMING_JOBS": "Renaming jobs...", - "REQUEUE_PROJECT": "Renombrar el proyecto", + "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", @@ -913,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 : \"\",", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 0bad50242..63edf3360 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -743,7 +743,7 @@ "RENAME_PARTIAL_SUCCESS": "Se renombraron {{success}} trabajo(s). {{failed}} fallaron.", "RENAME_PROJECT": "Renombrar el proyecto", "RENAME_PROJECTS": "Renombrar proyectos", - "RENAME_SUCCESS": "Éxito de cambio de nombre", + "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.", @@ -913,6 +913,7 @@ "STOP_DRAWING": "Detener dibujo", "STOP_EDITING": "Detener edición", "STOP_TIME": "Hora de finalización", + "STORYMAP": "StoryMap", "STREET": "Calle", "STREET_LAYER": "Capa de Calle", "SUBJECT": "sujeto : \"\",", From 170b5aa88d197118b7a357fc37d9b70b2242c7cf Mon Sep 17 00:00:00 2001 From: yoreley777 Date: Thu, 8 Jan 2026 15:41:12 -0800 Subject: [PATCH 32/34] Yoreley/dec 27 (#2397) * NEW KEYS - 2026 * Remove "New" tag from Displacement Search type * Translate No processing options for KEY * Hyp3 - keys * HyP3 * Fix CONFIRM_RENAME_MULTIPLE and CONFIRM_REMOVE_SINGLE * Link ARIA S1 GUNW --------- Co-authored-by: Andrew Anderson --- src/app/models/hyp3/hyp3-jobs.model.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/models/hyp3/hyp3-jobs.model.ts b/src/app/models/hyp3/hyp3-jobs.model.ts index 4090f435e..624067442 100644 --- a/src/app/models/hyp3/hyp3-jobs.model.ts +++ b/src/app/models/hyp3/hyp3-jobs.model.ts @@ -312,7 +312,7 @@ 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: [ From 9e367f78652a521e515810916774ee2c06b4a0d0 Mon Sep 17 00:00:00 2001 From: Andrew Anderson Date: Fri, 9 Jan 2026 10:27:05 -0800 Subject: [PATCH 33/34] Andy/ds 6227 displacemen story map (#2395) * feat(services): add DisplacementDisclaimerService for shared dialog access * feat(map): add OPERA disclaimer logo to map template * style(map): add OPERA logo positioning and hover effects * feat(map): wire up OPERA logo click to open disclaimer dialog * refactor(info-bar): remove displacement disclaimer text link * refactor(info-bar): remove unused disclaimer dialog code Remove the onOpenDispDataDisclaimer method and related imports (MatDialog, DispDataDisclaimerComponent, MatIcon) since the disclaimer functionality has been moved to the OPERA logo in the map component. * style: fix prettier formatting in map template * feat(search-type-selector): add disclaimer link for Displacement search Add subtle italic "Disclaimer" text below the Search Type selector that opens the OPERA data disclaimer dialog. Only visible when Displacement search type is active. * fix(search-type-selector): adjust disclaimer link size and fix click - Reduce font-size from 14px to 12px to match header text - Use grey color to match "Radar Look Direction" styling - Add pointer-events: auto to ensure click handler works * fix(search-type-selector): update disclaimer styling and fix click - Add margin-left: 10px - Change text to "*Disclaimer" with initial caps - Add display: inline-block, position: relative, z-index: 10 - Use span instead of anchor tag - Add stopPropagation to prevent event bubbling * style(search-type-selector): move disclaimer down 2px * refactor(search-type-selector): use translation key for disclaimer Use 'DISCLAIMER' translation key with asterisk outside the translation. * feat(timeseries-results-menu): add disclaimer link to data credits Add "Disclaimer" link between "OPERA" and "License" in the data credits section that triggers the disclaimer modal. * npm run lint -- --fix * Added icon/link to StoryMaps for Displacement --- .../header-buttons.component.html | 18 ++++++++++++++++++ .../header-buttons.component.scss | 12 ++++++++++++ .../header-buttons.component.ts | 11 +++++++++++ src/assets/StoryMaps.png | Bin 0 -> 18239 bytes 4 files changed, 41 insertions(+) create mode 100644 src/assets/StoryMaps.png 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 3fb203971..e6057bf99 100644 --- a/src/app/components/header/header-buttons/header-buttons.component.html +++ b/src/app/components/header/header-buttons/header-buttons.component.html @@ -73,6 +73,24 @@ } @if (searchType === searchTypes.DISPLACEMENT) { +