Merge pull request #2471 from asfadmin/tyler/aria-version

Aria version filter

Author: tylercchase

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>

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(

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) {

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);
   }

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

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) {

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>
 }
 

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 {

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 }), {}),

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) => {