Merge pull request #1914 from asfadmin/test

Prod Release
asfadmin · Jun 6, 2024 · ad4b4f3 · ad4b4f3
2 parents 0aa8a1a + c56fe3f
commit ad4b4f3
Show file tree

Hide file tree

Showing 27 changed files with 582 additions and 158 deletions.
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -268,6 +268,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
           }
 
           this.store$.dispatch(new hyp3Store.LoadCosts());
+          this.store$.dispatch(new hyp3Store.LoadUser());
         }
 )
     );

diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.html b/src/app/components/header/header-buttons/preferences/preferences.component.html
@@ -71,16 +71,16 @@
 
         <mat-form-field class="default-map">
           <mat-label>{{ 'DEFAULT_MAP_LAYER' | translate }}</mat-label>
-          <mat-select
-            [(ngModel)]="defaultMapLayer"
-            (selectionChange)="onChangeDefaultLayerType($event.value)" name="amount">
-            <mat-option [value]="mapLayerTypes.SATELLITE">
-              {{ mapLayerTypes.SATELLITE | uppercase | translate }}
-            </mat-option>
-            <mat-option [value]="mapLayerTypes.STREET ">
-              {{ mapLayerTypes.STREET | uppercase | translate }}
-            </mat-option>
-          </mat-select>
+           <mat-select
+             [(ngModel)]="defaultMapLayer"
+             (selectionChange)="onChangeDefaultLayerType($event.value)" name="amount">
+             <mat-option [value]="mapLayerTypes.SATELLITE">
+               {{ mapLayerTypes.SATELLITE | uppercase | translate }}
+             </mat-option>
+             <mat-option [value]="mapLayerTypes.STREET ">
+               {{ mapLayerTypes.STREET | uppercase | translate }}
+             </mat-option>
+           </mat-select>
         </mat-form-field>
       </div>
 
@@ -120,6 +120,27 @@
             <mat-icon>refresh</mat-icon>
           </button>
         </mat-form-field>
+        @if(!this.env.isProd) {
+          <mat-form-field class="default-map">
+            <mat-label>Debug Status</mat-label>
+          <mat-select
+               [(ngModel)]="hyp3DebugStatus"
+                (selectionChange)="onDebugStatus($event.value)" name="debugStatus">
+               <mat-option value="NOT_STARTED">
+                NOT_STARTED
+               </mat-option>
+               <mat-option value="PENDING">
+                PENDING
+               </mat-option>
+               <mat-option value="APPROVED">
+                APPROVED
+               </mat-option>
+               <mat-option value="REJECTED">
+                REJECTED
+               </mat-option>
+             </mat-select>
+             </mat-form-field>
+        }
       </div>
 
     </form>

diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.ts b/src/app/components/header/header-buttons/preferences/preferences.component.ts
@@ -2,6 +2,7 @@ import {Component, EventEmitter, OnDestroy, OnInit, Output} from '@angular/core'
 import { Store } from '@ngrx/store';
 import { AppState } from '@store';
 import * as userStore from '@store/user';
+import * as hyp3Store from '@store/hyp3';
 
 import { MatDialogRef } from '@angular/material/dialog';
 import {
@@ -34,6 +35,7 @@ export class PreferencesComponent implements OnInit, OnDestroy {
   public defaultMaxConcurrentDownloads: number;
   public defaultProductTypes: ProductType[];
   public hyp3BackendUrl: string;
+  public hyp3DebugStatus: string;
   public defaultLanguage: string;
 
   public maxResults = [250, 1000, 5000];
@@ -63,6 +65,7 @@ export class PreferencesComponent implements OnInit, OnDestroy {
     private dialogRef: MatDialogRef<PreferencesComponent>,
     private store$: Store<AppState>,
     private hyp3: Hyp3Service,
+    public env: services.EnvironmentService,
     private themeService: ThemingService,
     public translate: TranslateService,
     public language: AsfLanguageService,
@@ -186,6 +189,10 @@ export class PreferencesComponent implements OnInit, OnDestroy {
       this.setTheme(`theme-${this.currentTheme}`);
     }
   }
+  public onDebugStatus(status: models.ApplicationStatus) {
+    this.hyp3DebugStatus = status;
+    this.store$.dispatch(new hyp3Store.SetDebugStatus(status))
+  }
 
   public setTheme(themeName: string) {
     this.themeService.setTheme(themeName);

diff --git a/...onents/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html b/...onents/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html
@@ -91,7 +91,7 @@
     <ng-template #emptyQueue>
       <div class="empty-queue">
         <div class="jobs-empty-message">
-          {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' |  translate }}.
+          {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' |  translate }}
         </div>
         <div class="jobs-empty-message-docs-link">
           <a href="https://hyp3-docs.asf.alaska.edu/" target="_blank">
-Original file line number
+Diff line change
@@ Expand Up @@
               }
               this.store$.dispatch(new hyp3Store.LoadCosts());
+              this.store$.dispatch(new hyp3Store.LoadUser());
             }
     )
         );
@@ Expand Down @@