From 160ec8b13f813e8ad7dfe361475bb40e888da8ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoreley=20Villafa=C3=B1ez?= Date: Thu, 1 Oct 2026 07:52:20 -0700 Subject: [PATCH 1/6] feat: replace UAVSAR campaign selector with site description input --- .../dataset-filters.component.html | 6 +- .../mission-selector.component.html | 88 +++++++++++-------- .../mission-selector.component.ts | 9 ++ 3 files changed, 64 insertions(+), 39 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 f58b8893e..658526a15 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 @@ -212,7 +212,11 @@ [expandedHeight]="customExpandedHeight" > - {{ 'CAMPAIGN_SELECTOR' | translate }} + @if (actualDataset() | isRelevant: p.SITE_DESCRIPTION) { + {{ 'SITE_DESCRIPTION' | translate }} + } @else { + {{ 'CAMPAIGN_SELECTOR' | translate }} + } 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 0c5a6e60d..b68694835 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 @@ -1,44 +1,56 @@ -
+@if (dataset() | isRelevant: p.SITE_DESCRIPTION) { - {{ 'FILTER_CAMPAIGN' | translate }} - + {{ 'SITE_DESCRIPTION' | translate }} + -
+} @else { +
+ + {{ 'FILTER_CAMPAIGN' | translate }} + + +
-@if (!!selectedMission()) { -
-
-
- - {{ 'SELECTED' | translate }} • - {{ selectedMission() }} - -
-
- clear + @if (!!selectedMission()) { +
+
+
+ + {{ 'SELECTED' | translate }} • + {{ selectedMission() }} + +
+
+ clear +
+
- -
-} + } - - - - - + + + + + +} 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 f3bf1c511..72e1d81e3 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 @@ -21,6 +21,7 @@ import { startWith, map, tap } from 'rxjs/operators'; import { SubSink } from 'subsink'; import * as models from '@models'; +import { IsRelevantPipe } from '@pipes/relevant.pipe'; import { AppState } from '@store'; import * as filtersStore from '@store/filters'; @@ -54,6 +55,7 @@ export const _filter = (opt: string[], value: string): string[] => { MatNavList, CdkVirtualForOf, MatListItem, + IsRelevantPipe, TranslateModule, ], }) @@ -62,6 +64,8 @@ export class MissionSelectorComponent implements OnInit, OnDestroy { private fb = inject(UntypedFormBuilder); public dataset$ = this.store$.select(filtersStore.getSelectedDataset); + public dataset = this.store$.selectSignal(filtersStore.getSelectedDataset); + public p = models.Props; public missionsByDataset = this.store$.selectSignal( filtersStore.getMissionsByDataset, @@ -138,6 +142,11 @@ export class MissionSelectorComponent implements OnInit, OnDestroy { this.store$.dispatch(new filtersStore.SelectMission(mission)); } + public onSiteDescriptionChange(event: Event): void { + const siteDescription = (event.target as HTMLInputElement).value.trim(); + this.setMission(siteDescription || null); + } + ngOnDestroy() { this.subs.unsubscribe(); } From e971178513cd3e91094f7c543b8c09860922420c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoreley=20Villafa=C3=B1ez?= Date: Fri, 2 Oct 2026 15:36:40 -0700 Subject: [PATCH 2/6] fix(i18n): update legacy dataset notice to reflect removal --- src/assets/i18n/en.json | 4 ++-- src/assets/i18n/es.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assets/i18n/en.json b/src/assets/i18n/en.json index 053acf47c..bfbdb9169 100644 --- a/src/assets/i18n/en.json +++ b/src/assets/i18n/en.json @@ -175,8 +175,8 @@ "DATA_FILTERS": "Date Filters", "DATA_TYPE": "Data Type", "DATASET": "Dataset", - "DATASET_DEPRECATION_NOTICE": "This dataset is scheduled to be removed from searchable interfaces.", - "DATASET_DEPRECATION_NOTICE_TEMP": "This dataset is scheduled to be temporarily removed from searchable interfaces.", + "DATASET_DEPRECATION_NOTICE": "This dataset has been removed from searchable interfaces.", + "DATASET_DEPRECATION_NOTICE_TEMP": "This dataset has been temporarily removed from searchable interfaces.", "DATASET_INFO": "Dataset Info", "DATASET_LINKED": "dataset_linked", "DATASETS": "Datasets", diff --git a/src/assets/i18n/es.json b/src/assets/i18n/es.json index 69d57257a..65be8c65a 100644 --- a/src/assets/i18n/es.json +++ b/src/assets/i18n/es.json @@ -175,8 +175,8 @@ "DATA_FILTERS": "Filtros de Fecha", "DATA_TYPE": "Tipo de Dato", "DATASET": "Conjunto de Datos", - "DATASET_DEPRECATION_NOTICE": "Este conjunto de datos está programado para ser eliminado de las interfaces de búsqueda.", - "DATASET_DEPRECATION_NOTICE_TEMP": "This dataset is scheduled to be temporarily removed from searchable interfaces.", + "DATASET_DEPRECATION_NOTICE": "Este conjunto de datos fue eliminado de las interfaces de búsqueda.", + "DATASET_DEPRECATION_NOTICE_TEMP": "Este conjunto de datos fue eliminado temporalmente de las interfaces de búsqueda.", "DATASET_INFO": "Información del conjunto de datos", "DATASET_LINKED": "conjunto_de_datos_vinculado", "DATASETS": "Conjuntos de datos", From 2768025871a2a6d4537e24950962f3f05e7cba4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoreley=20Villafa=C3=B1ez?= Date: Mon, 5 Oct 2026 08:07:26 -0700 Subject: [PATCH 3/6] fix: update USO email address to uso@asf.alaska.edu --- .../selectors/dataset-selector/dataset/dataset.component.html | 4 ++-- .../search-type-selector/search-type-selector.component.html | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html index a0857f168..b03e74383 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html +++ b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html @@ -47,8 +47,8 @@
{{ 'EMAIL' | translate }} - uso@alaska.edu + uso@asf.alaska.edu {{ 'FOR_MORE_INFO' | translate }}
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 ae87bd3f1..38afc8bb3 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 @@ -185,8 +185,8 @@
{{ 'EMAIL' | translate }} - uso@alaska.edu + uso@asf.alaska.edu {{ 'FOR_MORE_INFO' | translate }}
From 619f22e6c646997a91cf309065225c60f9e60ad4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yoreley=20Villafa=C3=B1ez?= Date: Mon, 5 Oct 2026 08:20:59 -0700 Subject: [PATCH 4/6] feat: link legacy dataset notice to Earthdata news release --- .../dataset-selector/dataset/dataset.component.html | 10 ++++++++++ .../search-type-selector.component.html | 12 ++++++++++++ src/assets/i18n/en.json | 2 ++ src/assets/i18n/es.json | 2 ++ 4 files changed, 26 insertions(+) diff --git a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html index b03e74383..07bb1ea5e 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html +++ b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html @@ -51,6 +51,16 @@ >uso@asf.alaska.edu {{ 'FOR_MORE_INFO' | translate }} + + {{ 'DATASET_DEPRECATION_LINK_TEXT' | translate }} + } 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 38afc8bb3..0670548eb 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 @@ -189,6 +189,18 @@ >uso@asf.alaska.edu {{ 'FOR_MORE_INFO' | translate }} + + {{ 'DATASET_DEPRECATION_LINK_TEXT' | translate }} + }
Date: Mon, 5 Oct 2026 11:13:48 -0700 Subject: [PATCH 5/6] fix: disable deprecated datasets and keep referrer on news link --- .../dataset-selector/dataset-selector.component.ts | 7 +++++++ .../dataset-selector/dataset/dataset.component.html | 1 - .../dataset-selector/dataset/dataset.component.scss | 2 ++ .../search-type-selector.component.html | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) 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 fb8fa24d4..37ca8bf5a 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 @@ -98,6 +98,13 @@ export class DatasetSelectorComponent { } public onSelectionChange(dataset: string): void { + const isDeprecated = this.datasets() + ?.find((d) => d.id === dataset) + ?.properties.includes(models.Props.DEPRECATED); + if (isDeprecated) { + return; + } + window.dataLayer = window.dataLayer || []; window.dataLayer.push({ event: 'dataset-selected', diff --git a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html index 07bb1ea5e..e23eaaa36 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html +++ b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.html @@ -55,7 +55,6 @@ class="link" href="https://www.earthdata.nasa.gov/news/selected-historical-asf-datasets-moving-request-only-access" target="_blank" - rel="noopener noreferrer" [attr.aria-label]="'DATASET_DEPRECATION_LINK_ARIA' | translate" (click)="$event.stopPropagation()" > diff --git a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.scss b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.scss index b55d2be24..aec3ed757 100644 --- a/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.scss +++ b/src/app/components/shared/selectors/dataset-selector/dataset/dataset.component.scss @@ -9,6 +9,8 @@ } .dataset-deprecated { + cursor: default; + @include themify($themes) { background: color.adjust(themed('warn'), $lightness: 20%) !important; } 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 0670548eb..36b779555 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 @@ -193,7 +193,6 @@ class="link" href="https://www.earthdata.nasa.gov/news/selected-historical-asf-datasets-moving-request-only-access" target="_blank" - rel="noopener noreferrer" [attr.aria-label]=" 'DATASET_DEPRECATION_LINK_ARIA' | translate " @@ -225,6 +224,7 @@ onOpenDerivedDataset(dataset.download_url, dataset.name) " mat-button + [disabled]="dataset.deprecated" > {{ 'DOWNLOAD' | translate }} From 2600f673124e1cb4da61f2d1103461c5eec6e8c4 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Mon, 5 Oct 2026 15:19:44 -0400 Subject: [PATCH 6/6] fix: remove hidden dataset tests --- e2e/geographic/flight-directions.spec.ts | 7 ------- e2e/geographic/full-search.spec.ts | 4 ---- 2 files changed, 11 deletions(-) diff --git a/e2e/geographic/flight-directions.spec.ts b/e2e/geographic/flight-directions.spec.ts index 1255d518d..64fb71b3a 100644 --- a/e2e/geographic/flight-directions.spec.ts +++ b/e2e/geographic/flight-directions.spec.ts @@ -1,13 +1,6 @@ import { test, expect } from 'e2e/fixtures'; import { sentinel1Page } from 'e2e/helpers'; -test('No direction selections available', async ({ page }) => { - await sentinel1Page(page); - await page.getByRole('button', { name: 'Sentinel-' }).click(); - await page.getByRole('menuitem', { name: 'AIRSAR This dataset' }).click(); - await page.getByRole('button', { name: 'Filters', exact: true }).click(); - await expect(page.getByText('No flight directions to select')).toBeVisible(); -}); test('Two Directions available', async ({ page }) => { await sentinel1Page(page); diff --git a/e2e/geographic/full-search.spec.ts b/e2e/geographic/full-search.spec.ts index 5b8208930..f5835ebd4 100644 --- a/e2e/geographic/full-search.spec.ts +++ b/e2e/geographic/full-search.spec.ts @@ -13,10 +13,6 @@ import { waitForASFAPIResponse, sentinel1Page } from 'e2e/helpers'; { menuSelector: 'ARIA S1 GUNW', expected: 'ARIA S1 GUNW' }, { menuSelector: 'SMAP', expected: 'SMAP' }, { menuSelector: 'UAVSAR', expected: 'UAVSAR' }, - { menuSelector: 'RADARSAT-1', expected: 'RADARSAT-1' }, - { menuSelector: 'ERS This dataset', expected: 'ERS' }, - { menuSelector: 'JERS-1', expected: 'JERS' }, - { menuSelector: 'AIRSAR', expected: 'AIRSAR' }, { menuSelector: 'SEASAT', expected: 'SEASAT' }, ].forEach(({ menuSelector, expected }) => { test(`Validate available dataset: ${expected}`, async ({ page }) => {