Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prod Release #1914

Merged
merged 33 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
4d50827
feat: basic modal skeleton
tylercchase May 20, 2024
3b8df39
feat: form functionality and queue messages
tylercchase May 21, 2024
4162b25
feat: user info request
tylercchase May 23, 2024
f468443
feat: user data, responsiveness, tooltip
tylercchase May 23, 2024
9e04bf8
chore: check for valid user data
tylercchase May 23, 2024
e137911
feat: signup button for on demand add menu
tylercchase May 28, 2024
f0dfeea
chore: update test user data url
tylercchase May 28, 2024
6a9d5ac
chore: remove user status override
tylercchase May 28, 2024
a09d17f
feat: fill out pending form
tylercchase May 28, 2024
58cfc8e
feat; actually submit form
tylercchase May 28, 2024
3d94447
fix: button disabled for pending status
tylercchase May 29, 2024
723ac65
feat: notification for adding to queue while not_started
tylercchase May 29, 2024
86d4182
fix: docs change language while loaded
tylercchase May 29, 2024
8128765
feat: seperate message out
tylercchase May 29, 2024
f1f2be3
fix: add menu error
tylercchase May 29, 2024
7c1706f
feat: debug hyp3 application status control
tylercchase May 29, 2024
b5e8aec
fix: update hyp3 profile based off url
tylercchase May 29, 2024
5779691
feat: signup access code details
tylercchase Jun 3, 2024
97fdca0
feat: allow pending resubmission
tylercchase Jun 3, 2024
59b776b
feat: Pass on error message for signup
tylercchase Jun 4, 2024
20c00a4
fix: rejected not disabled check
tylercchase Jun 4, 2024
d85e5b8
chore: update message
tylercchase Jun 4, 2024
d5b2cb0
chore: code styling
tylercchase Jun 4, 2024
1199a7b
chore: replace hyp3 with on demand
tylercchase Jun 4, 2024
a1b0399
feat: rejected status screen
tylercchase Jun 4, 2024
01587ad
feat: pull up first dataset if access code goes through
tylercchase Jun 4, 2024
8fb7529
Merge branch 'test' into tcc-hyp3-signup
tylercchase Jun 4, 2024
24cd325
chore: application status enum
tylercchase Jun 4, 2024
578f112
Merge pull request #1913 from asfadmin/tcc-hyp3-signup
tylercchase Jun 4, 2024
0314e21
fix: remove double period from on demand queue
williamh890 Jun 5, 2024
f0448c1
chore: update wording for access codes
tylercchase Jun 5, 2024
e7decb7
feat: access code error in form
tylercchase Jun 5, 2024
c56fe3f
fix: ignore case sensitivity for errors
tylercchase Jun 6, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/app/app.component.ts
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,7 @@ export class AppComponent implements OnInit, OnDestroy, AfterViewInit {
}

this.store$.dispatch(new hyp3Store.LoadCosts());
this.store$.dispatch(new hyp3Store.LoadUser());
}
)
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>

Expand Down Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down Expand Up @@ -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];
Expand Down Expand Up @@ -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,
Expand Down Expand Up @@ -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);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down
Loading
Loading