From 29d9ece7d96191947d9dface5b1b37ed92845b42 Mon Sep 17 00:00:00 2001 From: jonmccormick Date: Fri, 21 Apr 2017 12:38:35 -0600 Subject: [PATCH] Added changes for HipChat Issue #58 fixed the alert to use camelCaseToTitleCase --- src/listener/utils/transforms/alert.js | 5 +++-- src/listener/utils/transforms/server-hardware.js | 6 ++---- .../utils/transforms/server-profile-compliance-preview.js | 6 ++---- src/listener/utils/transforms/server-profile-template.js | 6 ++---- src/listener/utils/transforms/server-profile.js | 6 ++---- src/test/resource.js | 2 +- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/src/listener/utils/transforms/alert.js b/src/listener/utils/transforms/alert.js index b4057c5..1b725e4 100644 --- a/src/listener/utils/transforms/alert.js +++ b/src/listener/utils/transforms/alert.js @@ -40,6 +40,7 @@ export default class Alert extends Resource { if (this.__isNonDisplayField__(field) || !this[field]) { continue; } + if (field === 'associatedResource') { fields.push({ title: 'Resource', @@ -48,7 +49,7 @@ export default class Alert extends Resource { }); } else { fields.push({ - title: field, + title: this.camelCaseToTitleCase(field), short: true, value: this[field] }); @@ -66,7 +67,7 @@ export default class Alert extends Resource { if (field === 'associatedResource') { output += '\t\u2022 Resource: ' + this[field].resourceName + '\n'; } else { - output += '\t\u2022 ' + field + ': ' + this[field] + '\n'; + output += '\t\u2022 ' + this.camelCaseToTitleCase(field) + ': ' + this[field] + '\n'; } } //Add status to output only for HipChat diff --git a/src/listener/utils/transforms/server-hardware.js b/src/listener/utils/transforms/server-hardware.js index dc2ebe4..dfdd1ae 100644 --- a/src/listener/utils/transforms/server-hardware.js +++ b/src/listener/utils/transforms/server-hardware.js @@ -44,10 +44,8 @@ export default class ServerHardware extends Resource { continue; } - let displayField = this.camelCaseToTitleCase(field); - fields.push({ - title: displayField, + title: this.camelCaseToTitleCase(field), short: true, value: this[field] }); @@ -77,7 +75,7 @@ export default class ServerHardware extends Resource { if (this.__isNonDisplayField__(field) || !this[field]) { continue; } - output += '\t\u2022 ' + field + ': ' + this[field] + '\n'; + output += '\t\u2022 ' + this.camelCaseToTitleCase(field) + ': ' + this[field] + '\n'; } if (this.serverProfileUri) { output += '\t\u2022 Profile: ' + getDeviceName(this.serverProfileUri) + '\n'; diff --git a/src/listener/utils/transforms/server-profile-compliance-preview.js b/src/listener/utils/transforms/server-profile-compliance-preview.js index 570d790..41845f7 100644 --- a/src/listener/utils/transforms/server-profile-compliance-preview.js +++ b/src/listener/utils/transforms/server-profile-compliance-preview.js @@ -49,10 +49,8 @@ export default class ServerProfileCompliancePreview extends Resource { value = this[field]; } - let displayField = this.camelCaseToTitleCase(field); - fields.push({ - title: displayField, + title: this.camelCaseToTitleCase(field), short: false, value: value }); @@ -73,7 +71,7 @@ export default class ServerProfileCompliancePreview extends Resource { value = this[field]; } if (value) { - output += field + ':\n' + value + '\n'; + output += this.camelCaseToTitleCase(field) + ':\n' + value + '\n'; } } return output; diff --git a/src/listener/utils/transforms/server-profile-template.js b/src/listener/utils/transforms/server-profile-template.js index a7fa94f..ff1d94b 100644 --- a/src/listener/utils/transforms/server-profile-template.js +++ b/src/listener/utils/transforms/server-profile-template.js @@ -39,10 +39,8 @@ export default class ServerProfileTemplate extends Resource { continue; } - let displayField = this.camelCaseToTitleCase(field); - fields.push({ - title: displayField, + title: this.camelCaseToTitleCase(field), short: true, value: this[field] }); @@ -56,7 +54,7 @@ export default class ServerProfileTemplate extends Resource { if (this.__isNonDisplayField__(field) || !this[field]) { continue; } - output += '\t\u2022 ' + field + ': ' + this[field] + '\n'; + output += '\t\u2022 ' + this.camelCaseToTitleCase(field) + ': ' + this[field] + '\n'; } return output; } diff --git a/src/listener/utils/transforms/server-profile.js b/src/listener/utils/transforms/server-profile.js index 325cca1..6f0894e 100644 --- a/src/listener/utils/transforms/server-profile.js +++ b/src/listener/utils/transforms/server-profile.js @@ -43,10 +43,8 @@ export default class ServerProfile extends Resource { continue; } - let displayField = this.camelCaseToTitleCase(field); - fields.push({ - title: displayField, + title: this.camelCaseToTitleCase(field), short: true, value: this[field] }); @@ -67,7 +65,7 @@ export default class ServerProfile extends Resource { if (this.__isNonDisplayField__(field) || !this[field]) { continue; } - output += '\t\u2022 ' + field + ': ' + this[field] + '\n'; + output += '\t\u2022 ' + this.camelCaseToTitleCase(field) + ': ' + this[field] + '\n'; } if (this.serverHardwareUri) { output += '\t\u2022 Server Hardware: ' + getDeviceName(this.serverHardwareUri) + '\n'; diff --git a/src/test/resource.js b/src/test/resource.js index 895af87..3c2cd48 100755 --- a/src/test/resource.js +++ b/src/test/resource.js @@ -55,7 +55,7 @@ describe('Resource', () => { myKeys[6].should.equal('pxeBootPolicy'); }); - it('camelCaseToTitleCase undefined', () => { + it('camelCaseToTitleCase empty', () => { let serverProfileResource = new Resource(oneViewResource); let myKeys = Object.keys(oneViewResource); serverProfileResource.camelCaseToTitleCase('').should.equal('');