opendev/gerrit
Code Issues Proposed changes

Merge "Replace ${project} in a foreach query (for project dashboards)" into stable-2.16

Browse Source
This commit is contained in:
David Pursehouse
2019-09-29 01:18:49 +00:00
committed by Gerrit Code Review
parent 91180b417e 7868c879b3
commit 2edcdf23e1
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view.js
View File

@@ -117,9 +117,8 @@
const suffix = response.foreach ? ' ' + response.foreach : '';
return {
name: section.name,
query:
section.query.replace(
PROJECT_PLACEHOLDER_PATTERN, project) + suffix,
query: (section.query + suffix).replace(
PROJECT_PLACEHOLDER_PATTERN, project),
};
}),
};

5
polygerrit-ui/app/elements/change-list/gr-dashboard-view/gr-dashboard-view_test.html
View File

@@ -223,7 +223,6 @@ limitations under the License.
test('dashboard with foreach', () => {
sandbox.stub(element.$.restAPI, 'getDashboard', () => Promise.resolve({
title: 'title',
// Note: ${project} should not be resolved in foreach!
foreach: 'foreach for ${project}',
sections: [
{name: 'section 1', query: 'query 1'},
@@ -236,10 +235,10 @@ limitations under the License.
{
title: 'title',
sections: [
{name: 'section 1', query: 'query 1 foreach for ${project}'},
{name: 'section 1', query: 'query 1 foreach for project'},
{
name: 'section 2',
query: 'project query 2 foreach for ${project}',
query: 'project query 2 foreach for project',
},
],
});