From 59d05c7b55b305947ef85bbbd7dbd26daafda4e3 Mon Sep 17 00:00:00 2001 From: Ben Rohlfs Date: Mon, 30 Nov 2020 10:42:23 +0100 Subject: [PATCH] Remove requesting DETAILED_LABELS for the dashboard This is following up on change 288347. The backend was changed such that it is not required anymore for the attention set dashboard to request DETAILED_LABELS. Just LABELS are enough. Change-Id: I9e82c94fbecd3fff821e7a8e67281c3cc395751c (cherry picked from commit 56f7e79153f0ee17d7ac3192d75481015e83e773) --- java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java | 4 +--- .../shared/gr-rest-api-interface/gr-rest-api-interface.ts | 4 +--- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java index c17cd97bc3..f1da6b7190 100644 --- a/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java +++ b/java/com/google/gerrit/httpd/raw/IndexPreloadingUtil.java @@ -123,9 +123,7 @@ public class IndexPreloadingUtil { options.add(ListChangesOption.LABELS); options.add(ListChangesOption.DETAILED_ACCOUNTS); - if (isEnabledAttentionSet(serverApi)) { - options.add(ListChangesOption.DETAILED_LABELS); - } else { + if (!isEnabledAttentionSet(serverApi)) { options.add(ListChangesOption.REVIEWED); } return ListOption.toHex(options); diff --git a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts index 7d08560920..b3596c7586 100644 --- a/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts +++ b/polygerrit-ui/app/elements/shared/gr-rest-api-interface/gr-rest-api-interface.ts @@ -1422,9 +1422,7 @@ export class GrRestApiInterface ListChangesOption.LABELS, ListChangesOption.DETAILED_ACCOUNTS, ]; - if (config?.change && config.change.enable_attention_set) { - options.push(ListChangesOption.DETAILED_LABELS); - } else { + if (!config?.change?.enable_attention_set) { options.push(ListChangesOption.REVIEWED); }