Skip to content

Do not update report title for secondary dimension reports #23653

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 8, 2025
Merged

Do not update report title for secondary dimension reports #23653

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9408b06
Do not update report title for secondary dimension reports
sgiehl Oct 7, 2025
15b539f
add UI test
sgiehl Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions plugins/CoreHome/javascripts/dataTable.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1764,6 +1764,7 @@ $.extend(DataTable.prototype, UIControl.prototype, {
// modify parameters
self.resetAllFilters();
var newParams = broadcast.getValuesFromUrl(url);
var isSecondaryDimensionReport = self.param.module === newParams.module && self.param.action === newParams.action && newParams.secondaryDimension;

for (var key in newParams) {
self.param[key] = decodeURIComponent(newParams[key]);
Expand All @@ -1775,14 +1776,16 @@ $.extend(DataTable.prototype, UIControl.prototype, {
var relatedReportName = $this.text();

// do ajax request
self.reloadAjaxDataTable(true, (function (relatedReportName) {
self.reloadAjaxDataTable(true, (function (relatedReportName, isSecondaryDimensionReport) {

return function (newReport) {
var newDomElem = self.dataTableLoaded(newReport, self.workingDivId);
hideShowRelatedReports(clicked);
replaceReportTitleAndHelp(newDomElem, relatedReportName);
if (!isSecondaryDimensionReport) {
replaceReportTitleAndHelp(newDomElem, relatedReportName);
}
}
})(relatedReportName));
})(relatedReportName, isSecondaryDimensionReport));
});
});
},
Expand Down
33 changes: 33 additions & 0 deletions plugins/Events/tests/UI/Events_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
describe("Events", function () {
this.timeout(0);

var generalParams = 'idSite=1&period=year&date=2012-08-09',
urlBaseGeneric = 'module=CoreHome&action=index&',
urlBase = urlBaseGeneric + generalParams;

it('should load the Events > index page correctly', async function () {
await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=Events_Events");
await page.mouse.move(-10, -10);

expect(await page.screenshotSelector('.pageWrap,.dataTable')).to.matchImage('overview');
});

it("should show report flattened", async function() {
await page.click('.dropdownConfigureIcon');
await page.mouse.move(-10, -10);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Likely not needed here, but also no big harm in keeping it.

await page.waitForTimeout(250); // rendering
await page.click('.dataTableFlatten');
await page.mouse.move(-10, -10);
await page.waitForNetworkIdle();

expect(await page.screenshotSelector('.theWidgetContent')).to.matchImage('flattened');
});

it("should show another secondary dimension", async function() {
await page.evaluate(() => $('.datatableRelatedReports li span:contains("Event Name")').click());
await page.waitForTimeout(50);
await page.waitForNetworkIdle();

expect(await page.screenshotSelector('.theWidgetContent')).to.matchImage('secondary_switched');
});
});
3 changes: 3 additions & 0 deletions plugins/Events/tests/UI/expected-screenshots/Events_flattened.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
0 ...ots/UIIntegrationTest_events_overview.png → .../expected-screenshots/Events_overview.png
View file
Open in desktop
File renamed without changes
3 changes: 3 additions & 0 deletions plugins/Events/tests/UI/expected-screenshots/Events_secondary_switched.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 0 additions & 12 deletions tests/UI/specs/UIIntegration_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,18 +427,6 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik?
});
});

describe("EventsPages", function () {
this.title = parentSuite.title; // to make sure the screenshot prefix is the same

// Events pages
it('should load the Events > index page correctly', async function () {
await page.goto("?" + urlBase + "#?" + generalParams + "&category=General_Actions&subcategory=Events_Events");
await page.mouse.move(-10, -10);

expect(await page.screenshotSelector('.pageWrap,.dataTable')).to.matchImage('events_overview');
});
});

describe("ExampleUiPages", function () {
this.title = parentSuite.title; // to make sure the screenshot prefix is the same

Expand Down