diff options
| author | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2024-02-28 11:51:45 +0200 |
|---|---|---|
| committer | Jukka Jokiniva <jukka.jokiniva@qt.io> | 2024-04-02 13:16:22 +0000 |
| commit | fed0414714c598089a0b9bb6d22432a3efc530b8 (patch) | |
| tree | 0150aa686011b88649ff8d074379cdf8fb1019d3 | |
| parent | 6f761a58924cf305b49c82fcc5faa149a8657b66 (diff) | |
Fix Your Changes dashboardv3.8.4-based
Assignee field is no longer queryable.
Fixed mixing of integrating and closed section by adding
query definitions also java side.
Change-Id: I37078a442350d99c8a14b100b35f5e89d9b68fac
Reviewed-by: Daniel Smith <daniel.smith@qt.io>
| -rw-r--r-- | java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java | 7 | ||||
| -rw-r--r-- | polygerrit-ui/app/utils/dashboard-util.ts | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java index 36fa61b239..019fcac526 100644 --- a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java +++ b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java @@ -64,8 +64,12 @@ public class IndexPreloadingUtil { public static final String DASHBOARD_INCOMING_QUERY = "is:open -owner:${user} -is:wip reviewer:${user} limit:25"; public static final String CC_QUERY = "is:open -is:wip cc:${user} limit:10"; + public static final String INTEGRATING_QUERY = + "(is:staged OR is:integrating) " + + "(owner:${user} OR reviewer:${user} OR cc:${user}) " + + "limit:20"; public static final String DASHBOARD_RECENTLY_CLOSED_QUERY = - "is:closed (-is:wip OR owner:self) " + "(is:merged OR is:abandoned OR is:deferred) (-is:wip OR owner:self) " + "(owner:${user} OR reviewer:${user} OR cc:${user}) " + "-age:4w limit:10"; public static final String NEW_USER = "owner:${user} limit:1"; @@ -79,6 +83,7 @@ public class IndexPreloadingUtil { DASHBOARD_OUTGOING_QUERY, DASHBOARD_INCOMING_QUERY, CC_QUERY, + INTEGRATING_QUERY, DASHBOARD_RECENTLY_CLOSED_QUERY, NEW_USER) .map(query -> query.replaceAll("\\$\\{user}", "self")) diff --git a/polygerrit-ui/app/utils/dashboard-util.ts b/polygerrit-ui/app/utils/dashboard-util.ts index 940218ea87..f9d3ba66a0 100644 --- a/polygerrit-ui/app/utils/dashboard-util.ts +++ b/polygerrit-ui/app/utils/dashboard-util.ts @@ -81,9 +81,8 @@ const CCED: DashboardSection = { const INTEGRATING: DashboardSection = { name: 'Integrating', query: - '(is:staged OR is:integrating) (-is:wip OR owner:self) ' + - '(owner:${user} OR reviewer:${user} OR assignee:${user} ' + - 'OR cc:${user})', + '(is:staged OR is:integrating) ' + + '(owner:${user} OR reviewer:${user} OR cc:${user})', suffixForDashboard: 'limit:20', }; |