Update based on feedback and alignment

Author: renonick87

lib/js/src/manager/file/_DeleteFileOperation.js

@@ -72,7 +72,7 @@ class _DeleteFileOperation extends _Task {
         if (!this._remoteFileNames.includes(this._fileName)) {
             const errorMessage = 'File to delete is no longer on the head unit, aborting the operation';
             console.log(errorMessage);
-            this._completionListener(false, null, null, errorMessage);
+            this._completionListener(false, _FileManagerBase.SPACE_AVAILABLE_MAX_VALUE, this._remoteFileNames, errorMessage);
             return this.onFinished();
         }
         await this._deleteFile();

lib/js/src/manager/file/_FileManagerBase.js

@@ -410,5 +410,6 @@ class _FileManagerBase extends _SubManagerBase {
 }
 
 const SPACE_AVAILABLE_MAX_VALUE = _FileManagerBase.SPACE_AVAILABLE_MAX_VALUE = 2000000000;
+_FileManagerBase.fileManagerCannotOverwriteError = 'Cannot overwrite remote file. The remote file system already has a file of this name, and the file manager is set to not automatically overwrite files.';
 
 export { _FileManagerBase };

lib/js/src/manager/file/_UploadFileOperation.js

@@ -47,7 +47,7 @@ class _UploadFileOperation extends _Task {
         }
 
         if (!this._fileManager.fileNeedsUpload(file)) {
-            const errorMessage = _UploadFileOperation.fileManagerCannotOverwriteError;
+            const errorMessage = _FileManagerBase.fileManagerCannotOverwriteError;
             console.log(errorMessage);
             if (typeof this._fileWrapper.getCompletionListener() === 'function') {
                 this._fileWrapper.getCompletionListener()(false, null, null, errorMessage);
@@ -259,6 +259,4 @@ class _UploadFileOperation extends _Task {
     }
 }
 
-_UploadFileOperation.fileManagerCannotOverwriteError = 'Cannot overwrite remote file. The remote file system already has a file of this name, and the file manager is set to not automatically overwrite files.';
-
 export { _UploadFileOperation };

lib/js/src/manager/file/filetypes/SdlArtwork.js

@@ -125,6 +125,9 @@ class SdlArtwork extends SdlFile {
     clone () {
         const clonedParams = Object.assign({}, this); // shallow copy
 
+        if (clonedParams._imageRPC !== null) {
+            clonedParams._imageRPC = Object.assign(new SdlArtwork(), clonedParams._artwork);
+        }
         return Object.assign(new SdlArtwork(this.getName(), this.getType(), this.getFileData(), this.isPersistent()), clonedParams);
     }
 }

lib/js/src/manager/file/filetypes/SdlFile.js

@@ -223,6 +223,9 @@ class SdlFile {
     clone () {
         const clonedParams = Object.assign({}, this); // shallow copy
 
+        if (this.getFileData() !== null && this.getFileData() !== undefined) {
+            return Object.assign(new SdlFile(this.getName(), this.getType(), Uint8Array.from(this.getFileData()), this.isPersistent()), clonedParams);
+        }
         return Object.assign(new SdlFile(this.getName(), this.getType(), this.getFileData(), this.isPersistent()), clonedParams);
     }
 }

tests/managers/file/SdlFileTests.js

@@ -10,14 +10,16 @@ module.exports = function (appClient) {
     describe('SdlFileTests', function () {
         it('testFileEquality', function () {
             const fileName = 'testFile';
-            const fileData = 'it is wednesday';
+            const fileData = Uint8Array.from('it is wednesday');
             const filePath = './doesnt_go_anywhere.txt';
             const file = new SDL.manager.file.filetypes.SdlFile(fileName, SDL.rpc.enums.FileType.BINARY, fileData, true)
                 .setFilePath(filePath)
+                .setFileData(fileData)
                 .setStaticIcon(true)
                 .setOverwrite(true);
             const file2 = new SDL.manager.file.filetypes.SdlFile(fileName, SDL.rpc.enums.FileType.BINARY, fileData, true)
                 .setFilePath(filePath)
+                .setFileData(fileData)
                 .setStaticIcon(true)
                 .setOverwrite(true);
             Validator.assertTrue(file.equals(file2));
@@ -28,7 +30,7 @@ module.exports = function (appClient) {
 
             fileClone.setName('something else');
             fileClone.setFilePath('./goes_nowhere.txt');
-            fileClone.setFileData('my dudes');
+            fileClone.setFileData(Uint8Array.from('my dudes'));
             fileClone.setType(SDL.rpc.enums.FileType.JSON);
             fileClone.setPersistent(false);
             fileClone.setStaticIcon(false);
@@ -55,7 +57,7 @@ module.exports = function (appClient) {
     describe('SdlArtworkTests', function () {
         it('testFileEquality', function () {
             const fileName = 'testFile';
-            const fileData = 'it is wednesday';
+            const fileData = Uint8Array.from('it is wednesday');
             const filePath = './doesnt_go_anywhere.txt';
             const file = new SDL.manager.file.filetypes.SdlArtwork(fileName, SDL.rpc.enums.FileType.GRAPHIC_JPEG, fileData, true)
                 .setFilePath(filePath)
@@ -75,7 +77,7 @@ module.exports = function (appClient) {
 
             fileClone.setName('something else');
             fileClone.setFilePath('./goes_nowhere.txt');
-            fileClone.setFileData('my dudes');
+            fileClone.setFileData(Uint8Array.from('my dudes'));
             fileClone.setType(SDL.rpc.enums.FileType.GRAPHIC_PNG);
             fileClone.setPersistent(false);
             fileClone.setStaticIcon(false);

tests/managers/file/UploadFileOperationTests.js

@@ -26,7 +26,7 @@ module.exports = function (appClient) {
                         Validator.assertNull(bytesAvailable);
                         Validator.assertNull(fileNames);
                         Validator.assertNotNullUndefined(errorMessage);
-                        Validator.assertEquals(errorMessage, SDL.manager.file._UploadFileOperation.fileManagerCannotOverwriteError);
+                        Validator.assertEquals(errorMessage, SDL.manager.file._FileManagerBase.fileManagerCannotOverwriteError);
                     });
                     const operation = new SDL.manager.file._UploadFileOperation(sdlManager._lifecycleManager, sdlManager.getFileManager(), testFileWrapper);
                     await operation._start();