Merge pull request #2532 from asfadmin/will/resubmit

Resubmit hyp3 project jobs

Author: williamh890

src/app/components/results-menu/scene-files/scene-files.component.html

@@ -14,7 +14,7 @@
 @if (!showUnzippedProductScreen) {
   <div>
     <mat-list class="products-list">
-      @for (product of products; track product) {
+      @for (product of products; track product.id) {
         <app-scene-file
           (toggle)="onToggleQueueProduct(product)"
           (unzip)="onOpenUnzipProduct($event)"
@@ -45,7 +45,7 @@ <h4>{{ 'RELATED_DATA' | translate }}</h4>
           </mat-list-item>
         }
 
-        @for (product of subqueryProducts; track product) {
+        @for (product of subqueryProducts; track product.id) {
           @if (dynamicQueryLoaded()) {
             <app-scene-file
               (toggle)="onToggleQueueProduct(product)"

src/app/components/results-menu/scenes-list/scene/scene-controls/scene-controls.component.html

@@ -63,10 +63,7 @@
 
   @if (!isDownloadable(scene)) {
     <div class="scene-control ml-2">
-      <app-hyp3-job-status-badge
-        [job]="scene.metadata.job"
-        [isFileDetails]="false"
-      >
+      <app-hyp3-job-status-badge [job]="scene.metadata.job">
       </app-hyp3-job-status-badge>
     </div>
   }

src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.html

@@ -1,37 +1,48 @@
-@if (isExpired(job) && !isFileDetails) {
+@if (isExpired(job())) {
   <mat-chip
     class="clickable"
     [matMenuTriggerFor]="resubmitJobMenu"
     color="primary"
     >{{ 'EXPIRED' | translate }}...
   </mat-chip>
-} @else if (isFailed(job) && !isFileDetails) {
+} @else if (isFailed(job())) {
   <mat-chip
     class="clickable"
     [matMenuTriggerFor]="resubmitJobMenu"
     color="primary"
     >{{ 'FAILED' | translate }}...
   </mat-chip>
-} @else if (isExpired(job) && isFileDetails) {
-  <mat-chip color="primary">{{ 'EXPIRED' | translate }}</mat-chip>
-} @else if (isPending(job)) {
+} @else if (isPending(job())) {
   <mat-chip color="secondary">{{ 'PENDING' | translate }}</mat-chip>
-} @else if (isFailed(job) && isFileDetails) {
-  <mat-chip color="accent">{{ 'FAILED' | translate }}</mat-chip>
-} @else if (isRunning(job)) {
+} @else if (isRunning(job())) {
   <mat-chip color="secondary">{{ 'RUNNING' | translate }}</mat-chip>
 }
 
 <mat-menu #resubmitJobMenu="matMenu">
   <button
-    (click)="onReviewExpiredJob()"
+    (click)="onSubmitExpiredJob()"
     [disabled]="remaining < 1"
     mat-menu-item
   >
     {{ 'RESUBMIT_JOB' | translate }}...
   </button>
 
-  <button (click)="onReviewExpiredJobs()" mat-menu-item>
-    {{ 'REQUEUE_PROJECT' | translate }} <b>({{ job.name }})</b>...
-  </button>
+  @if (expiredJobs.length > 0 || failedJobs.length > 0) {
+    <button mat-menu-item [matMenuTriggerFor]="requeueProjectMenu">
+      {{ 'REQUEUE_PROJECT' | translate }} <b>({{ job().name }})</b>...
+    </button>
+  }
+</mat-menu>
+
+<mat-menu #requeueProjectMenu="matMenu">
+  @if (expiredJobs.length > 0) {
+    <button (click)="onQueueJobs(expiredJobs)" mat-menu-item>
+      {{ 'REQUEUE_EXPIRED' | translate }} ({{ expiredJobs.length }} jobs)
+    </button>
+  }
+  @if (failedJobs.length > 0) {
+    <button (click)="onQueueJobs(failedJobs)" mat-menu-item>
+      {{ 'REQUEUE_FAILED' | translate }} ({{ failedJobs.length }} jobs)
+    </button>
+  }
 </mat-menu>

src/app/components/shared/hyp3-job-status-badge/hyp3-job-status-badge.component.ts

@@ -1,4 +1,6 @@
-import { Component, OnInit, Input, inject } from '@angular/core';
+import { Component, OnInit, input, inject } from '@angular/core';
+import { toObservable } from '@angular/core/rxjs-interop';
+import { combineLatest } from 'rxjs';
 
 import { Hyp3ApiService, ScenesService, Hyp3JobStatusService } from '@services';
 import {
@@ -32,21 +34,19 @@ export class Hyp3JobStatusBadgeComponent implements OnInit {
   private dialog = inject(MatDialog);
   private store$ = inject<Store<AppState>>(Store);
 
-  @Input() job: Hyp3Job;
-  @Input() isFileDetails = true;
+  public job = input.required<Hyp3Job>();
+  private job$ = toObservable(this.job);
+
+  public projectJobs: models.Hyp3Job[] = [];
+  public expiredJobs: models.Hyp3Job[] = [];
+  public failedJobs: models.Hyp3Job[] = [];
 
-  private jobs: models.Hyp3Job[];
   private costs: models.Hyp3Costs;
   private processingOptions: Hyp3ProcessingOptions;
-  private projectName = '';
   private validateOnly = false;
   public remaining = 0;
 
   ngOnInit(): void {
-    this.store$
-      .select(hyp3Store.getProcessingProjectName)
-      .subscribe((projectName) => (this.projectName = projectName));
-
     this.store$
       .select(hyp3Store.getProcessingOptions)
       .subscribe((options) => (this.processingOptions = options));
@@ -63,9 +63,18 @@ export class Hyp3JobStatusBadgeComponent implements OnInit {
       this.remaining = user.quota.remaining;
     });
 
-    this.scenesService.scenes$.subscribe((scenes) => {
-      this.jobs = scenes.map((scene) => scene.metadata.job);
-    });
+    combineLatest([this.scenesService.scenes$, this.job$]).subscribe(
+      ([scenes, selectedJob]) => {
+        this.projectJobs = scenes
+          .map((scene) => scene.metadata.job)
+          .filter((job) => selectedJob.name && selectedJob.name === job.name);
+
+        this.expiredJobs = this.projectJobs.filter((job) =>
+          this.isExpired(job),
+        );
+        this.failedJobs = this.projectJobs.filter((job) => this.isFailed(job));
+      },
+    );
   }
 
   public isExpired(job: Hyp3Job): boolean {
@@ -84,36 +93,29 @@ export class Hyp3JobStatusBadgeComponent implements OnInit {
     return this.hyp3JobStatus.isRunning(job);
   }
 
-  public onReviewExpiredJob() {
-    const jobType = models.hyp3JobTypes[this.job.job_type as string];
+  public onSubmitExpiredJob() {
+    const jobType = models.hyp3JobTypes[this.job().job_type as string];
 
     const job = {
-      granules: this.job.scenes,
+      granules: this.job().scenes,
       job_type: jobType,
-      processingOptions: this.job.job_parameters,
+      processingOptions: this.job().job_parameters,
     };
 
     this.openConfirmationDialog(jobType, job);
   }
 
-  public onReviewExpiredJobs() {
+  public onQueueJobs(jobs: Hyp3Job[]) {
     const job_types = hyp3JobTypes;
 
-    const projectJobs = this.jobs
-      .filter(
-        (job) =>
-          job.name === this.job.name &&
-          this.isExpired(job) &&
-          !this.isFailed(job),
-      )
-      .map((job) => {
-        return {
-          granules: job.scenes,
-          job_type: job_types[job.job_type as string],
-        } as QueuedHyp3Job;
-      });
-
-    this.store$.dispatch(new queueStore.AddJobs(projectJobs));
+    const jobsToQueue = jobs.map((job) => {
+      return {
+        granules: job.scenes,
+        job_type: job_types[job.job_type as string],
+      } as QueuedHyp3Job;
+    });
+
+    this.store$.dispatch(new queueStore.AddJobs(jobsToQueue));
   }
 
   private openConfirmationDialog(jobType: models.Hyp3JobType, job) {
@@ -156,7 +158,6 @@ export class Hyp3JobStatusBadgeComponent implements OnInit {
       maxHeight: '500px',
       data: {
         jobTypesWithQueued: jobTypesWithQueued,
-        projectName: this.projectName,
         processingOptions: options,
         validateOnly: this.validateOnly,
       },

src/assets/i18n/en.json

@@ -886,6 +886,8 @@
   "REQUEST_ACCESS_REJECTED": "Request for access has been rejected.",
   "REQUEST_ON_DEMAND_ACCESS": "Request On Demand Access",
   "REQUEUE_PROJECT": "Requeue project",
+  "REQUEUE_FAILED": "Failed jobs",
+  "REQUEUE_EXPIRED": "Expired jobs",
   "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "Resampled DEM (SRTM or NED) used for RTC processing.",
   "RESET_CHART_REFERENCE": "Reset chart reference",
   "RESET_TO_DEFAULT": "Reset to Default",

src/assets/i18n/es.json

@@ -886,6 +886,8 @@
   "REQUEST_ACCESS_REJECTED": "La solicitud de acceso ha sido rechazada.",
   "REQUEST_ON_DEMAND_ACCESS": "Solicitar acceso a On Demand",
   "REQUEUE_PROJECT": "Regresar el proyecto a la lista",
+  "REQUEUE_FAILED": "Failed jobs",
+  "REQUEUE_EXPIRED": "Expired jobs",
   "RESAMPLED_DEM_SRTM_OR_NED_USED_FOR_RTC_PROCESSING": "DEM remuestreado (SRTM o NED) utilizado para el procesamiento de RTC.",
   "RESET_CHART_REFERENCE": "Restablecer gráfico",
   "RESET_TO_DEFAULT": "Restablecer a los predeterminados",