From 4d508276584d9caa9d58c877f3444a1e7132b814 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Mon, 20 May 2024 13:55:18 -0400 Subject: [PATCH 01/31] feat: basic modal skeleton --- .../processing-queue.component.html | 157 ++++++++++-------- .../processing-queue.component.ts | 19 ++- .../processing-queue.module.ts | 4 +- .../processing-signup/index.ts | 2 + .../processing-signup.component.html | 87 ++++++++++ .../processing-signup.component.scss | 10 ++ .../processing-signup.component.ts | 10 ++ .../processing-signup.module.ts | 36 ++++ src/app/models/hyp3.model.ts | 1 + 9 files changed, 251 insertions(+), 75 deletions(-) create mode 100644 src/app/components/header/processing-queue/processing-signup/index.ts create mode 100644 src/app/components/header/processing-queue/processing-signup/processing-signup.component.html create mode 100644 src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss create mode 100644 src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts create mode 100644 src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 8fb339274..96ba7c0ee 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -59,7 +59,14 @@ - + @if(userStatus === 'NOT_STARTED' || userStatus === 'PENDING') { + + } + @if (!this.isSignupSelected) { +
+
+
+ {{ 'SIGN_IN_TO_PROCESS_DATA' | translate }} +
+
+ +
-
- -
-
-
-

- {{ hyp3JobTypes[selectedJobTypeId].description | translate }} - [MORE] -

+ +
+
+
+

+ {{ hyp3JobTypes[selectedJobTypeId].description | translate }} + [MORE] +

+
+ + +
- - -
-
- -
-
- - -
-
-
-
- {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} -
-
- ({{ allJobs.length - remaining }} extra job{{ (allJobs.length - remaining) === 1 ? '' : 's' }}) -
-
- -
-
- {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }} + +
+
+ + +
+
+
+
+ {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} +
+
+ ({{ allJobs.length - remaining }} extra job{{ (allJobs.length - remaining) === 1 ? '' : 's' }}) +
-
- + +
+
+ {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }} +
+
+ +
-
- -
-
- - + +
+
+ + +
-
- -
-
- - + +
+
+ + +
-
+ } + @else { + + } diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 579172c27..38087f8cb 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -19,7 +19,8 @@ import * as services from '@services'; enum ProcessingQueueTab { SCENES = 'Scenes', - OPTIONS = 'Options' + OPTIONS = 'Options', + SIGNUP = 'Signup' } @Component({ @@ -67,6 +68,10 @@ export class ProcessingQueueComponent implements OnInit { public errorHeaderHeight = 0; public progress = null; + + public userStatus = 'NOT_STARTED'; + public isSignupSelected = false; + constructor( public authService: services.AuthService, public env: services.EnvironmentService, @@ -144,6 +149,8 @@ export class ProcessingQueueComponent implements OnInit { this.user = user.user_id; this.isUnlimitedUser = user.quota.unlimited; this.remaining = user.quota.remaining; + this.userStatus = user.application_status; + this.userStatus = 'NOT_STARTED'; } ); @@ -330,6 +337,8 @@ export class ProcessingQueueComponent implements OnInit { this.jobs = this.allJobs.filter( job => job.job_type.id === this.selectedJobTypeId ); + + this.isSignupSelected = false; } public onRemoveJob(job: models.QueuedHyp3Job): void { @@ -430,5 +439,13 @@ export class ProcessingQueueComponent implements OnInit { private selectDefaultJobType(): void { this.selectedJobTypeId = !!this.hyp3JobTypesList[0] ? this.hyp3JobTypesList[0].id : null; + if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING') { + this.isSignupSelected = true; + this.selectedJobTypeId = null; + } + } + public openSignup(): void { + this.isSignupSelected = true; + this.selectedJobTypeId = null; } } diff --git a/src/app/components/header/processing-queue/processing-queue.module.ts b/src/app/components/header/processing-queue/processing-queue.module.ts index 16833021d..a88751901 100644 --- a/src/app/components/header/processing-queue/processing-queue.module.ts +++ b/src/app/components/header/processing-queue/processing-queue.module.ts @@ -21,6 +21,7 @@ import { PipesModule } from '@pipes'; import { ProcessingQueueComponent } from './processing-queue.component'; import { ProcessingQueueJobsModule } from './processing-queue-jobs'; import { ProcessingOptionsModule } from './processing-options'; +import { ProcessingSignupModule } from './processing-signup'; import { MatDialogModule } from '@angular/material/dialog'; import { QueueSubmitComponent } from './queue-submit/queue-submit.component'; import { ResizableModule } from 'angular-resizable-element'; @@ -38,7 +39,7 @@ import { SharedModule } from '@shared'; declarations: [ ProcessingQueueComponent, QueueSubmitComponent, - ConfirmationComponent + ConfirmationComponent, ], imports: [ CommonModule, @@ -56,6 +57,7 @@ import { SharedModule } from '@shared'; ProjectNameSelectorModule, ProcessingQueueJobsModule, ProcessingOptionsModule, + ProcessingSignupModule, MatDialogModule, ResizableModule, ResizedEventModule, diff --git a/src/app/components/header/processing-queue/processing-signup/index.ts b/src/app/components/header/processing-queue/processing-signup/index.ts new file mode 100644 index 000000000..25158301e --- /dev/null +++ b/src/app/components/header/processing-queue/processing-signup/index.ts @@ -0,0 +1,2 @@ +export { ProcessingSignupComponent } from './processing-signup.component'; +export { ProcessingSignupModule } from './processing-signup.module'; diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html new file mode 100644 index 000000000..946afd12e --- /dev/null +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -0,0 +1,87 @@ +
+
+

Request On Demand Access

+

Thank you for your interest in ASF's On Demand processing service. + + This service allows users to submit Sentinel-1 acquisitions for conversion to analysis-ready products, + including Radiometric Terrain Corrected (RTC) SAR Backscatter and Interferometric SAR (InSAR). Products are + generated using HyP3, ASF's cloud-based processing platform. Finished products can be downloaded for use in + a variety of analysis workflows. + + These services are provided at no cost to the user, and anyone can request access. To ensure that processing + is equitably distributed throughout the user community, each user can only register one Earthdata Login + account for use with ASF's On Demand service. +

+
+

Verify your Earthdata Login profile information

+ Please review your Earthdata Login profile information below. We will use the email address listed to notify + you of your approval status. + + If any of this information is incorrect, please update your Earthdata Login profile and then refresh this + page to view your updated information. +
    +
  • Name: John Doe
    • +
  • Username: username
    • +
  • Email Address: user@example.com
    • +
  • Organization: Example Organization/li> +
  • Country: Example Country
    • +
+ Yes, my Earthdata Login profile information is correct and I will monitor + user@example.com for status updates. +
+
+

How do you want to use our service?

+

Please provide a short description (1-5 sentences) of how and why you would like to use ASF's On Demand + products. Expand the section below for some examples.

+ + + + Examples + + + + Example 1: + + I am a + master's student in volcanology at the University of ___, and would + like to analyze inflation dynamics of volcanoes in my area using InSAR time series analysis + with mintpy software. I don't have the time or resources necessary to generate the InSAR + time series I would need for my analysis, and would like to use On Demand InSAR products as + my input for mintpy. + + + + Example 2: + + I am a + GIS specialist for an insurance company, and I use a variety of resources to evaluate crop + damage caused by natural disasters. I have not used SAR in the past, but I recently attended + a webinar on using SAR for monitoring the impacts of natural disasters. I would like to see + if RTC images could provide useful insights into crop damage. + + + + Example 3: + + I'm a + hydrologist for a government agency that monitors water resources. I have worked with SAR + extensively, and could process my own analysis-ready products, but a colleague mentioned + this service to me. It would be a more efficient use of my time to use On Demand InSAR and + RTC products for monitoring groundwater use and surface water extent dynamics. + + + + + +
+
+ + How do you want to use our service? + + +
+ + +
+ +
\ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss new file mode 100644 index 000000000..824fecbb7 --- /dev/null +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss @@ -0,0 +1,10 @@ +@import "asf-theme"; +.container { + @include themify($themes) { + color: themed('dark-primary-text'); + } +} +.data-list b { + width: 120px; + display: inline-block; +} \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts new file mode 100644 index 000000000..ce3626114 --- /dev/null +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -0,0 +1,10 @@ +import { Component } from '@angular/core'; + +@Component({ + selector: 'app-processing-signup', + templateUrl: './processing-signup.component.html', + styleUrl: './processing-signup.component.scss' +}) +export class ProcessingSignupComponent { + +} diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts new file mode 100644 index 000000000..32dd89161 --- /dev/null +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts @@ -0,0 +1,36 @@ +import { NgModule } from '@angular/core'; +import { CommonModule } from '@angular/common'; +import {MatExpansionModule} from '@angular/material/expansion'; +import { MatSelectModule } from '@angular/material/select'; +import { ProcessingSignupComponent } from './processing-signup.component'; +import { FormsModule } from '@angular/forms'; + +import { MatChipsModule } from '@angular/material/chips'; +import { MatSharedModule } from '@shared'; +import { PipesModule } from '@pipes'; +import { SharedModule } from '@shared'; +import { MatCheckboxModule } from '@angular/material/checkbox'; +import { MatFormFieldModule } from '@angular/material/form-field'; +import { MatInputModule } from '@angular/material/input'; + + +@NgModule({ + declarations: [ProcessingSignupComponent], + imports: [ + CommonModule, + PipesModule, + MatSharedModule, + MatSelectModule, + MatChipsModule, + MatExpansionModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + FormsModule, + SharedModule + ], + exports: [ + ProcessingSignupComponent + ] +}) +export class ProcessingSignupModule { } diff --git a/src/app/models/hyp3.model.ts b/src/app/models/hyp3.model.ts index 2d699d45e..4396a6de5 100644 --- a/src/app/models/hyp3.model.ts +++ b/src/app/models/hyp3.model.ts @@ -24,6 +24,7 @@ export interface Hyp3JobSubmission { } export interface Hyp3User { + application_status: string; quota: Hyp3UserQuota; user_id: string; job_names: string[]; From 3b8df391830020d0c0a2dcee200e488887dd6f11 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 21 May 2024 11:08:31 -0400 Subject: [PATCH 02/31] feat: form functionality and queue messages --- .../processing-queue.component.html | 340 ++++++++---------- .../processing-queue.component.ts | 11 +- .../processing-signup.component.html | 17 +- .../processing-signup.component.ts | 13 + .../processing-signup.module.ts | 9 +- 5 files changed, 188 insertions(+), 202 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 96ba7c0ee..80138dd59 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -1,19 +1,11 @@ -
+
- +
@@ -26,7 +18,7 @@ {{ 'ON_DEMAND' | translate }}
- {{ 'POWERED_BY_HY_P3' | translate }} + {{ 'POWERED_BY_HY_P3' | translate }}
@@ -40,38 +32,33 @@
- -
+
close
- @if (!this.isSignupSelected) { -
-
-
- {{ 'SIGN_IN_TO_PROCESS_DATA' | translate }} -
-
- -
+
+
+
+ {{ 'SIGN_IN_TO_PROCESS_DATA' | translate }}
- -
-
-
-

- {{ hyp3JobTypes[selectedJobTypeId].description | translate }} - [MORE] -

-
- - - +
+ +
+
+ +
+
+
+

+ {{ hyp3JobTypes[selectedJobTypeId].description | translate }} + [MORE] +

+ + +
- -
-
- - -
-
-
-
- {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} -
-
- ({{ allJobs.length - remaining }} extra job{{ (allJobs.length - remaining) === 1 ? '' : 's' }}) -
+
+ +
+
+ + +
+
+
+
+ {{ 'TOO_MANY_JOBS_IN_QUEUE' | translate }} +
+
+ ({{ allJobs.length - remaining }} extra job{{ (allJobs.length - remaining) === 1 ? '' : 's' }}) +
+
+ +
+
+ {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }}
- -
-
- {{ 'NO_CREDITS_LEFT_THIS_MONTH' | translate }} -
-
- -
+
+
- -
-
- - -
+
+ +
+
+ +
- -
-
- - -
+
+ +
+
+ +
+
} @else { - + } - -
+ }">
- -
@@ -250,17 +214,28 @@
-
+ @switch(userStatus) { + @case ('NOT_STARTED') { + + Must register with Hyp3 Service + + } + @case ('PENDING') { + + Currently awaiting approval + + } + @case ('DISABLED') { + Account Disabled + } + @default {
@@ -269,6 +244,7 @@ Unlimited +
{{'CREDIT_MAX' | translate}} @@ -283,58 +259,56 @@ + + +
-
- {{ 'LOADING' | translate }}... +
+ {{ 'LOADING' | translate }}...
+ } + }
- N/A - {{ 'LOGIN_TO_VIEW' | translate }} + N/A - {{ 'LOGIN_TO_VIEW' | translate }} - N/A - {{ 'LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH' | translate }} + N/A - {{ 'LOGIN_TO_VIEW_NUMBER_OF_CREDITS_LEFT_THIS_MONTH' | translate }}
-
- +
+ {{ 'VALIDATE_ONLY' | translate }} -
- + \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 38087f8cb..dd6ad9996 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -69,7 +69,7 @@ export class ProcessingQueueComponent implements OnInit { public progress = null; - public userStatus = 'NOT_STARTED'; + public userStatus = ''; public isSignupSelected = false; constructor( @@ -151,6 +151,10 @@ export class ProcessingQueueComponent implements OnInit { this.remaining = user.quota.remaining; this.userStatus = user.application_status; this.userStatus = 'NOT_STARTED'; + if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING') { + this.isSignupSelected = true; + this.selectedJobTypeId = null; + } } ); @@ -439,10 +443,7 @@ export class ProcessingQueueComponent implements OnInit { private selectDefaultJobType(): void { this.selectedJobTypeId = !!this.hyp3JobTypesList[0] ? this.hyp3JobTypesList[0].id : null; - if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING') { - this.isSignupSelected = true; - this.selectedJobTypeId = null; - } + } public openSignup(): void { this.isSignupSelected = true; diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 946afd12e..483bba819 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -1,4 +1,5 @@ -
+
+

Request On Demand Access

Thank you for your interest in ASF's On Demand processing service. @@ -23,10 +24,10 @@

Verify your Earthdata Login profile information

  • Name: John Doe
  • Username: username
  • Email Address: user@example.com
    • -
  • Organization: Example Organization/li> +
  • Organization: Example Organization
  • Country: Example Country
    • - Yes, my Earthdata Login profile information is correct and I will monitor + Yes, my Earthdata Login profile information is correct and I will monitor user@example.com for status updates.
    @@ -74,14 +75,10 @@

    How do you want to use our service?


    - How do you want to use our service? - + - - - +
    - -
    \ No newline at end of file + \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index ce3626114..7d50b619d 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -1,4 +1,5 @@ import { Component } from '@angular/core'; +import { FormBuilder, Validators } from '@angular/forms'; @Component({ selector: 'app-processing-signup', @@ -6,5 +7,17 @@ import { Component } from '@angular/core'; styleUrl: './processing-signup.component.scss' }) export class ProcessingSignupComponent { + public signupForm = this.formBuilder.group({ + infoConfirmation: [false, Validators.requiredTrue], + useCase: ['', Validators.required] + }) + + constructor( + private formBuilder: FormBuilder + ){} + + public onRegisterPressed() { + console.log(this.signupForm.value) + } } diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts index 32dd89161..fb27a254c 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.module.ts @@ -3,7 +3,7 @@ import { CommonModule } from '@angular/common'; import {MatExpansionModule} from '@angular/material/expansion'; import { MatSelectModule } from '@angular/material/select'; import { ProcessingSignupComponent } from './processing-signup.component'; -import { FormsModule } from '@angular/forms'; +import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { MatChipsModule } from '@angular/material/chips'; import { MatSharedModule } from '@shared'; @@ -23,9 +23,10 @@ import { MatInputModule } from '@angular/material/input'; MatSelectModule, MatChipsModule, MatExpansionModule, - MatCheckboxModule, - MatFormFieldModule, - MatInputModule, + MatCheckboxModule, + MatFormFieldModule, + MatInputModule, + ReactiveFormsModule, FormsModule, SharedModule ], From 4162b2590e6e937d756bfd0ff376c1fb719ebf1f Mon Sep 17 00:00:00 2001 From: tcchase Date: Thu, 23 May 2024 11:06:06 -0400 Subject: [PATCH 03/31] feat: user info request --- .../processing-signup.component.html | 12 +++---- .../processing-signup.component.ts | 31 +++++++++++++++++-- src/app/models/user.model.ts | 8 +++++ src/app/services/user-data.service.ts | 24 ++++++++++++++ 4 files changed, 66 insertions(+), 9 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 483bba819..9d0242f5b 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -1,7 +1,7 @@
    -

    Request On Demand Access

    +

    Thank you for your interest in ASF's On Demand processing service. This service allows users to submit Sentinel-1 acquisitions for conversion to analysis-ready products, @@ -21,11 +21,11 @@

    Verify your Earthdata Login profile information

    If any of this information is incorrect, please update your Earthdata Login profile and then refresh this page to view your updated information.
      -
    • Name: John Doe
      • -
    • Username: username
      • -
    • Email Address: user@example.com
      • -
    • Organization: Example Organization
    • -
    • Country: Example Country
      • +
    • Name: {{userInfo.first_name}} {{userInfo.last_name}}
      • +
    • Username: {{userInfo.uid}}
      • +
    • Email Address: {{userInfo.email_address}}
      • +
    • Organization: {{userInfo.organization}}
    • +
    • Country: {{userInfo.country}}
    Yes, my Earthdata Login profile information is correct and I will monitor user@example.com for status updates. diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 7d50b619d..ea00edd67 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -1,21 +1,46 @@ -import { Component } from '@angular/core'; +import { Component, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; +import { Store } from '@ngrx/store'; +import { UserDataService } from '@services'; +import { EarthdataUserInfo } from '@models'; + +import * as userStore from '@store/user'; @Component({ selector: 'app-processing-signup', templateUrl: './processing-signup.component.html', styleUrl: './processing-signup.component.scss' }) -export class ProcessingSignupComponent { +export class ProcessingSignupComponent implements OnInit { public signupForm = this.formBuilder.group({ infoConfirmation: [false, Validators.requiredTrue], useCase: ['', Validators.required] }) + + public userInfo: EarthdataUserInfo = { + 'first_name': '', + 'last_name': '', + 'email_address': '', + 'country': '', + 'uid': '', + 'organization': '' + } + constructor( - private formBuilder: FormBuilder + private formBuilder: FormBuilder, + private userService: UserDataService, + private store$: Store, ){} + ngOnInit(): void { + this.store$.select(userStore.getUserAuth).subscribe(userAuth => { + this.userService.getUserInfo$(userAuth).subscribe((data: EarthdataUserInfo) => { + this.userInfo = data; + }) + }) + } + public onRegisterPressed() { console.log(this.signupForm.value) } diff --git a/src/app/models/user.model.ts b/src/app/models/user.model.ts index 22dcf1925..8ff1be983 100644 --- a/src/app/models/user.model.ts +++ b/src/app/models/user.model.ts @@ -20,6 +20,14 @@ export interface UserProfile { theme: string; language: string; } +export interface EarthdataUserInfo { + first_name: string, + last_name: string, + email_address: string, + country: string, + uid: string, + organization: string +} export interface URSGroup { app_uid: string; diff --git a/src/app/services/user-data.service.ts b/src/app/services/user-data.service.ts index 5745f1f57..0accdc456 100644 --- a/src/app/services/user-data.service.ts +++ b/src/app/services/user-data.service.ts @@ -20,6 +20,27 @@ export class UserDataService { private notificationService: NotificationService, ) { } + public getUserInfo$(userAuth: UserAuth): Observable { + const url = this.getUserInfoURL(this.baseUrl, userAuth.id); + const headers = this.makeAuthHeader(userAuth.token); + + return this.http.get(url, { + headers + }).pipe( + catchError(error => { + if(error.status === 404) { + return of(null) + } + + this.notificationService.error('Trouble loading profile information', 'Error', { + timeOut: 5000 + }); + + return of(null); + }) + ); + } + public getAttribute$(userAuth: UserAuth, attribute: string): Observable { const url = this.makeEndpoint(this.baseUrl, userAuth.id, attribute); const headers = this.makeAuthHeader(userAuth.token); @@ -70,4 +91,7 @@ export class UserDataService { private getBaseUrlFrom(): string { return this.env.currentEnv.user_data; } + public getUserInfoURL(baseUrl: string, userId: string): string { + return `${baseUrl}/vertex/${userId}/`; + } } From f4684431ecdc58f8049246e6d14f843bf0b0ca98 Mon Sep 17 00:00:00 2001 From: tcchase Date: Thu, 23 May 2024 12:51:48 -0400 Subject: [PATCH 04/31] feat: user data, responsiveness, tooltip --- .../processing-signup.component.html | 29 ++++---- .../processing-signup.component.scss | 42 +++++++++-- .../processing-signup.component.ts | 69 +++++++++++-------- 3 files changed, 92 insertions(+), 48 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 9d0242f5b..382554709 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -1,7 +1,7 @@ - + -
    - +
    +

    Request On Demand Access

    Thank you for your interest in ASF's On Demand processing service. This service allows users to submit Sentinel-1 acquisitions for conversion to analysis-ready products, @@ -13,7 +13,6 @@ is equitably distributed throughout the user community, each user can only register one Earthdata Login account for use with ASF's On Demand service.

    -

    Verify your Earthdata Login profile information

    Please review your Earthdata Login profile information below. We will use the email address listed to notify you of your approval status. @@ -28,9 +27,9 @@

    Verify your Earthdata Login profile information

  • Country: {{userInfo.country}}
    • Yes, my Earthdata Login profile information is correct and I will monitor - user@example.com for status updates. + {{userInfo.email_address}} for status updates.*
    -
    +

    How do you want to use our service?

    Please provide a short description (1-5 sentences) of how and why you would like to use ASF's On Demand products. Expand the section below for some examples.

    @@ -40,10 +39,10 @@

    How do you want to use our service?

    Examples - + Example 1: - I am a + I am a master's student in volcanology at the University of ___, and would like to analyze inflation dynamics of volcanoes in my area using InSAR time series analysis with mintpy software. I don't have the time or resources necessary to generate the InSAR @@ -51,20 +50,20 @@

    How do you want to use our service?

    my input for mintpy.     - + Example 2: - I am a + I am a GIS specialist for an insurance company, and I use a variety of resources to evaluate crop damage caused by natural disasters. I have not used SAR in the past, but I recently attended a webinar on using SAR for monitoring the impacts of natural disasters. I would like to see if RTC images could provide useful insights into crop damage. - + Example 3: - I'm a + I'm a hydrologist for a government agency that monitors water resources. I have worked with SAR extensively, and could process my own analysis-ready products, but a colleague mentioned this service to me. It would be a more efficient use of my time to use On Demand InSAR and @@ -75,10 +74,12 @@

    How do you want to use our service?


    - + How do you want to use our service? - +
    + +
    \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss index 824fecbb7..949398b1a 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.scss @@ -1,10 +1,40 @@ @import "asf-theme"; .container { - @include themify($themes) { - color: themed('dark-primary-text'); - } + @include themify($themes) { + color: themed("dark-primary-text"); + } } .data-list b { - width: 120px; - display: inline-block; -} \ No newline at end of file + width: 120px; + display: inline-block; +} +.list-item { + word-wrap: break-word; + overflow: visible; + height: auto; +} +.list-item-content { + overflow: visible; + word-wrap: normal; + white-space: normal; + cursor: text; +} +.container { + display: flex; + justify-content: space-around; + align-items: start; + height: 100%; + flex-wrap: wrap; +} +.form-submit-button-container { + width: 100%; +} +.form-submit-button { + width: 100%; +} +.form-column { + display: flex; + flex-direction: column; + max-width: 47%; + margin: 15px; +} diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index ea00edd67..8b77bbc38 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -12,37 +12,50 @@ import * as userStore from '@store/user'; styleUrl: './processing-signup.component.scss' }) export class ProcessingSignupComponent implements OnInit { - public signupForm = this.formBuilder.group({ - infoConfirmation: [false, Validators.requiredTrue], - useCase: ['', Validators.required] - }) + public signupForm = this.formBuilder.group({ + infoConfirmation: [false, Validators.requiredTrue], + useCase: ['', Validators.required] + }) + + + public userInfo: EarthdataUserInfo = { + 'first_name': '', + 'last_name': '', + 'email_address': '', + 'country': '', + 'uid': '', + 'organization': '' + } + public submitButtonTooltip = 'Must confirm user information as well as write use case.'; - public userInfo: EarthdataUserInfo = { - 'first_name': '', - 'last_name': '', - 'email_address': '', - 'country': '', - 'uid': '', - 'organization': '' - } - - constructor( - private formBuilder: FormBuilder, - private userService: UserDataService, - private store$: Store, - ){} - - ngOnInit(): void { - this.store$.select(userStore.getUserAuth).subscribe(userAuth => { - this.userService.getUserInfo$(userAuth).subscribe((data: EarthdataUserInfo) => { - this.userInfo = data; - }) + constructor( + private formBuilder: FormBuilder, + private userService: UserDataService, + private store$: Store, + ) { } + + ngOnInit(): void { + this.store$.select(userStore.getUserAuth).subscribe(userAuth => { + this.userService.getUserInfo$(userAuth).subscribe((data: EarthdataUserInfo) => { + this.userInfo = data; }) - } + }) + this.signupForm.statusChanges.subscribe(_formValidity => { + if(!this.signupForm.controls.infoConfirmation.valid && !this.signupForm.controls.useCase.valid) { + this.submitButtonTooltip = 'Must confirm user information as well as write use case.' + } else if(!this.signupForm.controls.infoConfirmation.valid) { + this.submitButtonTooltip = 'Must confirm user information.' + } else if(!this.signupForm.controls.useCase.valid) { + this.submitButtonTooltip = 'Must write use case.' + } else { + this.submitButtonTooltip = ''; + } + }) + } - public onRegisterPressed() { - console.log(this.signupForm.value) - } + public onRegisterPressed() { + console.log(this.signupForm.value) + } } From 9e04bf8fe9550d072cf319c506586058bb9fd9a0 Mon Sep 17 00:00:00 2001 From: tcchase Date: Thu, 23 May 2024 13:46:02 -0400 Subject: [PATCH 05/31] chore: check for valid user data --- .../processing-signup/processing-signup.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 8b77bbc38..8da9f60b3 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -38,7 +38,9 @@ export class ProcessingSignupComponent implements OnInit { ngOnInit(): void { this.store$.select(userStore.getUserAuth).subscribe(userAuth => { this.userService.getUserInfo$(userAuth).subscribe((data: EarthdataUserInfo) => { - this.userInfo = data; + if(data) { + this.userInfo = data; + } }) }) this.signupForm.statusChanges.subscribe(_formValidity => { From e1379112a808a0ff19b5a417c33cd0381c55d02c Mon Sep 17 00:00:00 2001 From: tcchase Date: Tue, 28 May 2024 09:32:06 -0400 Subject: [PATCH 06/31] feat: signup button for on demand add menu --- .../on-demand-add-menu.component.html | 3 +++ .../on-demand-add-menu.component.ts | 12 ++++++++++++ 2 files changed, 15 insertions(+) diff --git a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.html b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.html index 050a70dda..08d4e6d0f 100644 --- a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.html +++ b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.html @@ -1,5 +1,8 @@ + @if(userStatus === 'NOT_STARTED') { + + }
    +
    \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 8da9f60b3..bdda8ccd6 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -2,9 +2,10 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; import { UserDataService } from '@services'; -import { EarthdataUserInfo } from '@models'; +import { EarthdataUserInfo, Hyp3User } from '@models'; import * as userStore from '@store/user'; +import * as hyp3Store from '@store/hyp3'; @Component({ selector: 'app-processing-signup', @@ -14,7 +15,8 @@ import * as userStore from '@store/user'; export class ProcessingSignupComponent implements OnInit { public signupForm = this.formBuilder.group({ infoConfirmation: [false, Validators.requiredTrue], - useCase: ['', Validators.required] + useCase: ['', Validators.required], + accessCode: [''] }) @@ -26,6 +28,8 @@ export class ProcessingSignupComponent implements OnInit { 'uid': '', 'organization': '' } + public hyp3User: Hyp3User; + public submitButtonText; public submitButtonTooltip = 'Must confirm user information as well as write use case.'; @@ -38,17 +42,31 @@ export class ProcessingSignupComponent implements OnInit { ngOnInit(): void { this.store$.select(userStore.getUserAuth).subscribe(userAuth => { this.userService.getUserInfo$(userAuth).subscribe((data: EarthdataUserInfo) => { - if(data) { + if (data) { this.userInfo = data; } }) }) + this.store$.select(hyp3Store.getHyp3User).subscribe(user => { + this.hyp3User = user; + console.log(this.hyp3User) + if (this.hyp3User.application_status === 'PENDING') { + this.signupForm.disable() + this.signupForm.controls.useCase.setValue(user.use_case); + this.signupForm.controls.infoConfirmation.setValue(true); + this.submitButtonTooltip = '' + this.submitButtonText = 'Awaiting Approval' + } else { + this.submitButtonText = 'Register' + } + } + ) this.signupForm.statusChanges.subscribe(_formValidity => { - if(!this.signupForm.controls.infoConfirmation.valid && !this.signupForm.controls.useCase.valid) { + if (!this.signupForm.controls.infoConfirmation.valid && !this.signupForm.controls.useCase.valid) { this.submitButtonTooltip = 'Must confirm user information as well as write use case.' - } else if(!this.signupForm.controls.infoConfirmation.valid) { + } else if (!this.signupForm.controls.infoConfirmation.valid) { this.submitButtonTooltip = 'Must confirm user information.' - } else if(!this.signupForm.controls.useCase.valid) { + } else if (!this.signupForm.controls.useCase.valid) { this.submitButtonTooltip = 'Must write use case.' } else { this.submitButtonTooltip = ''; diff --git a/src/app/models/hyp3.model.ts b/src/app/models/hyp3.model.ts index 4396a6de5..2ce6c29a3 100644 --- a/src/app/models/hyp3.model.ts +++ b/src/app/models/hyp3.model.ts @@ -28,6 +28,7 @@ export interface Hyp3User { quota: Hyp3UserQuota; user_id: string; job_names: string[]; + use_case: string; } export interface Hyp3UserQuota { From 58cfc8e33343cd57cb977db2aea4ceafc51ee609 Mon Sep 17 00:00:00 2001 From: tcchase Date: Tue, 28 May 2024 16:21:41 -0400 Subject: [PATCH 10/31] feat; actually submit form --- .../processing-signup/processing-signup.component.ts | 9 ++++++++- src/app/services/hyp3.service.ts | 9 +++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index bdda8ccd6..858d3972e 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -1,7 +1,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; -import { UserDataService } from '@services'; +import { Hyp3Service, NotificationService, UserDataService } from '@services'; import { EarthdataUserInfo, Hyp3User } from '@models'; import * as userStore from '@store/user'; @@ -36,6 +36,8 @@ export class ProcessingSignupComponent implements OnInit { constructor( private formBuilder: FormBuilder, private userService: UserDataService, + private hyp3Service: Hyp3Service, + private notificationService: NotificationService, private store$: Store, ) { } @@ -76,6 +78,11 @@ export class ProcessingSignupComponent implements OnInit { public onRegisterPressed() { console.log(this.signupForm.value) + this.hyp3Service.submitSignupForm$(this.signupForm.value).subscribe((response) => { + console.log(response) + this.notificationService.info('Submitted Form') + this.store$.dispatch(new hyp3Store.LoadUser()) + }); } } diff --git a/src/app/services/hyp3.service.ts b/src/app/services/hyp3.service.ts index 6bae9592b..fc42e756b 100644 --- a/src/app/services/hyp3.service.ts +++ b/src/app/services/hyp3.service.ts @@ -185,6 +185,15 @@ export class Hyp3Service { return this.http.post(submitJobUrl, body, { withCredentials: true }); } + public submitSignupForm$(form) { + const signupFormURL = `${this.apiUrl}/user`; + const body = { + use_case: form.useCase, + access_code: form.accessCode + }; + return this.http.patch(signupFormURL, body, { withCredentials: true }); + } + public getCosts$() { const costsUrl = `${this.apiUrl}/costs`; From 3d9444797472ada9b02abde9c3d924c496583d2e Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 29 May 2024 11:18:19 -0400 Subject: [PATCH 11/31] fix: button disabled for pending status --- .../processing-signup/processing-signup.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 6b9d8913d..c0030eeaf 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -83,7 +83,7 @@

    How do you want to use our service?

    - +
    \ No newline at end of file From 723ac65d06724b3f27d8eeefb37f35222b203062 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 29 May 2024 11:28:54 -0400 Subject: [PATCH 12/31] feat: notification for adding to queue while not_started --- src/app/services/notification.service.ts | 8 +++++++- src/app/store/queue/queue.effect.ts | 9 ++++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index 4c37c748c..659117b42 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -23,7 +23,7 @@ export class NotificationService { // toastComponent: ToastrMessageComponent }; - public demandQueue(added: boolean = true, count: number = 0, job_type: string, duplicates = 0) { + public demandQueue(added: boolean = true, count: number = 0, job_type: string, duplicates = 0, application_status='') { let headerText: string; let infoText = ''; const action = added ? 'added to' : 'removed from'; @@ -42,9 +42,15 @@ export class NotificationService { if (duplicates && added) { infoText += ` ${duplicates} duplicate ${duplicates > 1 ? 'jobs' : 'job'} not ${action} the queue.`; } + if(application_status === 'NOT_STARTED') { + infoText += ' Hyp3 Account still needs to be registered.' + } this.info(infoText, headerText); } else { infoText = `${job_type === '' ? '' : job_type + ' '}job ${action} the On Demand Queue.`; + if(application_status === 'NOT_STARTED') { + infoText += ' Hyp3 Account still needs to be registered.' + } this.info(infoText, `Job ${action} queue`); } } diff --git a/src/app/store/queue/queue.effect.ts b/src/app/store/queue/queue.effect.ts index 77e84e005..995021819 100644 --- a/src/app/store/queue/queue.effect.ts +++ b/src/app/store/queue/queue.effect.ts @@ -15,6 +15,7 @@ import { } from './queue.action'; import { getDuplicates, getQueuedProducts } from './queue.reducer'; import * as scenesStore from '@store/scenes'; +import * as hyp3Store from '@store/hyp3'; import * as services from '@services'; import * as models from '@models'; @@ -143,7 +144,8 @@ export class QueueEffects { public addJob = createEffect(() => this.actions$.pipe( ofType(QueueActionType.ADD_JOB), withLatestFrom(this.store$.select(getDuplicates)), - tap(([act, duplicates]) => this.notificationService.demandQueue(true, 1, act.payload.job_type.name, duplicates)), + withLatestFrom(this.store$.select(hyp3Store.getHyp3User)), + tap(([[act, duplicates], user]) => this.notificationService.demandQueue(true, 1, act.payload.job_type.name, duplicates, user.application_status)), ), { dispatch: false } ); @@ -153,9 +155,10 @@ export class QueueEffects { skip(1), map(action => action.payload), withLatestFrom(this.store$.select(getDuplicates)), - map(([jobs, duplicates]) => { + withLatestFrom(this.store$.select(hyp3Store.getHyp3User)), + map(([[jobs, duplicates], user]) => { const jobTypes = Array.from(jobs.reduce((types, job) => types = types.add(job.job_type.name), new Set())); - this.notificationService.demandQueue(true, jobs.length, jobTypes.length === 1 ? jobTypes[0] : '', duplicates = duplicates); + this.notificationService.demandQueue(true, jobs.length, jobTypes.length === 1 ? jobTypes[0] : '', duplicates = duplicates, user.application_status); }), ), { dispatch: false } From 86d418213041b0618810a5c509489ec697f01880 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 29 May 2024 11:39:03 -0400 Subject: [PATCH 13/31] fix: docs change language while loaded --- .../shared/docs-modal/docs-modal.component.ts | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/src/app/components/shared/docs-modal/docs-modal.component.ts b/src/app/components/shared/docs-modal/docs-modal.component.ts index b90797da1..c1b69618a 100644 --- a/src/app/components/shared/docs-modal/docs-modal.component.ts +++ b/src/app/components/shared/docs-modal/docs-modal.component.ts @@ -18,10 +18,11 @@ // url="https://docs.asf.alaska.edu/vertex/manual/#date-filters"> // -import { Component, Input, OnInit, Inject } from '@angular/core'; +import { Component, Input, OnInit, Inject, OnDestroy } from '@angular/core'; import { MatDialog, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { DomSanitizer } from '@angular/platform-browser'; import { TranslateService } from "@ngx-translate/core"; +import { SubSink } from 'subsink'; export interface DialogData { @@ -34,7 +35,7 @@ export interface DialogData { templateUrl: './docs-modal.component.html', styleUrls: ['./docs-modal.component.scss'] }) -export class DocsModalComponent implements OnInit { +export class DocsModalComponent implements OnInit, OnDestroy { @Input() url: string; @Input() text: string; @Input() icon: string = 'info'; @@ -42,16 +43,24 @@ export class DocsModalComponent implements OnInit { public docURL: string; public safeDocURL: any; + public subs = new SubSink(); + constructor(public dialog: MatDialog, public translate: TranslateService, private _sanitizer: DomSanitizer) { } ngOnInit(): void { + this.updateLink(); + this.subs.add(this.translate.onLangChange.subscribe(_currentLanguage => { + this.updateLink(); + })); + } + + private updateLink(): void { 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() { @@ -93,6 +102,10 @@ export class DocsModalComponent implements OnInit { return newUrl; } + ngOnDestroy() { + this.subs.unsubscribe(); + } + } @Component({ From 81287656f9424148c24ceaddc9392227731890e3 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 29 May 2024 11:48:54 -0400 Subject: [PATCH 14/31] feat: seperate message out --- src/app/services/notification.service.ts | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index 659117b42..6f4d4de77 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -12,6 +12,8 @@ import { take } from 'rxjs/operators'; }) export class NotificationService { + private shownSignupMessage = false; + constructor( private toastr: ToastrService, private store$: Store, @@ -42,17 +44,22 @@ export class NotificationService { if (duplicates && added) { infoText += ` ${duplicates} duplicate ${duplicates > 1 ? 'jobs' : 'job'} not ${action} the queue.`; } - if(application_status === 'NOT_STARTED') { - infoText += ' Hyp3 Account still needs to be registered.' - } + this.info(infoText, headerText); } else { infoText = `${job_type === '' ? '' : job_type + ' '}job ${action} the On Demand Queue.`; - if(application_status === 'NOT_STARTED') { - infoText += ' Hyp3 Account still needs to be registered.' - } + this.info(infoText, `Job ${action} queue`); } + if(application_status === 'NOT_STARTED' && !this.shownSignupMessage) { + this.shownSignupMessage = true; + this.error('Click here to open registration form', 'Not registered with hyp3 service', { + disableTimeOut: true, + closeButton: true + }).onTap.subscribe(()=> { + this.store$.dispatch(new uiStore.SetIsOnDemandQueueOpen(true)) + }) + } } public downloadQueue(added: boolean = true, count: number = 0) { From f1f2be3fd3b477ed607cbb7a490a6562b84cff2b Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 29 May 2024 13:14:47 -0400 Subject: [PATCH 15/31] fix: add menu error --- .../shared/on-demand-add-menu/on-demand-add-menu.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts index 887094d63..3724de126 100644 --- a/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts +++ b/src/app/components/shared/on-demand-add-menu/on-demand-add-menu.component.ts @@ -75,7 +75,7 @@ export class OnDemandAddMenuComponent implements OnInit { ); this.subs.add( this.store$.select(hyp3Store.getHyp3User).subscribe(profile => { - this.userStatus = profile.application_status; + this.userStatus = profile?.application_status; }) ) From 7c1706fe5133793d350919cfafc74b2326b58725 Mon Sep 17 00:00:00 2001 From: tcchase Date: Wed, 29 May 2024 13:17:49 -0400 Subject: [PATCH 16/31] feat: debug hyp3 application status control --- .../preferences/preferences.component.html | 41 ++++++++++++++----- .../preferences/preferences.component.ts | 7 ++++ src/app/store/hyp3/hyp3.action.ts | 9 +++- src/app/store/hyp3/hyp3.reducer.ts | 17 +++++++- 4 files changed, 62 insertions(+), 12 deletions(-) diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.html b/src/app/components/header/header-buttons/preferences/preferences.component.html index 26f9e710a..8f924f148 100644 --- 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 @@ {{ 'DEFAULT_MAP_LAYER' | translate }} - - - {{ mapLayerTypes.SATELLITE | uppercase | translate }} - - - {{ mapLayerTypes.STREET | uppercase | translate }} - - + + + {{ mapLayerTypes.SATELLITE | uppercase | translate }} + + + {{ mapLayerTypes.STREET | uppercase | translate }} + +
    @@ -120,6 +120,27 @@ refresh + @if(!this.env.isProd) { + + Debug Status + + + NOT_STARTED + + + PENDING + + + APPROVED + + + REJECTED + + + + }
    diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.ts b/src/app/components/header/header-buttons/preferences/preferences.component.ts index 39b13bf08..0057626b6 100644 --- 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, private store$: Store, 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: string) { + this.hyp3DebugStatus = status; + this.store$.dispatch(new hyp3Store.SetDebugStatus(status)) + } public setTheme(themeName: string) { this.themeService.setTheme(themeName); diff --git a/src/app/store/hyp3/hyp3.action.ts b/src/app/store/hyp3/hyp3.action.ts index 932da01aa..8f16192dd 100644 --- a/src/app/store/hyp3/hyp3.action.ts +++ b/src/app/store/hyp3/hyp3.action.ts @@ -22,6 +22,8 @@ export enum Hyp3ActionType { ERROR_JOB_SUBMISSION = '[Hyp3] Error Job Submission', CLEAR_PROCESSING_OPTIONS = '[Hyp3] Clear Processing Options', + SET_DEBUG_STATUS = '[Hyp3] Set debug status', + } export class LoadJobs implements Action { @@ -72,7 +74,11 @@ export class ErrorJobSubmission implements Action { export class LoadUser implements Action { public readonly type = Hyp3ActionType.LOAD_USER; } +export class SetDebugStatus implements Action { + public readonly type = Hyp3ActionType.SET_DEBUG_STATUS; + constructor(public payload: string) {} +} export class SetUser implements Action { public readonly type = Hyp3ActionType.SET_USER; @@ -107,4 +113,5 @@ export type Hyp3Actions = | SetOnDemandUserID | SubmitJob | SuccessfulJobSubmission - | ErrorJobSubmission; + | ErrorJobSubmission + | SetDebugStatus; diff --git a/src/app/store/hyp3/hyp3.reducer.ts b/src/app/store/hyp3/hyp3.reducer.ts index 58fd5b7cf..5d9ebd16b 100644 --- a/src/app/store/hyp3/hyp3.reducer.ts +++ b/src/app/store/hyp3/hyp3.reducer.ts @@ -18,6 +18,7 @@ export interface Hyp3State { projectName: string; userId: string; costs: Hyp3CostsByJobType; + debug_status: string; } const initState: Hyp3State = { @@ -28,6 +29,7 @@ const initState: Hyp3State = { submittingJobName: null, processingOptions: hyp3DefaultJobOptions, projectName: '', + debug_status: '', userId: '', costs: { "AUTORIFT": { @@ -135,10 +137,23 @@ export function hyp3Reducer(state = initState, action: Hyp3Actions): Hyp3State { }; } + case Hyp3ActionType.SET_DEBUG_STATUS: { + return { + ...state, + debug_status: action.payload + } + } + case Hyp3ActionType.SET_USER: { + let temp_user = { + ...action.payload + } + if(state.debug_status !== '') { + temp_user.application_status = state.debug_status + } return { ...state, - user: action.payload, + user: temp_user, isUserLoading: false }; } From b5e8aec1d020fbc41173e515ad45757e48d5501d Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 29 May 2024 15:15:14 -0400 Subject: [PATCH 17/31] fix: update hyp3 profile based off url --- src/app/app.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 0d932ed0f..fccff58d9 100644 --- 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()); } ) ); From 5779691a183a30fe5d098351f2ae3777e097a5e6 Mon Sep 17 00:00:00 2001 From: tcchase Date: Mon, 3 Jun 2024 13:44:04 -0400 Subject: [PATCH 18/31] feat: signup access code details --- .../processing-signup/processing-signup.component.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index c0030eeaf..5afdfc695 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -78,9 +78,11 @@

    How do you want to use our service?

    How do you want to use our service? +

    Workshop/Tutorial Participant?

    + If you are attending a workshop or tutorial where the instructor has provided you with an access code - Have an access code? - + Enter access code (optional) +
    From 97fdca0f592982d0c7643d5b55afb34dffd0cefe Mon Sep 17 00:00:00 2001 From: tcchase Date: Mon, 3 Jun 2024 15:26:52 -0400 Subject: [PATCH 19/31] feat: allow pending resubmission --- .../processing-signup/processing-signup.component.html | 2 +- .../processing-signup/processing-signup.component.ts | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 5afdfc695..72630930f 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -85,7 +85,7 @@

    Workshop/Tutorial Participant?

    - +
    \ No newline at end of file diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 858d3972e..a3d11c9d6 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -53,11 +53,10 @@ export class ProcessingSignupComponent implements OnInit { this.hyp3User = user; console.log(this.hyp3User) if (this.hyp3User.application_status === 'PENDING') { - this.signupForm.disable() this.signupForm.controls.useCase.setValue(user.use_case); this.signupForm.controls.infoConfirmation.setValue(true); this.submitButtonTooltip = '' - this.submitButtonText = 'Awaiting Approval' + this.submitButtonText = 'Resubmit' } else { this.submitButtonText = 'Register' } From 59b776bc42c6ce591ef5cbb357953c190f6901b8 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 08:54:05 -0400 Subject: [PATCH 20/31] feat: Pass on error message for signup --- .../processing-signup/processing-signup.component.ts | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index a3d11c9d6..f19dc7c3a 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -78,9 +78,12 @@ export class ProcessingSignupComponent implements OnInit { public onRegisterPressed() { console.log(this.signupForm.value) this.hyp3Service.submitSignupForm$(this.signupForm.value).subscribe((response) => { - console.log(response) - this.notificationService.info('Submitted Form') - this.store$.dispatch(new hyp3Store.LoadUser()) + console.log(response); + this.notificationService.info('Submitted Form'); + this.store$.dispatch(new hyp3Store.LoadUser()); + }, (error) => { + console.log(error); + this.notificationService.error(error.error.detail, 'Hyp3 Signup Error'); }); } From 20c00a443cbb5ade8d26cff79f28e9c7ad353aaf Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 10:25:51 -0400 Subject: [PATCH 21/31] fix: rejected not disabled check --- .../processing-queue/processing-queue.component.html | 7 +++++-- .../processing-signup/processing-signup.component.ts | 1 - src/app/store/hyp3/hyp3.reducer.ts | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 80138dd59..ded382b92 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -232,8 +232,11 @@ Currently awaiting approval } - @case ('DISABLED') { - Account Disabled + @case ('REJECTED') { + + + Account Disabled + } @default {
    diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index f19dc7c3a..65f37840a 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -82,7 +82,6 @@ export class ProcessingSignupComponent implements OnInit { this.notificationService.info('Submitted Form'); this.store$.dispatch(new hyp3Store.LoadUser()); }, (error) => { - console.log(error); this.notificationService.error(error.error.detail, 'Hyp3 Signup Error'); }); } diff --git a/src/app/store/hyp3/hyp3.reducer.ts b/src/app/store/hyp3/hyp3.reducer.ts index 5d9ebd16b..96e7dceef 100644 --- a/src/app/store/hyp3/hyp3.reducer.ts +++ b/src/app/store/hyp3/hyp3.reducer.ts @@ -151,6 +151,7 @@ export function hyp3Reducer(state = initState, action: Hyp3Actions): Hyp3State { if(state.debug_status !== '') { temp_user.application_status = state.debug_status } + temp_user.application_status = temp_user.application_status.toUpperCase(); return { ...state, user: temp_user, From d85e5b8a3495aced4534cfe0e2946e34908f880f Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 10:37:05 -0400 Subject: [PATCH 22/31] chore: update message --- .../header/processing-queue/processing-queue.component.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index ded382b92..42e3e3e85 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -233,9 +233,8 @@ } @case ('REJECTED') { - - Account Disabled + Request for access has been rejected } @default { From d5b2cb0e124d432ddf1c8653f80e84d69351c468 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 13:19:45 -0400 Subject: [PATCH 23/31] chore: code styling --- .../processing-queue.component.html | 3 ++- .../processing-signup.component.ts | 13 ++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 42e3e3e85..87790d213 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -294,7 +294,8 @@ allJobs.length === 0 || !isUserLoggedIn || userStatus === 'NOT_STARTED' || - userStatus === 'PENDING' + userStatus === 'PENDING' || + userStatus === 'REJECTED' )" [class.mini-button]="breakpoint == breakpoints.MOBILE" mat-flat-button color="primary" class="footer-submit-button"> diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 65f37840a..bad2865ea 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -51,24 +51,23 @@ export class ProcessingSignupComponent implements OnInit { }) this.store$.select(hyp3Store.getHyp3User).subscribe(user => { this.hyp3User = user; - console.log(this.hyp3User) if (this.hyp3User.application_status === 'PENDING') { this.signupForm.controls.useCase.setValue(user.use_case); this.signupForm.controls.infoConfirmation.setValue(true); - this.submitButtonTooltip = '' - this.submitButtonText = 'Resubmit' + this.submitButtonTooltip = ''; + this.submitButtonText = 'Resubmit'; } else { - this.submitButtonText = 'Register' + this.submitButtonText = 'Register'; } } ) this.signupForm.statusChanges.subscribe(_formValidity => { if (!this.signupForm.controls.infoConfirmation.valid && !this.signupForm.controls.useCase.valid) { - this.submitButtonTooltip = 'Must confirm user information as well as write use case.' + this.submitButtonTooltip = 'Must confirm user information as well as write use case.'; } else if (!this.signupForm.controls.infoConfirmation.valid) { - this.submitButtonTooltip = 'Must confirm user information.' + this.submitButtonTooltip = 'Must confirm user information.'; } else if (!this.signupForm.controls.useCase.valid) { - this.submitButtonTooltip = 'Must write use case.' + this.submitButtonTooltip = 'Must write use case.'; } else { this.submitButtonTooltip = ''; } From 1199a7b7047b6caf0e4f2063c26fd89d5f5ff653 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 15:31:03 -0400 Subject: [PATCH 24/31] chore: replace hyp3 with on demand --- .../header/processing-queue/processing-queue.component.html | 2 +- .../processing-signup/processing-signup.component.ts | 2 +- src/app/services/notification.service.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 87790d213..ffef4b325 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -224,7 +224,7 @@ @switch(userStatus) { @case ('NOT_STARTED') { - Must register with Hyp3 Service + Must register with On Demand service } @case ('PENDING') { diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index bad2865ea..13ca145dd 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -81,7 +81,7 @@ export class ProcessingSignupComponent implements OnInit { this.notificationService.info('Submitted Form'); this.store$.dispatch(new hyp3Store.LoadUser()); }, (error) => { - this.notificationService.error(error.error.detail, 'Hyp3 Signup Error'); + this.notificationService.error(error.error.detail, 'On Demand Signup Error'); }); } diff --git a/src/app/services/notification.service.ts b/src/app/services/notification.service.ts index 6f4d4de77..df16d22fd 100644 --- a/src/app/services/notification.service.ts +++ b/src/app/services/notification.service.ts @@ -53,7 +53,7 @@ export class NotificationService { } if(application_status === 'NOT_STARTED' && !this.shownSignupMessage) { this.shownSignupMessage = true; - this.error('Click here to open registration form', 'Not registered with hyp3 service', { + this.error('Click here to open registration form', 'Not registered with On Demand service', { disableTimeOut: true, closeButton: true }).onTap.subscribe(()=> { From a1b0399c2f007443e5357f3eac1d36f02fb976e1 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 15:40:39 -0400 Subject: [PATCH 25/31] feat: rejected status screen --- .../processing-queue/processing-queue.component.html | 8 ++++++-- .../header/processing-queue/processing-queue.component.ts | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index ffef4b325..3862042bd 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -50,7 +50,7 @@
    - @if(userStatus === 'NOT_STARTED' || userStatus === 'PENDING') { + @if(userStatus === 'NOT_STARTED' || userStatus === 'PENDING' || userStatus === 'REJECTED') {
    } @else { - + @if (this.userStatus === 'REJECTED') { +

    Request for access has been rejected.

    Learn more
    + } @else { + + } } diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 32f85a01c..85d6ba595 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -150,7 +150,7 @@ export class ProcessingQueueComponent implements OnInit { this.isUnlimitedUser = user.quota.unlimited; this.remaining = user.quota.remaining; this.userStatus = user.application_status; - if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING') { + if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING' || this.userStatus === 'REJECTED') { this.isSignupSelected = true; this.selectedJobTypeId = null; } From 01587ad1a26c3128dd26e555c74e8252816b3365 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 15:46:44 -0400 Subject: [PATCH 26/31] feat: pull up first dataset if access code goes through --- .../header/processing-queue/processing-queue.component.ts | 3 +++ .../processing-signup/processing-signup.component.ts | 4 +--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 85d6ba595..75278b40e 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -153,6 +153,9 @@ export class ProcessingQueueComponent implements OnInit { if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING' || this.userStatus === 'REJECTED') { this.isSignupSelected = true; this.selectedJobTypeId = null; + } else if(this.isSignupSelected && this.userStatus === 'APPROVED') { + this.isSignupSelected = false; + this.selectDefaultJobType(); } } ); diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 13ca145dd..497af5909 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -75,9 +75,7 @@ export class ProcessingSignupComponent implements OnInit { } public onRegisterPressed() { - console.log(this.signupForm.value) - this.hyp3Service.submitSignupForm$(this.signupForm.value).subscribe((response) => { - console.log(response); + this.hyp3Service.submitSignupForm$(this.signupForm.value).subscribe((_response) => { this.notificationService.info('Submitted Form'); this.store$.dispatch(new hyp3Store.LoadUser()); }, (error) => { From 24cd32523f8f5b1de91cc126551acb49b46656f2 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Tue, 4 Jun 2024 16:27:04 -0400 Subject: [PATCH 27/31] chore: application status enum --- .../preferences/preferences.component.ts | 2 +- .../processing-queue/processing-queue.component.html | 2 +- .../processing-queue/processing-queue.component.ts | 7 +++++-- .../processing-signup/processing-signup.component.ts | 4 ++-- src/app/models/hyp3.model.ts | 9 +++++++-- src/app/store/hyp3/hyp3.action.ts | 4 ++-- src/app/store/hyp3/hyp3.reducer.ts | 10 +++++----- 7 files changed, 23 insertions(+), 15 deletions(-) diff --git a/src/app/components/header/header-buttons/preferences/preferences.component.ts b/src/app/components/header/header-buttons/preferences/preferences.component.ts index 0057626b6..5cb15078f 100644 --- a/src/app/components/header/header-buttons/preferences/preferences.component.ts +++ b/src/app/components/header/header-buttons/preferences/preferences.component.ts @@ -189,7 +189,7 @@ export class PreferencesComponent implements OnInit, OnDestroy { this.setTheme(`theme-${this.currentTheme}`); } } - public onDebugStatus(status: string) { + public onDebugStatus(status: models.ApplicationStatus) { this.hyp3DebugStatus = status; this.store$.dispatch(new hyp3Store.SetDebugStatus(status)) } diff --git a/src/app/components/header/processing-queue/processing-queue.component.html b/src/app/components/header/processing-queue/processing-queue.component.html index 3862042bd..6e5d7e076 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.html +++ b/src/app/components/header/processing-queue/processing-queue.component.html @@ -183,7 +183,7 @@
    } @else { - @if (this.userStatus === 'REJECTED') { + @if (this.userStatus === this.ApplicationStatus.REJECTED) {

    Request for access has been rejected.

    Learn more
    } @else { diff --git a/src/app/components/header/processing-queue/processing-queue.component.ts b/src/app/components/header/processing-queue/processing-queue.component.ts index 75278b40e..a4fcd3fb6 100644 --- a/src/app/components/header/processing-queue/processing-queue.component.ts +++ b/src/app/components/header/processing-queue/processing-queue.component.ts @@ -8,6 +8,7 @@ import { AppState } from '@store'; import moment from 'moment'; import { of, from, combineLatest } from 'rxjs'; import { tap, catchError, delay, concatMap, finalize } from 'rxjs/operators'; +import { ApplicationStatus } from '@models'; import * as queueStore from '@store/queue'; import * as hyp3Store from '@store/hyp3'; @@ -29,6 +30,8 @@ enum ProcessingQueueTab { styleUrls: ['./processing-queue.component.scss'] }) export class ProcessingQueueComponent implements OnInit { + readonly ApplicationStatus = ApplicationStatus; + @ViewChild('contentArea') contentAreaRef: ElementRef; @ViewChild('contentTopArea') topRef: ElementRef; @ViewChild('contentBottomArea') bottomRef: ElementRef; @@ -150,10 +153,10 @@ export class ProcessingQueueComponent implements OnInit { this.isUnlimitedUser = user.quota.unlimited; this.remaining = user.quota.remaining; this.userStatus = user.application_status; - if(this.userStatus === 'NOT_STARTED' || this.userStatus === 'PENDING' || this.userStatus === 'REJECTED') { + if(this.userStatus === ApplicationStatus.NOT_STARTED || this.userStatus === ApplicationStatus.PENDING || this.userStatus === ApplicationStatus.REJECTED) { this.isSignupSelected = true; this.selectedJobTypeId = null; - } else if(this.isSignupSelected && this.userStatus === 'APPROVED') { + } else if(this.isSignupSelected && this.userStatus === ApplicationStatus.APPROVED) { this.isSignupSelected = false; this.selectDefaultJobType(); } diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 497af5909..0b53456c7 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core'; import { FormBuilder, Validators } from '@angular/forms'; import { Store } from '@ngrx/store'; import { Hyp3Service, NotificationService, UserDataService } from '@services'; -import { EarthdataUserInfo, Hyp3User } from '@models'; +import { EarthdataUserInfo, Hyp3User, ApplicationStatus } from '@models'; import * as userStore from '@store/user'; import * as hyp3Store from '@store/hyp3'; @@ -51,7 +51,7 @@ export class ProcessingSignupComponent implements OnInit { }) this.store$.select(hyp3Store.getHyp3User).subscribe(user => { this.hyp3User = user; - if (this.hyp3User.application_status === 'PENDING') { + if (this.hyp3User.application_status === ApplicationStatus.PENDING) { this.signupForm.controls.useCase.setValue(user.use_case); this.signupForm.controls.infoConfirmation.setValue(true); this.submitButtonTooltip = ''; diff --git a/src/app/models/hyp3.model.ts b/src/app/models/hyp3.model.ts index 2ce6c29a3..b252cfdcc 100644 --- a/src/app/models/hyp3.model.ts +++ b/src/app/models/hyp3.model.ts @@ -24,7 +24,7 @@ export interface Hyp3JobSubmission { } export interface Hyp3User { - application_status: string; + application_status: ApplicationStatus; quota: Hyp3UserQuota; user_id: string; job_names: string[]; @@ -140,7 +140,12 @@ export enum Hyp3JobStatusCode { SUCCEEDED = 'SUCCEEDED', FAILED = 'FAILED' } - +export enum ApplicationStatus { + NOT_STARTED = 'NOT_STARTED', + PENDING = 'PENDING', + APPROVED = 'APPROVED', + REJECTED = 'REJECTED' +} export const on_demand_prod_collections = ['C1214471197-ASF','C1214470533-ASF','C1214471521-ASF','C1214472978-ASF','C1214470682-ASF','C1214472994-ASF','C1214470488-ASF','C1327985697-ASF','C1327985645-ASF','C1327985660-ASF','C1327985644-ASF','C1327985571-ASF','C1327985740-ASF','C1327985661-ASF','C1661710578-ASF','C1661710581-ASF','C1661710583-ASF','C1661710590-ASF','C1661710593-ASF','C1661710596-ASF','C1661710597-ASF','C1661710604-ASF','C1214335471-ASF','C1214336154-ASF','C1214337770-ASF','C1214354144-ASF','C1214354235-ASF']; export const on_demand_test_collections = ['C1212200781-ASF','C1212201032-ASF','C1212209035-ASF','C1212158327-ASF','C1212158318-ASF','C1205428742-ASF','C1216244597-ASF','C1216244589-ASF','C1216244594-ASF','C1216244588-ASF','C1216244586-ASF','C1216244600-ASF','C1216244348-ASF','C1226557819-ASF','C1226557809-ASF','C1226557808-ASF','C1226557812-ASF','C1226557813-ASF','C1226557814-ASF','C1226557815-ASF','C1226557818-ASF','C1206132445-ASF','C1212005594-ASF','C1207188317-ASF','C1210546638-ASF','C1206122195-ASF']; export const on_demand_test_collections_asfdev = ['C1245830954-ASFDEV','C1245830954-ASFDEV','C1234413228-ASFDEV','C1234413229-ASFDEV','C1234413230-ASFDEV','C1234413239-ASFDEV','C1234413240-ASFDEV','C1234413241-ASFDEV','C1234413245-ASFDEV','C1234413246-ASFDEV','C1234413247-ASFDEV','C1234413248-ASFDEV','C1234413257-ASFDEV','C1234413258-ASFDEV','C1234413259-ASFDEV','C1234413263-ASFDEV','C1234413264-ASFDEV','C1234413265-ASFDEV','C1234413266-ASFDEV','C1234413269-ASFDEV','C1234413270-ASFDEV','C1234413271-ASFDEV','C1234413272-ASFDEV','C1234413275-ASFDEV']; diff --git a/src/app/store/hyp3/hyp3.action.ts b/src/app/store/hyp3/hyp3.action.ts index 8f16192dd..0643017a1 100644 --- a/src/app/store/hyp3/hyp3.action.ts +++ b/src/app/store/hyp3/hyp3.action.ts @@ -1,6 +1,6 @@ import { Action } from '@ngrx/store'; -import { Hyp3Job, Hyp3User, Hyp3ProcessingOptions, Hyp3Costs } from '@models'; +import { Hyp3Job, Hyp3User, Hyp3ProcessingOptions, Hyp3Costs, ApplicationStatus } from '@models'; export enum Hyp3ActionType { LOAD_JOBS = '[Hyp3] Load Jobs', @@ -77,7 +77,7 @@ export class LoadUser implements Action { export class SetDebugStatus implements Action { public readonly type = Hyp3ActionType.SET_DEBUG_STATUS; - constructor(public payload: string) {} + constructor(public payload: ApplicationStatus) {} } export class SetUser implements Action { public readonly type = Hyp3ActionType.SET_USER; diff --git a/src/app/store/hyp3/hyp3.reducer.ts b/src/app/store/hyp3/hyp3.reducer.ts index 96e7dceef..c3f680094 100644 --- a/src/app/store/hyp3/hyp3.reducer.ts +++ b/src/app/store/hyp3/hyp3.reducer.ts @@ -3,7 +3,8 @@ import { createFeatureSelector, createSelector } from '@ngrx/store'; import { Hyp3ActionType, Hyp3Actions } from './hyp3.action'; import { Hyp3Job, Hyp3User, Hyp3ProcessingOptions, - hyp3DefaultJobOptions, Hyp3CostsByJobType + hyp3DefaultJobOptions, Hyp3CostsByJobType, + ApplicationStatus } from '@models'; /* State */ @@ -18,7 +19,7 @@ export interface Hyp3State { projectName: string; userId: string; costs: Hyp3CostsByJobType; - debug_status: string; + debug_status: ApplicationStatus | null; } const initState: Hyp3State = { @@ -29,7 +30,7 @@ const initState: Hyp3State = { submittingJobName: null, processingOptions: hyp3DefaultJobOptions, projectName: '', - debug_status: '', + debug_status: null, userId: '', costs: { "AUTORIFT": { @@ -148,10 +149,9 @@ export function hyp3Reducer(state = initState, action: Hyp3Actions): Hyp3State { let temp_user = { ...action.payload } - if(state.debug_status !== '') { + if(state.debug_status) { temp_user.application_status = state.debug_status } - temp_user.application_status = temp_user.application_status.toUpperCase(); return { ...state, user: temp_user, From 0314e2181f48b7f0e73fc84b7d23bb2bef1288c3 Mon Sep 17 00:00:00 2001 From: William Horn Date: Wed, 5 Jun 2024 10:17:55 -0800 Subject: [PATCH 28/31] fix: remove double period from on demand queue --- .../processing-queue-jobs/processing-queue-jobs.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html index 5167bd16a..bb52b154b 100644 --- a/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html +++ b/src/app/components/header/processing-queue/processing-queue-jobs/processing-queue-jobs.component.html @@ -91,7 +91,7 @@
    - {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' | translate }}. + {{ 'YOUR_JOBS_QUEUE_IS_EMPTY' | translate }}
    From f0448c1e8fea574fa4a78a79d6b8c84f288860b7 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 5 Jun 2024 15:04:23 -0400 Subject: [PATCH 29/31] chore: update wording for access codes --- .../processing-signup/processing-signup.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 72630930f..3ca16e9eb 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -79,9 +79,9 @@

    How do you want to use our service?

    Workshop/Tutorial Participant?

    - If you are attending a workshop or tutorial where the instructor has provided you with an access code + If you are attending a workshop or tutorial where the instructor has provided you with an access code, please enter that code here: - Enter access code (optional) + Access Code (optional)
    From e7decb781e625f3062cc4047d7ee8d517778b115 Mon Sep 17 00:00:00 2001 From: tylercchase Date: Wed, 5 Jun 2024 15:47:08 -0400 Subject: [PATCH 30/31] feat: access code error in form --- .../processing-signup/processing-signup.component.html | 1 + .../processing-signup/processing-signup.component.ts | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html index 3ca16e9eb..6b7ce731f 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.html @@ -83,6 +83,7 @@

    Workshop/Tutorial Participant?

    Access Code (optional) + {{accessCodeErrorMessage}}
    diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 0b53456c7..618d42b2f 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -6,6 +6,7 @@ import { EarthdataUserInfo, Hyp3User, ApplicationStatus } from '@models'; import * as userStore from '@store/user'; import * as hyp3Store from '@store/hyp3'; +import { ValidationError } from 'xml2js'; @Component({ selector: 'app-processing-signup', @@ -32,6 +33,7 @@ export class ProcessingSignupComponent implements OnInit { public submitButtonText; public submitButtonTooltip = 'Must confirm user information as well as write use case.'; + public accessCodeErrorMessage = ''; constructor( private formBuilder: FormBuilder, @@ -79,7 +81,12 @@ export class ProcessingSignupComponent implements OnInit { this.notificationService.info('Submitted Form'); this.store$.dispatch(new hyp3Store.LoadUser()); }, (error) => { - this.notificationService.error(error.error.detail, 'On Demand Signup Error'); + if(error.error.detail.includes('access code')) { + this.signupForm.controls.accessCode.setErrors(new ValidationError(error.error.detail)) + this.accessCodeErrorMessage = error.error.detail; + } else { + this.notificationService.error(error.error.detail, 'On Demand Signup Error'); + } }); } From c56fe3f50942d51c226b5cb780c805f63ab4d36a Mon Sep 17 00:00:00 2001 From: tylercchase Date: Thu, 6 Jun 2024 10:58:31 -0400 Subject: [PATCH 31/31] fix: ignore case sensitivity for errors --- .../processing-signup/processing-signup.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts index 618d42b2f..519c9e12c 100644 --- a/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts +++ b/src/app/components/header/processing-queue/processing-signup/processing-signup.component.ts @@ -81,7 +81,7 @@ export class ProcessingSignupComponent implements OnInit { this.notificationService.info('Submitted Form'); this.store$.dispatch(new hyp3Store.LoadUser()); }, (error) => { - if(error.error.detail.includes('access code')) { + if(error.error.detail.toLowerCase().includes('access code')) { this.signupForm.controls.accessCode.setErrors(new ValidationError(error.error.detail)) this.accessCodeErrorMessage = error.error.detail; } else {