Merge pull request #544 from smartdevicelink/bugfix/softbuttonreplaceoperation-logs

Fix log reporting and update package version

Author: crokita

lib/js/src/manager/screen/_SoftButtonReplaceOperation.js

@@ -49,7 +49,7 @@ class _SoftButtonReplaceOperation extends _Task {
      * @param {Boolean} isDynamicGraphicSupported - Whether dynamic graphics are supported
      */
     constructor (lifecycleManager, fileManager = null, softButtonCapabilities = null, softButtonObjects = null, currentMainField1 = null, isDynamicGraphicSupported) {
-        super('SoftButtonTransitionOperation');
+        super('SoftButtonReplaceOperation');
         this._lifecycleManager = lifecycleManager;
         this._fileManager = fileManager;
         this._softButtonCapabilities = softButtonCapabilities;
@@ -80,17 +80,17 @@ class _SoftButtonReplaceOperation extends _Task {
         // Check the state of our images
         if (!this._supportsSoftButtonImages()) {
             // We don't support images at all
-            console.warn('SoftButtonTransitionOperation - Soft button images are not supported. Attempting to send text-only soft buttons. If any button does not contain text, no buttons will be sent.');
+            console.warn('SoftButtonReplaceOperation - Soft button images are not supported. Attempting to send text-only soft buttons. If any button does not contain text, no buttons will be sent.');
             // Send text buttons if all the soft buttons have text
             const success = await this._sendCurrentStateTextOnlySoftButtons();
             if (!success) {
-                console.error('SoftButtonTransitionOperation - Head unit does not support images and some of the soft buttons do not have text, so none of the buttons will be sent.');
+                console.error('SoftButtonReplaceOperation - Head unit does not support images and some of the soft buttons do not have text, so none of the buttons will be sent.');
             }
         } else if (!this._supportsDynamicSoftButtonImages()) {
-            console.info('SoftButtonTransitionOperation - Soft button images are not supported. Attempting to send text and static image only soft buttons. If any button does not contain text and/or a static image, no buttons will be sent.');
+            console.info('SoftButtonReplaceOperation - Soft button images are not supported. Attempting to send text and static image only soft buttons. If any button does not contain text and/or a static image, no buttons will be sent.');
             const success = await this._sendCurrentStateStaticImageOnlySoftButtons();
             if (!success) {
-                console.error('SoftButtonTransitionOperation - Buttons will not be sent because the module does not support dynamic images and some of the buttons do not have text or static images.');
+                console.error('SoftButtonReplaceOperation - Buttons will not be sent because the module does not support dynamic images and some of the buttons do not have text or static images.');
             }
         } else if (this._currentStateHasImages() && !this._allCurrentStateImagesAreUploaded()) {
             // If there are images that aren't uploaded
@@ -125,13 +125,13 @@ class _SoftButtonReplaceOperation extends _Task {
             return false;
         }
 
-        console.log('SoftButtonTransitionOperation - Preparing to send text-only soft buttons');
+        console.log('SoftButtonReplaceOperation - Preparing to send text-only soft buttons');
         const textButtons = [];
 
         for (const softButtonObject of this._softButtonObjects) {
             const softButton = softButtonObject.getCurrentStateSoftButton();
             if (softButton.getText() === null || softButton.getText() === undefined) {
-                console.warn('SoftButtonTransitionOperation - Attempted to create text buttons, but some buttons don\'t support text, so no text-only soft buttons will be sent');
+                console.warn('SoftButtonReplaceOperation - Attempted to create text buttons, but some buttons don\'t support text, so no text-only soft buttons will be sent');
                 return false;
             }
             // We should create a new softButtonObject rather than modifying the original one
@@ -146,7 +146,7 @@ class _SoftButtonReplaceOperation extends _Task {
         }
 
         if (this._lifecycleManager === null) {
-            console.error('SoftButtonTransitionOperation: LifecycleManager is null');
+            console.error('SoftButtonReplaceOperation: LifecycleManager is null');
             return false;
         }
 
@@ -156,9 +156,9 @@ class _SoftButtonReplaceOperation extends _Task {
 
         const response = await this._lifecycleManager.sendRpcResolve(show);
         if (response.getSuccess()) {
-            console.log('SoftButtonTransitionOperation - Finished sending text only soft buttons');
+            console.log('SoftButtonReplaceOperation - Finished sending text only soft buttons');
         } else {
-            console.warn('SoftButtonTransitionOperation - Failed to update soft buttons with text buttons');
+            console.warn('SoftButtonReplaceOperation - Failed to update soft buttons with text buttons');
         }
         return response.getSuccess();
     }
@@ -173,13 +173,13 @@ class _SoftButtonReplaceOperation extends _Task {
             return false;
         }
 
-        console.log('SoftButtonTransitionOperation - Preparing to send text and static image only soft buttons.');
+        console.log('SoftButtonReplaceOperation - Preparing to send text and static image only soft buttons.');
         const textButtons = [];
 
         for (const softButtonObject of this._softButtonObjects) {
             const softButton = softButtonObject.getCurrentStateSoftButton();
             if (softButton.getText() === null && softButton.getImage() !== null && softButton.getImage().getImageType() === ImageType.DYNAMIC) {
-                console.warn('SoftButtonTransitionOperation - Attempted to create text and static image only buttons, but some buttons don\'t support text and have dynamic images, so no soft buttons will be sent.');
+                console.warn('SoftButtonReplaceOperation - Attempted to create text and static image only buttons, but some buttons don\'t support text and have dynamic images, so no soft buttons will be sent.');
                 return false;
             }
 
@@ -199,7 +199,7 @@ class _SoftButtonReplaceOperation extends _Task {
         }
 
         if (this._lifecycleManager === null) {
-            console.error('SoftButtonTransitionOperation: LifecycleManager is null');
+            console.error('SoftButtonReplaceOperation: LifecycleManager is null');
             return false;
         }
 
@@ -209,9 +209,9 @@ class _SoftButtonReplaceOperation extends _Task {
 
         const response = await this._lifecycleManager.sendRpcResolve(show);
         if (response.getSuccess()) {
-            console.log('SoftButtonTransitionOperation - Finished sending text and static image only soft buttons.');
+            console.log('SoftButtonReplaceOperation - Finished sending text and static image only soft buttons.');
         } else {
-            console.warn('SoftButtonTransitionOperation - Failed to update soft buttons with text and static image only buttons.');
+            console.warn('SoftButtonReplaceOperation - Failed to update soft buttons with text and static image only buttons.');
         }
         return response.getSuccess();
     }
@@ -225,15 +225,15 @@ class _SoftButtonReplaceOperation extends _Task {
         if (this.getState() === _Task.CANCELED) {
             return false;
         }
-        console.log('SoftButtonTransitionOperation - Preparing to send full soft buttons');
+        console.log('SoftButtonReplaceOperation - Preparing to send full soft buttons');
         const softButtons = [];
 
         for (const softButtonObject of this._softButtonObjects) {
             softButtons.push(softButtonObject.getCurrentStateSoftButton());
         }
 
         if (this._lifecycleManager === null) {
-            console.error('SoftButtonTransitionOperation: LifecycleManager is null');
+            console.error('SoftButtonReplaceOperation: LifecycleManager is null');
             return false;
         }
 
@@ -243,9 +243,9 @@ class _SoftButtonReplaceOperation extends _Task {
 
         const response = await this._lifecycleManager.sendRpcResolve(show);
         if (response.getSuccess()) {
-            console.log('SoftButtonTransitionOperation - Finished sending full soft buttons');
+            console.log('SoftButtonReplaceOperation - Finished sending full soft buttons');
         } else {
-            console.warn('SoftButtonTransitionOperation - Failed to update soft buttons');
+            console.warn('SoftButtonReplaceOperation - Failed to update soft buttons');
         }
         return response.getSuccess();
     }
@@ -269,7 +269,7 @@ class _SoftButtonReplaceOperation extends _Task {
         }
 
         if (initialStatesToBeUploaded.length === 0) {
-            console.log('SoftButtonTransitionOperation: No initial state artworks to upload');
+            console.log('SoftButtonReplaceOperation: No initial state artworks to upload');
             return false;
         }
 
@@ -278,16 +278,16 @@ class _SoftButtonReplaceOperation extends _Task {
             return false;
         }
 
-        console.log('SoftButtonTransitionOperation: Uploading soft button initial artworks');
+        console.log('SoftButtonReplaceOperation: Uploading soft button initial artworks');
         if (this._fileManager === null) {
             return false;
         }
 
         const successes = await this._fileManager.uploadArtworks(initialStatesToBeUploaded);
         if (successes.includes(false)) {
-            console.error('SoftButtonTransitionOperation: Error uploading soft button artworks');
+            console.error('SoftButtonReplaceOperation: Error uploading soft button artworks');
         } else {
-            console.log('SoftButtonTransitionOperation: Soft button initial state artworks uploaded');
+            console.log('SoftButtonReplaceOperation: Soft button initial state artworks uploaded');
         }
 
         return true;
@@ -313,20 +313,20 @@ class _SoftButtonReplaceOperation extends _Task {
         }
 
         if (otherStatesToBeUploaded.length === 0) {
-            console.log('SoftButtonTransitionOperation: No other state artworks to upload');
+            console.log('SoftButtonReplaceOperation: No other state artworks to upload');
             return false;
         }
 
-        console.log('SoftButtonTransitionOperation: Uploading soft button other state artworks');
+        console.log('SoftButtonReplaceOperation: Uploading soft button other state artworks');
         if (this._fileManager === null) {
             return false;
         }
 
         const successes = await this._fileManager.uploadArtworks(otherStatesToBeUploaded);
         if (successes.includes(false)) {
-            console.error('SoftButtonTransitionOperation: Error uploading soft button artworks');
+            console.error('SoftButtonReplaceOperation: Error uploading soft button artworks');
         } else {
-            console.log('SoftButtonTransitionOperation: Soft button other state artworks uploaded');
+            console.log('SoftButtonReplaceOperation: Soft button other state artworks uploaded');
         }
 
         return true;

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "sdl_javascript_suite",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "description": "The official JavaScript SDK for SmartDeviceLink.",
   "main": "/lib/js/dist/SDL.js",
   "engines": {