Merge branch 'hotfix/2.13.1'

dockstore · Nov 4, 2024 · 810d090 · 810d090
2 parents 2dcbfbf + 4183d8b
commit 810d090
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/src/app/container/container.component.html b/src/app/container/container.component.html
@@ -13,7 +13,7 @@
   ~    See the License for the specific language governing permissions and
   ~    limitations under the License.
   -->
-<app-workflow *ngIf="displayAppTool" [isWorkflowPublic]="isToolPublic"></app-workflow>
+<app-workflow *ngIf="displayAppTool" [isWorkflowPublic]="isToolPublic" [shouldClearState]="false"></app-workflow>
 <div *ngIf="tool && !displayAppTool">
   <div class="row m-1 mt-3 mb-0" *ngIf="tool?.archived">
     <mat-card class="alert alert-warning mat-elevation-z m-0">

diff --git a/src/app/container/container.component.ts b/src/app/container/container.component.ts
@@ -197,7 +197,7 @@ export class ContainerComponent extends Entry<Tag> implements AfterViewInit, OnI
   }
 
   ngOnInit() {
-    this.init();
+    this.init(false);
   }
 
   ngAfterViewInit() {

diff --git a/src/app/shared/entry.ts b/src/app/shared/entry.ts
@@ -91,9 +91,15 @@ export abstract class Entry<V extends WorkflowVersion | Tag> implements OnDestro
     this.gA4GHFilesService.clearFiles();
   }
 
-  init() {
-    // Getting rid of this line makes the linking work again and I didn't notice any weird behaviour, but I'm not sure.. Needs more testing
-    // this.clearState();
+  init(shouldClearState: boolean) {
+    // In a PR that added support for displaying AppTools, this clearState call was commented out:
+    // https://github.com/dockstore/dockstore-ui2/pull/1388#discussion_r761229496
+    // It has been partially restored, for non-tool/AppTool entry types, to eliminate the
+    // Flash Of Previous Entry (FOPE) problem for those entry types:
+    // https://ucsc-cgl.atlassian.net/browse/SEAB-6748
+    if (shouldClearState) {
+      this.clearState();
+    }
     this.subscriptions();
     this.router.events
       .pipe(

diff --git a/src/app/workflow/workflow.component.ts b/src/app/workflow/workflow.component.ts
@@ -210,6 +210,7 @@ export class WorkflowComponent extends Entry<WorkflowVersion> implements AfterVi
 
   @Input() user;
   @Input() selectedVersion: WorkflowVersion;
+  @Input() shouldClearState: boolean = true;
 
   constructor(
     private dockstoreService: DockstoreService,
@@ -283,7 +284,7 @@ export class WorkflowComponent extends Entry<WorkflowVersion> implements AfterVi
   }
 
   ngOnInit() {
-    this.init();
+    this.init(this.shouldClearState);
     //watch for changes in search
     this.versionFilterCtrl.valueChanges.pipe(takeUntil(this.ngUnsubscribe)).subscribe(() => {
       this.filterVersions();