commit 7b22a298b4add1f8205da3c1a37a7df7c7dd335a
author Ben Rohlfs <brohlfs@google.com> Thu Sep 29 12:52:01 2022 +0200
committer Ben Rohlfs <brohlfs@google.com> Fri Sep 30 12:54:05 2022 +0200
tree e8dee921c2622cad95d77ea185fa98653ef6fe2c
parent e87cab04ad28f2dbdaab97b841a5d902cc341e5a

Move `attempt` and `filter` into URL parameters

Release-Notes: skip
Google-Bug-Id: b/235185477
Change-Id: I12b90af3c4b373801723764a17dc9a81aad03715

polygerrit-ui/app/models/views/change.ts

diff --git a/polygerrit-ui/app/models/views/change.ts b/polygerrit-ui/app/models/views/change.ts
index b8451a0..4c97f60 100644
--- a/polygerrit-ui/app/models/views/change.ts
+++ b/polygerrit-ui/app/models/views/change.ts
@@ -12,6 +12,7 @@
 } from '../../api/rest-api';
 import {GerritView} from '../../services/router/router-model';
 import {UrlEncodedCommentId} from '../../types/common';
+import {select} from '../../utils/observable-util';
 import {
   encodeURL,
   getBaseUrl,
@@ -84,6 +85,12 @@
   }
   let suffix = `${range}`;
   const queries = [];
+  if (state.attempt) {
+    if (state.attempt !== 'latest') queries.push(`attempt=${state.attempt}`);
+  }
+  if (state.filter) {
+    queries.push(`filter=${state.filter}`);
+  }
   if (state.forceReload) {
     queries.push('forceReload=true');
   }
@@ -117,7 +124,22 @@
   define<ChangeViewModel>('change-view-model');
 
 export class ChangeViewModel extends Model<ChangeViewState | undefined> {
+  public readonly tab$ = select(this.state$, state => state?.tab);
+
+  public readonly attempt$ = select(this.state$, state => state?.attempt);
+
+  public readonly filter$ = select(this.state$, state => state?.filter);
+
   constructor() {
     super(undefined);
+    this.state$.subscribe(s => {
+      if (s?.usp || s?.forceReload || s?.openReplyDialog) {
+        this.updateState({
+          usp: undefined,
+          forceReload: undefined,
+          openReplyDialog: undefined,
+        });
+      }
+    });
   }
 }