Prod release

README.md

@@ -47,6 +47,7 @@ Add the following line via the methods below to set up local.asf.alaska.edu to p
 | Windows | Modify c:\windows\system32\drivers\etc\hosts as Administrator |
 ```
 ng serve --port 4444 --host local.asf.alaska.edu
+ng serve --port 4445 --ssl true --host local.asf.alaska.edu
 ```
 
 ### Setting up HTTPS

src/app/components/baseline-chart/baseline-chart.component.ts

@@ -104,6 +104,8 @@ export class BaselineChartComponent implements OnInit, OnDestroy {
           if (selected) {
             const selectedPoint = this.productToPoint(selected);
             this.setDataset(ChartDatasets.SELECTED, [selectedPoint]);
+          } else {
+            this.setDataset(ChartDatasets.SELECTED, [])
           }
 
           this.setDataset(ChartDatasets.PRODUCTS, points);

src/app/components/header/header.component.scss

@@ -48,9 +48,9 @@ $config: mat.define-legacy-typography-config();
   height: auto;
   position: fixed;
   top: 100px;
-  z-index: 1;
+  z-index: 2;
   margin: 0;
-  padding: 3px 16px 16px;
+  padding: 3px 16px 25px;
 }
 
 .breadcrumb {

src/app/components/results-menu/scenes-list/scenes-list.component.ts

@@ -361,6 +361,42 @@ export class ScenesListComponent implements OnInit, OnDestroy, AfterContentInit
         )
     );
 
