Skip to content

feat(map): allow meta services in metric links and gauges #240

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
vuntz merged 10 commits into from
May 6, 2026
Merged

feat(map): allow meta services in metric links and gauges #240

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
796d69e
fix(map): add resource2 for metric link
gfontaineCentreon Mar 31, 2026
6201754
fix(map): add fallback to write resource2Id during setDataProperties
gfontaineCentreon Mar 31, 2026
94e98fb
Merge branch 'dev' into MON-174548-map-metaservice-link
gfontaineCentreon Apr 20, 2026
9ba8cc5
fix(map): add minimified files
gfontaineCentreon Apr 20, 2026
a330a2d
Update src/main/webapp/js/grapheditor/Actions.js
gfontaineCentreon Apr 23, 2026
dcc3050
fix(drawio): rework pr
gfontaineCentreon Apr 23, 2026
40d572d
Merge branch 'MON-174548-map-metaservice-link' of github.com:centreon…
gfontaineCentreon Apr 23, 2026
d11dd30
fix(drawio): rework pr
gfontaineCentreon Apr 23, 2026
60124b0
fix(drawio): add comments
gfontaineCentreon Apr 28, 2026
ccd302c
Merge branch 'dev' into MON-174548-map-metaservice-link
gfontaineCentreon May 4, 2026
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
148 changes: 74 additions & 74 deletions src/main/webapp/js/app.min.js
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion src/main/webapp/js/diagramly/EditorUi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15237,6 +15237,8 @@
return;
}

// Unlike setDataProperties, no Centreon wizard that stores graph._centreonEditCell
// ever sends setStyleProperties, so graph.getSelectionCell() is sufficient here.
var cell = graph.getSelectionCell();
var cellStyle = graph.getModel().getStyle(cell);

Expand All @@ -15258,7 +15260,9 @@

var graph = this.editor.graph;

var cell = graph.getSelectionCell();
// Fallback to _centreonEditCell because opening the wizard shifts focus to the iframe, which clears the graph selection before setDataProperties is received.
var cell = graph.getSelectionCell() || graph._centreonEditCell;
Comment thread
gfontaineCentreon marked this conversation as resolved.
Comment thread
gfontaineCentreon marked this conversation as resolved.
graph._centreonEditCell = null;
var cellValue = graph.getModel().getValue(cell);
cellValue = cellValue.cloneNode(true);

Expand Down
5 changes: 3 additions & 2 deletions src/main/webapp/js/grapheditor/Actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -762,7 +762,7 @@ Actions.prototype.init = function()
const resourceCentreonProps = ['type', 'resourceType', 'resourceId', 'displayLabel', 'displayImage', 'displayParentName', 'useResourceName', 'label',
'resourceName', 'modelId', 'viewId', 'parentName', 'parentType', 'parentId', 'displayWeatherStatusBackgroundColor', 'useBackgroundStatusColor'];
const linkProps = ['type', 'linkType', 'parentName', 'parentType', 'parentId',
'resourceType', 'resourceId', 'resourceName', 'modelId','metric1Min',
'resourceType', 'resourceId', 'resourceName', 'resource2Id', 'resource2Name', 'modelId', 'metric1Min',
'metric1Max', 'metric2Min', 'metric2Max', 'metricName1', 'metricName2', 'displayPercent'];
const mediaProps = ['type', 'mediaType', 'newTab', 'elementUrl',
'imageName', 'centreonImageId', 'label'];
Expand Down Expand Up @@ -808,11 +808,12 @@ Actions.prototype.init = function()
cellAttributes = createAttributes(containerProps);
}

graph._centreonEditCell = cell;
parent.postMessage(JSON.stringify({
mxObject: cellAttributes,
mxStyle: cell.getStyle(),
event: 'setShowWizardShapeProperties',
}), '*');
}), '*');

}, null, null, Editor.ctrlKey + '+E');
this.addAction('editCentreonStyle', function()
Expand Down
330 changes: 165 additions & 165 deletions src/main/webapp/js/stencils.min.js
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions src/main/webapp/js/viewer-static.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading