Merge branch 'test' into tyler/playwright-initial

tylercchase · web-flow · commit af62ab60eb11 · 2026-03-10T13:34:31.000-04:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -13,19 +13,19 @@
   },
   "private": true,
   "dependencies": {
-    "@angular/animations": "^21.1.0",
-    "@angular/cdk": "^21.1.0",
-    "@angular/cli": "^21.1.5",
-    "@angular/common": "^21.1.0",
-    "@angular/compiler": "^21.1.0",
-    "@angular/compiler-cli": "^21.1.0",
-    "@angular/core": "^21.1.0",
-    "@angular/forms": "^21.1.0",
-    "@angular/material": "^21.1.0",
-    "@angular/material-moment-adapter": "^21.1.0",
-    "@angular/platform-browser": "^21.1.0",
-    "@angular/platform-browser-dynamic": "^21.1.0",
-    "@angular/router": "^21.1.0",
+    "@angular/animations": "^21.2.2",
+    "@angular/cdk": "^21.2.1",
+    "@angular/cli": "^21.2.1",
+    "@angular/common": "^21.2.2",
+    "@angular/compiler": "^21.2.2",
+    "@angular/compiler-cli": "^21.2.2",
+    "@angular/core": "^21.2.2",
+    "@angular/forms": "^21.2.2",
+    "@angular/material": "^21.2.1",
+    "@angular/material-moment-adapter": "^21.2.1",
+    "@angular/platform-browser": "^21.2.2",
+    "@angular/platform-browser-dynamic": "^21.2.2",
+    "@angular/router": "^21.2.2",
     "@babel/core": "^7.14.2",
     "@formatjs/intl-displaynames": "^6.2.6",
     "@fortawesome/angular-fontawesome": "^0.10.2",
@@ -56,7 +56,6 @@
     "buffer": "^6.0.3",
     "cookieconsent": "^3.1.1",
     "core-js": "^3.12.1",
-    "css-loader": "^3.6.0",
     "d3": "^7.4.4",
     "deep-extend": "^0.6.0",
     "file-saver": "^2.0.5",
@@ -74,7 +73,6 @@
     "ngx-csv-parser": "^1.3.1",
     "ngx-toastr": "^19.0.0",
     "nouislider": "^15.6.1",
-    "npm": "^11.10.1",
     "ol": "^7.4.0",
     "popper.js": "^1.16.1",
     "postcss": "^8.3.4",
@@ -97,21 +95,21 @@
     "zone.js": "~0.15.1"
   },
   "devDependencies": {
-    "@angular/build": "^21.1.0",
-    "@angular/language-service": "^21.1.0",
+    "@angular/build": "^21.2.1",
+    "@angular/language-service": "^21.2.2",
     "@ngrx/schematics": "^21.0.1",
     "@playwright/test": "1.57.0",
     "@vitest/coverage-v8": "^4.0.17",
-    "angular-eslint": "21.1.0",
+    "angular-eslint": "21.3.0",
     "canvas": "^3.2.1",
-    "esbuild": "0.20.0",
+    "esbuild": "^0.27.3",
     "eslint": "^9.35.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-prettier": "^5.5.4",
     "jsdom": "^27.4.0",
     "playwright-ng-schematics": "21.0.3",
     "prettier": "3.6.2",
-    "stylelint": "^13.13.1",
+    "stylelint": "^17.4.0",
     "stylelint-config-standard": "^19.0.0",
     "ts-node": "^8.10.2",
     "typescript-eslint": "8.40.0",
diff --git a/src/app/components/header/info-bar/info-bar.component.html b/src/app/components/header/info-bar/info-bar.component.html
@@ -213,6 +213,13 @@
           </span>
         }
       </span>
+      <span>
+        @if (!!ariaVersion) {
+          <span>
+            <b> {{ 'ARIA_VERSION' | translate }}:</b> {{ ariaVersion }}
+          </span>
+        }
+      </span>
     </div>
     <div class="last-info">
       <app-ci-search></app-ci-search>
