Skip to content
New issue

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

#

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

Already on GitHub? # to your account

Bug fixes: Add mask and make chart name unique #1028

Merged
merged 2 commits into from
Sep 11, 2019
Merged

Bug fixes: Add mask and make chart name unique #1028

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
401283e
Bug fixes: Add mask and make chart name unique
mkzia Sep 6, 2019
c1c2cf5
Refresh clears the search field
mkzia Sep 10, 2019
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
13 changes: 10 additions & 3 deletions html/gui/js/modules/dashboard/ReportThumbnailsComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ XDMoD.Module.Dashboard.ReportThumbnailsComponent = Ext.extend(Ext.Panel, {
listeners: {
click: {
fn: function (dataView, index, node, e) {
var win; // Window to display the chart
this.tmpHpc = new CCR.xdmod.ui.HighChartPanel({
chartOptions: {
chart: {
Expand Down Expand Up @@ -137,7 +138,12 @@ XDMoD.Module.Dashboard.ReportThumbnailsComponent = Ext.extend(Ext.Panel, {
proxy: new Ext.data.HttpProxy({
method: 'POST',
url: 'controllers/metric_explorer.php'
})
}),
listeners: {
load: function () {
win.el.unmask();
}
}

})

Expand Down Expand Up @@ -175,7 +181,7 @@ XDMoD.Module.Dashboard.ReportThumbnailsComponent = Ext.extend(Ext.Panel, {

this.tmpHpc.store.setBaseParam('operation', 'get_data');

var win = new Ext.Window({
win = new Ext.Window({
layout: 'fit',
width: 800,
height: 600,
Expand All @@ -187,7 +193,7 @@ XDMoD.Module.Dashboard.ReportThumbnailsComponent = Ext.extend(Ext.Panel, {
text: 'Open in Metric Explorer',
handler: function () {
win.destroy();
XDMoD.Module.MetricExplorer.setConfig(config, config.title, false);
XDMoD.Module.MetricExplorer.setConfig(config, config.title, true);
}
}, {
text: 'Close',
Expand All @@ -201,6 +207,7 @@ XDMoD.Module.Dashboard.ReportThumbnailsComponent = Ext.extend(Ext.Panel, {
if (viewer.el) {
viewer.el.mask();
}
win.el.mask('Loading...');
},
destroy: function () {
var viewer = CCR.xdmod.ui.Viewer.getViewer();
Expand Down
1 change: 1 addition & 0 deletions html/gui/js/modules/dashboard/SavedChartsReportsComponent.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ XDMoD.Module.Dashboard.SavedChartsReportsComponent = Ext.extend(CCR.xdmod.ui.Por
text: 'Refresh',
scope: this,
handler: function () {
searchField.onTrigger1Click();
this.chartReportStore.reload();
}
}
Expand Down
2 changes: 1 addition & 1 deletion html/gui/js/modules/metric_explorer/MetricExplorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6359,7 +6359,7 @@ Ext.extend(XDMoD.Module.MetricExplorer, XDMoD.PortalModule, {
this.updateRawDataWindowVisibility();
if (location.hash.split('config=')[1]) {
var config = JSON.parse(window.atob(location.hash.split('config=')[1]));
XDMoD.Module.MetricExplorer.setConfig(config, config.title, false);
XDMoD.Module.MetricExplorer.setConfig(config, config.title, true);
}
}, // activate

Expand Down