Skip to content
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

Jump to bottom

Switch to new report after "Save As" #1302

Merged
merged 3 commits into from
May 4, 2020
Merged

Switch to new report after "Save As" #1302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c6f1507
Switch to new report after "Save As"
jtpalmer May 2, 2020
d9261d6
Add test
jtpalmer May 2, 2020
55ba6a4
Declare variables before use
jtpalmer May 2, 2020
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
27 changes: 17 additions & 10 deletions html/gui/js/report_builder/ReportCreator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,11 @@ XDMoD.ReportCreator = Ext.extend(Ext.form.FormPanel, {
thumbnailChartLayoutPreview;
}, this, {single: true});

// Declare variable before they are used, but cannot be defined here
// due to circular references.
var btnSaveReport;
var btnSaveReportAs;

this.dirtyConfig = function (field, nv, ov) {
CCR.xdmod.reporting.dirtyState = true;
self.needsSave = true;
Expand Down Expand Up @@ -501,17 +506,17 @@ XDMoD.ReportCreator = Ext.extend(Ext.form.FormPanel, {
if (success) {
self.parent.reportsOverview.reportStore.reload();

if (!generateCopy) {
btnSaveReport.setDisabled(true);
self.needsSave = false;
CCR.xdmod.reporting.dirtyState = false;
btnSaveReport.setDisabled(true);
self.needsSave = false;
CCR.xdmod.reporting.dirtyState = false;

self.setReportID(responseData.report_id);
self.setReportID(responseData.report_id);

// This reload triggers (server-side)
// cache cleanup
flushReloadReportCharts(responseData.report_id);
// This reload triggers (server-side)
// cache cleanup
flushReloadReportCharts(responseData.report_id);

if (!generateCopy) {
var action =
responseData.phase.slice(0,1).toUpperCase() +
responseData.phase.slice(1) + 'd';
Expand All @@ -533,6 +538,8 @@ XDMoD.ReportCreator = Ext.extend(Ext.form.FormPanel, {
}
);
} else {
self.setReportName(reportData.report_name);

XDMoD.TrackEvent(
'Report Generator (Report Editor)',
'Report successfully saved as a copy',
Expand Down Expand Up @@ -1040,7 +1047,7 @@ XDMoD.ReportCreator = Ext.extend(Ext.form.FormPanel, {
p.expandGeneralInfo = false;
});

var btnSaveReport = new Ext.Button({
btnSaveReport = new Ext.Button({
iconCls: 'btn_save',
text: 'Save',
disabled: true,
Expand All @@ -1054,7 +1061,7 @@ XDMoD.ReportCreator = Ext.extend(Ext.form.FormPanel, {
}
});

var btnSaveReportAs = new Ext.Button({
btnSaveReportAs = new Ext.Button({
iconCls: 'btn_save',
text: 'Save As',
tooltip: 'Create and save a copy of this report.',
Expand Down
20 changes: 20 additions & 0 deletions tests/ui/test/specs/xdmod/reportGenerator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,18 @@ describe('Report Generator', function () {
it('Click "Save" in "Save As" window', function () {
reportGeneratorPage.confirmSaveReportAs();
});
it('Check copied report name', function () {
expect(reportGeneratorPage.getReportName(), 'Report name is correct').to.be.equal(testReport.name);
});
it('Edit copied report', function () {
testReport.header = 'Header for copied report';
reportGeneratorPage.setHeaderText(testReport.header);
testReport.chartsPerPage = testReport.chartsPerPage === 1 ? 2 : 1;
reportGeneratorPage.setNumberOfChartsPerPage(testReport.chartsPerPage);
});
it('Save report', function () {
reportGeneratorPage.saveReport();
});
it('Return to "My Reports"', function () {
reportGeneratorPage.returnToMyReports();
});
Expand All @@ -644,6 +656,14 @@ describe('Report Generator', function () {
expect(reportRow.getNumberOfCharts(), 'Number of charts of is correct').to.be.equal(testReport.numberOfCharts);
expect(reportRow.getNumberOfChartsPerPage(), 'Number of charts per page is correct').to.be.equal(testReport.chartsPerPage);
});
it('Edit copied report and compare values', function () {
reportGeneratorPage.getMyReportsRows()[2].doubleClick();
expect(reportGeneratorPage.getHeaderText(), 'Header text is correct').to.be.equal(testReport.header);
expect(reportGeneratorPage.getNumberOfChartsPerPage(), 'Number of charts per page is correct').to.be.equal(testReport.chartsPerPage);
});
it('Return to "My Reports"', function () {
reportGeneratorPage.returnToMyReports();
});
});

describe('Edit report and make changes', function () {
Expand Down