+    this.subs.add(
+        combineLatest([
+          this.scenesService.scenes$,
+          this.store$.select(scenesStore.getSelectedScene)
+        ]).pipe(
+          debounceTime(50),
+        ).subscribe(([scenes, selectedScene]: any) => {
+          if(scenes && selectedScene) {
+            if(scenes.slice(0, this.numberProductsInList).findIndex((value) => {
+              return value.id === selectedScene.id;
+            }) === -1) {
+              this.selectedFromList = false;
+              this.store$.dispatch(new scenesStore.SetSelectedScene(null))
+            }
+          }
+        })
+      )
+
+      this.subs.add(
+        combineLatest([
+          this.pairService.pairs$,
+          this.store$.select(scenesStore.getSelectedPair)
+        ]).pipe(
+          debounceTime(50)
+        ).subscribe(([pairs, selectedPair]: any) => {
+          if(!selectedPair){
+            return
+          }
+          if([...pairs.pairs, ...pairs.custom].findIndex((value) => {
+            return value[0].id === selectedPair[0].id && value[1].id === selectedPair[1].id
+          }) === -1) {
+            this.selectedFromList = false;
+            this.store$.dispatch(new scenesStore.SetSelectedPair(null))
+          }
+        })
+      )
   }
 
   ngAfterContentInit() {

src/app/components/shared/aoi-options/draw-selector/draw-selector.component.html

@@ -72,6 +72,7 @@
   <button mat-menu-item
     *ngIf="breakpoint !== breakpoints.MOBILE"
     (click)="onImportSelected()"
+    [disabled]="breakpoint <= breakpoints.SMALL"
     class="control-mat-button-toggle">
     <mat-icon class="interaction-icon">upload</mat-icon>
     {{'UPLOAD_GEOSPATIAL_FILE' | translate}}

src/app/components/shared/docs-modal/docs-modal-iframe.scss

@@ -14,11 +14,13 @@
 }
 
 .mat-mdc-dialog-content {
-  max-height: calc(100% - 80px);
+  max-height: calc(100% - 75px);
+  padding: 0;
+  margin: -3px 0 0 0
 }
 
 .mat-mdc-dialog-actions {
-  padding: 16px 0 8px;
+  padding: 18px 30px;
 }
 
 .content-hr {

src/app/components/shared/docs-modal/docs-modal.component.ts

@@ -21,6 +21,8 @@
 import { Component, Input, OnInit, Inject } from '@angular/core';
 import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog';
 import { DomSanitizer } from '@angular/platform-browser';
+import { TranslateService } from "@ngx-translate/core";
+
 
 export interface DialogData {
   rawUrl: string;
@@ -41,11 +43,15 @@ export class DocsModalComponent implements OnInit {
   public safeDocURL: any;
 
   constructor(public dialog: MatDialog,
-              private _sanitizer: DomSanitizer) {}
+              public translate: TranslateService,
+              private _sanitizer: DomSanitizer) {
+  }
 
   ngOnInit(): void {
-    this.docURL = ( this.url ) ? this.url : 'https://docs.asf.alaska.edu';
-    this.safeDocURL = this._sanitizer.bypassSecurityTrustResourceUrl(this.docURL);
+    this.docURL = (this.url) ? this.url : 'https://docs.asf.alaska.edu';
+    let tempURL = this.docsLanguageAdjust(this.docURL);
+    this.safeDocURL = this._sanitizer.bypassSecurityTrustResourceUrl(tempURL);
+
   }
 
   public showDoc() {
@@ -73,6 +79,20 @@ export class DocsModalComponent implements OnInit {
     const domain = (new URL(url)).hostname.replace('www.', '');
     return domain.includes('asf.alaska.edu');
   }
+
+  public docsLanguageAdjust(url: string): string {
+    let langCode = this.translate.currentLang;
+    if (langCode === 'es') {
+      url = this.insertLangCode(url, langCode);
+    }
+    return url;
+  }
+
+  public insertLangCode(url: string, langCode: string): string {
+    let newUrl = url.replace('.edu/', '.edu/' + langCode + '/');
+    return newUrl;
+  }
+
 }
 
 @Component({

src/app/components/shared/scene-metadata/scene-metadata.component.html

@@ -210,6 +210,10 @@
   </li>
 
 
+  <li *ngIf="!!scene.metadata.ariaVersion">
+    <b> {{'ARIA_VERSION' | translate }} </b> • {{scene.metadata.ariaVersion}}
+  </li>
+
   <li *ngIf="dataset.source as source" class="detail-item-margin">
     <a *ngIf="source.url" [href]="source.url" target="_blank"> {{'DATA_COURTESY_OF' | translate}} {{ dataset.source.name }}</a>
     <span *ngIf="!source.url" class="faint-text"> {{'DATA_COURTESY_OF' | translate}} {{ dataset.source.name }}</span>

src/app/models/cmr-product.model.ts

@@ -70,6 +70,9 @@ export interface CMRProductMetadata {
   // BURST XML, OPERA-S1
   subproducts: any[];
   parentID: string;
+
+  // ARIA S1 GUNW
+  ariaVersion: string | null;
 }
 
 export interface SLCBurstMetadata {

src/app/services/possible-hyp3-jobs.service.ts

@@ -40,7 +40,9 @@ export class PossibleHyp3JobsService {
     ));
 
   private hyp3ableJobsSBAS$ = combineLatest([
-    this.possibleProductJobs$,
+    this.pairService.productsFromPairs$.pipe(map(
+    products => products.map(p => [p])
+    )),
     this.pairs$,
   ]).pipe(
     map(([possibleJobs, {pairs, custom}]) => {

src/app/services/product.service.ts

@@ -94,7 +94,8 @@ export class ProductService {
       opera: g.s1o ? g.s1o : null,
       pgeVersion: g.pge !== null ? parseFloat(g.pge) : null,
       subproducts: [],
-      parentID: null
+      parentID: null,
+      ariaVersion: g.ariav ? g.ariav : null
     })
 
   private isNumber = n => !isNaN(n) && isFinite(n);

src/app/store/scenes/scenes.reducer.ts

@@ -426,12 +426,14 @@ function arrayEquals(a, b) {
   return Array.isArray(a) &&
     Array.isArray(b) &&
     a.length === b.length &&
-    a.toString() === b.toString() &&
     a.every((value, index) => {
       if(Array.isArray(value) && Array.isArray(b[index])) {
         return arrayEquals(value, b[index])
       } else {
-        value.id === b[index].id
+        return b.findIndex((b_value) =>
+        {
+          return b_value?.id === value?.id && b_value.metadata.date === value.metadata.date
+        }) >= 0
       }
     }
     )

src/assets/i18n/en.json

@@ -62,6 +62,7 @@
   "AREA_OF_INTEREST": "Area Of Interest",
   "AREA_OF_INTEREST_OPTIONS": "Area of Interest Options",
   "AREA_OF_INTEREST_WKT": "Area of Interest • WKT",
+  "ARIA_VERSION": "ARIA Version",
   "ARROW_BACKWARD": "arrow_backward",
   "ARROW_FORWARD": "arrow_forward",
   "ASCENDING": "Ascending",

src/assets/i18n/es.json

@@ -62,6 +62,7 @@
   "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_VERSION": "Versión ARIA",
   "ARROW_BACKWARD": "flecha_hacia atrás",
   "ARROW_FORWARD": "flecha_adelante",
   "ASCENDING": "Ascendente",