diff --git a/src/app/components/header/info-bar/info-bar.component.ts b/src/app/components/header/info-bar/info-bar.component.ts
@@ -82,6 +82,7 @@ export class InfoBarComponent implements OnInit, OnDestroy {
   public jobIds: string[];
   public selectedDataset: string;
   public selectedDatasetIsNISARFormat = false;
+  public ariaVersion: string;
 
   private subs = new SubSink();
 
@@ -240,6 +241,9 @@ export class InfoBarComponent implements OnInit, OnDestroy {
       .subscribe(
         (productionConfig) => (this.productionConfig = productionConfig),
       );
+    const ariaVersionSub = this.store$
+      .select(filtersStore.getAriaVersion)
+      .subscribe((version) => (this.ariaVersion = version));
     [
       startSub,
       endSub,
@@ -272,6 +276,7 @@ export class InfoBarComponent implements OnInit, OnDestroy {
       productionConfigSub,
       scienceProductsSub,
       jobIdsSub,
+      ariaVersionSub,
     ].forEach((sub) => this.subs.add(sub));
 
     this.subs.add(
diff --git a/src/app/components/shared/scene-metadata/scene-metadata.component.html b/src/app/components/shared/scene-metadata/scene-metadata.component.html
@@ -476,6 +476,19 @@
       <li>
         <b> {{ 'ARIA_VERSION' | translate }} </b> •
         {{ scene.metadata.ariaVersion }}
+        @if (isGeoSearch()) {
+          <mat-icon
+            [matMenuTriggerFor]="addAriaVersionMenu"
+            class="v-mid clickable"
+          >
+            settings
+          </mat-icon>
+        }
+        <mat-menu #addAriaVersionMenu="matMenu">
+          <button (click)="setAriaVersion()" mat-menu-item>
+            {{ 'SET_ARIA_VERSION' | translate }}
+          </button>
+        </mat-menu>
       </li>
     }
     @if (dataset.source; as source) {
diff --git a/src/app/components/shared/scene-metadata/scene-metadata.component.ts b/src/app/components/shared/scene-metadata/scene-metadata.component.ts
@@ -211,6 +211,12 @@ export class SceneMetadataComponent implements OnInit, OnDestroy {
     );
   }
 
+  public setAriaVersion(): void {
+    this.store$.dispatch(
+      new filtersStore.setAriaVersion(this.scene.metadata.ariaVersion),
+    );
+  }
+
   private capitalizeFirstLetter(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
   }
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
@@ -139,6 +139,18 @@
     </mat-hint> -->
     </mat-form-field>
   }
+  @if (dataset.apiValue.dataset === 'ARIA S1 GUNW') {
+    <mat-form-field>
+      <mat-label> Version Number </mat-label>
+      <input
+        matInput
+        type="text"
+        placeholder="3.0.1"
+        (input)="onNewAriaVersionSelected($event.target.value)"
+        [(ngModel)]="ariaVersion"
+      />
+    </mat-form-field>
+  }
 
   @if (dataset.id === 'NISAR') {
     <app-short-name-selector
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
@@ -9,7 +9,12 @@ 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 {
+  MatFormField,
+  MatHint,
+  MatInput,
+  MatLabel,
+} 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';
@@ -27,6 +32,7 @@ import { TranslateModule } from '@ngx-translate/core';
 
     MatOption,
     MatHint,
+    MatLabel,
     MatInput,
     ShortNameSelectorComponent,
     TranslateModule,
@@ -43,6 +49,7 @@ export class OtherSelectorComponent implements OnInit, OnDestroy {
   polarizations: models.DatasetPolarizations;
   subtypes: models.DatasetSubtypes;
   groupID: string;
+  ariaVersion: string;
 
   public datasetProductTypes$ = this.store$.select(
     filtersStore.getProductTypes,
@@ -55,7 +62,6 @@ export class OtherSelectorComponent implements OnInit, OnDestroy {
   public selectedDataset$ = this.store$.select(filtersStore.getSelectedDataset);
   public subtypes$ = this.store$.select(filtersStore.getSubtypes);
   public groupID$ = this.store$.select(filtersStore.getGroupID);
-
   public flightDirectionTypes = models.flightDirections;
   public p = models.Props;
   private subs = new SubSink();
@@ -96,6 +102,11 @@ export class OtherSelectorComponent implements OnInit, OnDestroy {
     this.subs.add(
       this.groupID$.subscribe((groupID) => (this.groupID = groupID)),
     );
+    this.subs.add(
+      this.store$
+        .select(filtersStore.getAriaVersion)
+        .subscribe((version) => (this.ariaVersion = version)),
+    );
   }
 
   public onNewDatasetBeamModes(beamModes: string[]): void {
@@ -127,6 +138,9 @@ export class OtherSelectorComponent implements OnInit, OnDestroy {
   public onNewSubtypeSelected(subtypes): void {
     this.store$.dispatch(new filtersStore.SetSubtypes(subtypes));
   }
+  public onNewAriaVersionSelected(version): void {
+    this.store$.dispatch(new filtersStore.setAriaVersion(version));
+  }
 
   public onNewGroupID(): void {
     if (this.groupID.length > 29) {
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
@@ -151,6 +151,11 @@
         {{ 'JOINT_OBSERVATION_ONLY' | translate }}
       </div>
     }
+    @if (filters.ariaVersion) {
+      <div>
+        <b>{{ 'ARIA_VERSION' | translate }}:</b> {{ filters.ariaVersion }}
+      </div>
+    }
   </div>
 }
 
diff --git a/src/app/models/search.model.ts b/src/app/models/search.model.ts
@@ -102,6 +102,8 @@ export interface GeographicFiltersType {
   rangeBandwidth: string[];
   instrument: string[];
   groupID: null | string;
+
+  ariaVersion?: string;
 }
 
 export interface SarviewsFiltersType {
diff --git a/src/app/services/search-params.service.ts b/src/app/services/search-params.service.ts
@@ -89,6 +89,12 @@ export class SearchParamsService {
     })),
   );
 
+  private ariaVersion$ = this.store$.select(filterStore.getAriaVersion).pipe(
+    map((ariaVersion) => ({
+      ariaVersion,
+    })),
+  );
+
   private searchPolygon$ = combineLatest([
     this.mapService.searchPolygon$.pipe(startWith(null)),
     this.store$.select(filterStore.getShouldOmitSearchPolygon),
@@ -307,6 +313,7 @@ export class SearchParamsService {
     // this.operaCalibrationParam$,
     this.sciProducts$,
     this.groupID$,
+    this.ariaVersion$,
   ]).pipe(
     map((params: any[]) =>
       params.reduce((total, param) => ({ ...total, ...param }), {}),
diff --git a/src/app/services/url-state.service.ts b/src/app/services/url-state.service.ts
@@ -820,6 +820,13 @@ export class UrlStateService {
         ),
         loader: this.loadProduction,
       },
+      {
+        name: 'ariaVersion',
+        source: this.store$
+          .select(filterStore.getAriaVersion)
+          .pipe(map((ariaVersion) => ({ ariaVersion }))),
+        loader: this.loadAriaVersion,
+      },
       {
         name: 'useFrameForBaseline',
         source: this.store$
@@ -1342,6 +1349,10 @@ export class UrlStateService {
     return new filterStore.SetUseFrameForBaseline(!!usingseFrameForBaseline);
   };
 
+  private loadAriaVersion = (version: string): Action => {
+    return new filterStore.setAriaVersion(version);
+  };
+
   private loadSeriesState = (seriesState) => {
     const states: models.timeseriesChartItemState[] = [];
     seriesState.split('::').forEach((x) => {
diff --git a/src/app/store/filters/filters.action.ts b/src/app/store/filters/filters.action.ts
@@ -108,6 +108,8 @@ export enum FiltersActionType {
   SET_SCIENCE_PRODUCT = '[Filters] Set Science Product',
   SET_PRODUCTION_CONFIG = '[Filters] Set Production Config',
 
+  SET_ARIA_VERSION = '[Filters] Set ARIA Version',
+
   SET_USER_FRAME_FOR_BASELINE = '[Filters] Set if frame(s) used for baseline/sbas searches as reference scene',
 }
 
@@ -516,6 +518,12 @@ export class setProductionConfig implements Action {
   constructor(public payload: string[]) {}
 }
 
+export class setAriaVersion implements Action {
+  public readonly type = FiltersActionType.SET_ARIA_VERSION;
+
+  constructor(public payload: string) {}
+}
+
 export class SetUseFrameForBaseline implements Action {
   public readonly type = FiltersActionType.SET_USER_FRAME_FOR_BASELINE;
 
@@ -596,4 +604,5 @@ export type FiltersActions =
   | setIntstrument
   | setScienceProduct
   | setProductionConfig
+  | setAriaVersion
   | SetUseFrameForBaseline;
diff --git a/src/app/store/filters/filters.reducer.ts b/src/app/store/filters/filters.reducer.ts
@@ -72,6 +72,7 @@ export interface FiltersState {
   groupID: null | string;
 
   useFramesForReference: boolean;
+  ariaVersion: string;
 }
 
 export type DateRangeState = models.Range<null | Date>;
@@ -157,6 +158,7 @@ export const initState: FiltersState = {
   shortNames: [],
 
   useFramesForReference: false,
+  ariaVersion: null,
 };
 
 export function filtersReducer(
@@ -194,6 +196,7 @@ export function filtersReducer(
         shortNames: [],
         useCalibrationData: false,
         selectedMission: null,
+        ariaVersion: null,
       };
     }
 
@@ -470,6 +473,7 @@ export function filtersReducer(
         rangeBandwidth: [],
         scienceProduct: [],
         productionConfig: [],
+        ariaVersion: null,
       };
     }
 
@@ -773,6 +777,7 @@ export function filtersReducer(
           rangeBandwidth: filters.rangeBandwidth || [],
           instrument: filters.instrument || [],
           groupID: filters.groupID,
+          ariaVersion: filters.ariaVersion,
         };
       }
     }
@@ -954,6 +959,12 @@ export function filtersReducer(
         useFramesForReference: action.payload,
       };
     }
+    case FiltersActionType.SET_ARIA_VERSION: {
+      return {
+        ...state,
+        ariaVersion: action.payload,
+      };
+    }
     default: {
       return state;
     }
@@ -1149,6 +1160,7 @@ export const getGeographicSearch = createSelector(
     rangeBandwidth: state.rangeBandwidth,
     instrument: state.instrument,
     groupID: state.groupID,
+    ariaVersion: state.ariaVersion,
   }),
 );
 
@@ -1306,3 +1318,7 @@ export const getShouldUseFramesForReference = createSelector(
   getFiltersState,
   (state: FiltersState) => state.useFramesForReference,
 );
+export const getAriaVersion = createSelector(
+  getFiltersState,
+  (state: FiltersState) => state.ariaVersion,
+);

Original file line number	Diff line number	Diff line change
`@@ -211,6 +211,12 @@ export class SceneMetadataComponent implements OnInit, OnDestroy {`
`211`	`211`	`);`
`212`	`212`	`}`
`213`	`213`
	`214`	`+ public setAriaVersion(): void {`
	`215`	`+ this.store$.dispatch(`
	`216`	`+ new filtersStore.setAriaVersion(this.scene.metadata.ariaVersion),`
	`217`	`+ );`
	`218`	`+ }`
	`219`	`+`
`214`	`220`	`private capitalizeFirstLetter(str) {`
`215`	`221`	`return str.charAt(0).toUpperCase() + str.slice(1);`
`216`	`222`	`}`
Original file line number	Diff line number	Diff line change
`@@ -151,6 +151,11 @@`
`151`	`151`	`{{ 'JOINT_OBSERVATION_ONLY' \| translate }}`
`152`	`152`	`</div>`
`153`	`153`	`}`
	`154`	`+ @if (filters.ariaVersion) {`
	`155`	`+ <div>`
	`156`	`+ <b>{{ 'ARIA_VERSION' \| translate }}:</b> {{ filters.ariaVersion }}`
	`157`	`+ </div>`
	`158`	`+ }`
`154`	`159`	`</div>`
`155`	`160`	`}`
`156`	`161`
Original file line number	Diff line number	Diff line change
`@@ -102,6 +102,8 @@ export interface GeographicFiltersType {`
`102`	`102`	`rangeBandwidth: string[];`
`103`	`103`	`instrument: string[];`
`104`	`104`	`groupID: null \| string;`
	`105`	`+`
	`106`	`+ ariaVersion?: string;`
`105`	`107`	`}`
`106`	`108`
`107`	`109`	`export interface SarviewsFiltersType {`