Skip to content
Snippets Groups Projects
Verified Commit f151ee97 authored by Alexander-Krause's avatar Alexander-Krause
Browse files

remove error-object and send save request only if data is changed

parent f7a3feb6
No related branches found
No related tags found
No related merge requests found
...@@ -17,13 +17,18 @@ export default Component.extend(AlertifyHandler, { ...@@ -17,13 +17,18 @@ export default Component.extend(AlertifyHandler, {
saveAgent() { saveAgent() {
const self = this; const self = this;
if(this.get('procezz.hasDirtyAttributes')){
this.set('showSpinner', true); this.set('showSpinner', true);
this.get('agent').save().then(() => { this.get('agent').save().then(() => {
self.set('showSpinner', false); self.set('showSpinner', false);
self.handleMessageForUser(); self.handleMessageForUser();
}); });
} else {
self.handleMessageForUser();
}
} }
}, },
handleMessageForUser() { handleMessageForUser() {
......
...@@ -176,6 +176,10 @@ export default Component.extend({ ...@@ -176,6 +176,10 @@ export default Component.extend({
'content': 'data(id)', 'content': 'data(id)',
'background-color': '#ff0000' 'background-color': '#ff0000'
}) })
.selector('.hidden')
.css({
'opacity': 0.5
})
.selector('.highlighted') .selector('.highlighted')
.css({ .css({
'background-color': '#61bffc', 'background-color': '#61bffc',
...@@ -225,7 +229,9 @@ export default Component.extend({ ...@@ -225,7 +229,9 @@ export default Component.extend({
newAgentList.forEach((agentRecord) => { newAgentList.forEach((agentRecord) => {
if(agentRecord.get('isHidden') && !showHiddenEntities) { const agentHidden = agentRecord.get('isHidden');
if(agentHidden && !showHiddenEntities) {
// skip this agent // skip this agent
// proceed with next one // proceed with next one
return; return;
...@@ -241,9 +247,15 @@ export default Component.extend({ ...@@ -241,9 +247,15 @@ export default Component.extend({
let cssClassAgent = faultyAgent ? let cssClassAgent = faultyAgent ?
"agent-error" : "agent"; "agent-error" : "agent";
cssClassAgent = agentHidden ?
"hidden " + cssClassAgent : cssClassAgent;
let cssClassAgentEdge = faultyAgent ? let cssClassAgentEdge = faultyAgent ?
"edge-error" : "edge"; "edge-error" : "edge";
cssClassAgentEdge = agentHidden ?
"hidden " + cssClassAgentEdge : cssClassAgentEdge;
const agentAndEdge = { const agentAndEdge = {
nodes: [ nodes: [
{ data: { id: agentName, emberModel: agentRecord}, { data: { id: agentName, emberModel: agentRecord},
...@@ -266,9 +278,12 @@ export default Component.extend({ ...@@ -266,9 +278,12 @@ export default Component.extend({
const procezzes = agentRecord.get('procezzes'); const procezzes = agentRecord.get('procezzes');
procezzes.forEach((procezzRecord) => { procezzes.forEach((procezzRecord) => {
if(procezzRecord.get('isHidden') && !showHiddenEntities) { const procezzHidden = procezzRecord.get('isHidden');
// skip this procezz
// proceed with next one if(procezzHidden && !showHiddenEntities) {
// skip this procezz if user
// does not want to show hidden procezzes
// -> proceed with next one
return; return;
} }
...@@ -284,12 +299,20 @@ export default Component.extend({ ...@@ -284,12 +299,20 @@ export default Component.extend({
cssClassProcezz = faultyProcezz ? cssClassProcezz = faultyProcezz ?
"procezz-error" : cssClassProcezz; "procezz-error" : cssClassProcezz;
cssClassProcezz = procezzHidden ?
"hidden " + cssClassProcezz : cssClassProcezz;
let cssClassEdge = monitoredEnabled ? let cssClassEdge = monitoredEnabled ?
"edge-monitoring-enabled" : "edge"; "edge-monitoring-enabled" : "edge";
cssClassEdge = faultyProcezz ? cssClassEdge = faultyProcezz ?
"edge-error" : cssClassEdge; "edge-error" : cssClassEdge;
cssClassEdge = procezzHidden ?
"hidden " + cssClassEdge : cssClassEdge;
const procezzAndEdge = { const procezzAndEdge = {
nodes: [ nodes: [
{ {
......
...@@ -24,12 +24,16 @@ export default Component.extend(AlertifyHandler, { ...@@ -24,12 +24,16 @@ export default Component.extend(AlertifyHandler, {
saveProcezz() { saveProcezz() {
const self = this; const self = this;
if(this.get('procezz.hasDirtyAttributes')){
this.set('showSpinner', true); this.set('showSpinner', true);
this.get('procezz').save({include: 'agent'}).then(() => { this.get('procezz').save({include: 'agent'}).then(() => {
self.set('showSpinner', false); self.set('showSpinner', false);
self.handleMessageForUser(); self.handleMessageForUser();
}); });
} else {
self.handleMessageForUser();
}
} }
}, },
......
import { belongsTo } from 'ember-data/relationships';
import attr from 'ember-data/attr'; import attr from 'ember-data/attr';
import Model from 'ember-data/model'; import Model from 'ember-data/model';
...@@ -10,8 +9,6 @@ export default Model.extend({ ...@@ -10,8 +9,6 @@ export default Model.extend({
errorOccured: attr("boolean"), errorOccured: attr("boolean"),
errorMessage: attr("string"), errorMessage: attr("string"),
isHidden: attr("boolean"), isHidden: attr("boolean")
agent: belongsTo("error-object")
}); });
import { belongsTo } from 'ember-data/relationships';
import Model from 'ember-data/model';
export default Model.extend({
agent: belongsTo("base-model")
});
...@@ -14,6 +14,14 @@ ...@@ -14,6 +14,14 @@
</div> </div>
</td> </td>
</tr> </tr>
<tr>
<td>
<b>Shutdown Command</b>
</td>
<td>
{{textarea rows=1 class="form-control no-horizontal-scroll" value=procezz.shutdownCommand placeholder=procezz.shutdownCommand}}
</td>
</tr>
<tr> <tr>
<td> <td>
<b>User Execution Command</b> <b>User Execution Command</b>
......
export { default } from 'explorviz-frontend-extension-discovery/models/error-object';
import { moduleForModel, test } from 'ember-qunit';
moduleForModel('error-object', 'Unit | Model | error object', {
// Specify the other units that are required for this test.
needs: []
});
test('it exists', function(assert) {
let model = this.subject();
// let store = this.store();
assert.ok(!!model);
});
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment