Changed IotResult and IContexUI

Author: devdotnetorg

src/IotResult.ts

@@ -50,23 +50,41 @@ export class IotResult {
     //Message
     if(this.Message) msg=`${msg} ${this.Message}.`;
     //SystemMessage
-    if(this.SystemMessage) msg=`${msg} ${this.SystemMessage}`;
+    if(this.SystemMessage) msg=`${msg}\nSystem message: ${this.SystemMessage}`;
     return msg;
   }
 
-  public toMultiLineString(format:string|undefined=undefined):string{
+  public toStringWithHead():string{
     let msg="";
     //HEAD
-    if(format&&format=="head") msg=msg+"------------- Result -------------\n";
+    msg=msg+"------------- Result -------------\n";
     //Status
     msg=`${msg}Status: ${this.Status.toString().toUpperCase()}`;
     //Message
     if(this.Message) msg=`${msg}\nMessage: ${this.Message}.`;
     //SystemMessage
     if(this.SystemMessage) msg=`${msg}\nSystem message: ${this.SystemMessage}`;
     //HEAD
-    if(format&&format=="head") msg=msg+"\n----------------------------------";
+    msg=msg+"\n----------------------------------";
     return msg;
   }
+
+  //result.RunTask(()=>this._contextUI.Output(result),()=> {return Promise.resolve(result)});
+  public RunTask(ifOK?:() =>void,ifError?:() =>void) {
+    switch(this.Status) { 
+      case StatusResult.Ok: {
+        if(ifOK) ifOK();
+        break; 
+      } 
+      case StatusResult.Error: {
+        if(ifError) ifError();
+        break;
+      }
+      default: {
+        vscode.window.showWarningMessage(`No task to execute`);
+        break; 
+      } 
+   }
+  }
  }
 

src/TreeDataDevicesProvider.ts

@@ -161,8 +161,9 @@ export class TreeDataDevicesProvider implements vscode.TreeDataProvider<BaseTree
       //Connection test device
       this._contextUI.ShowBackgroundNotification("Checking the network connection");
       let result=await device.ConnectionTest(hostName,port,userName,password);
-      this._contextUI.Output(result.toMultiLineString());
-      if(result.Status==StatusResult.Error) return Promise.resolve(result);
+      if(result.Status==StatusResult.Ok)
+          this._contextUI.Output(result);
+        else return Promise.resolve(result);
       this._contextUI.ShowBackgroundNotification("Create a device");
       this._contextUI.Output("Create a device");
       //event subscription

src/UI/IContexUI.ts

@@ -8,5 +8,4 @@ export interface IContexUI {
   ShowBackgroundNotification(text:string, tooltip?:string | vscode.MarkdownString| undefined):void;
   HideBackgroundNotification():void;
   ShowNotification(value:IotResult):void;
-  RunTask(value:IotResult,ifOK:() =>void,ifError:() =>void):void;
 }

src/UI/IoTUI.ts

@@ -22,7 +22,7 @@ export class IoTUI implements IContexUI {
     if (typeof value === 'string') {
       msg=value;
     } else {
-      msg=value.toMultiLineString("head");
+      msg=value.toString();
     }
     this._outputChannel.appendLine(msg);
   }
@@ -54,21 +54,4 @@ export class IoTUI implements IContexUI {
       } 
    }
   }
-
-  public RunTask(value:IotResult,ifOK:() =>void,ifError:() =>void) {
-    switch(value.Status) { 
-      case StatusResult.Ok: {
-        ifOK();
-        break; 
-      } 
-      case StatusResult.Error: {
-        ifError();
-        break;
-      }
-      default: { 
-         //statements; 
-         break; 
-      } 
-   }
-  }
 }

src/actionsDevice/addDTO.ts

@@ -46,7 +46,7 @@ export async function addDTO(treeData: TreeDataDevicesProvider,item:IotDevice,co
         const result = await treeData.AddDTO(<string>item.IdDevice,fileName,fileData,fileType);
         contextUI.HideBackgroundNotification();
         //Output 
-        contextUI.Output(result.toMultiLineString("head"));
+        contextUI.Output(result.toStringWithHead());
         //Message
         if(result.Status==StatusResult.Ok)
         {

src/actionsDevice/addDevice.ts

@@ -61,7 +61,7 @@ export async function addDevice(treeData: TreeDataDevicesProvider,treeView:vscod
        const result = await treeData.AddDevice(hostName,port,userName,password,SELECTED_ITEM.value);
        contextUI.HideBackgroundNotification();
        //Output       
-       contextUI.Output(result.toMultiLineString("head"));
+       contextUI.Output(result.toStringWithHead());
        //Message       
        if(result.Status==StatusResult.Ok)
        {

src/actionsDevice/checkAllPackages.ts

@@ -13,7 +13,7 @@ export async function checkAllPackages(treeData: TreeDataDevicesProvider,item:Io
     const result=await treeData.CheckAllPackages(<string>item.IdDevice);
     contextUI.HideBackgroundNotification();
     //Output 
-    contextUI.Output(result.toMultiLineString("head"));
+    contextUI.Output(result.toStringWithHead());
     //Message
     if(result.Status==StatusResult.Ok)
     {

src/actionsDevice/connectionTestDevice.ts

@@ -16,7 +16,7 @@ export async function connectionTestDevice(treeData: TreeDataDevicesProvider,ite
         const result = await device.ConnectionTest();
         contextUI.HideBackgroundNotification();
         //Output
-        contextUI.Output(result.toMultiLineString("head"));
+        contextUI.Output(result.toStringWithHead());
         //Message          
         if(result.Status==StatusResult.Ok) {
             vscode.window.showInformationMessage(`Connection to host ${device.Account.Host} via ssh 

src/actionsDevice/deleteDTO.ts

@@ -16,7 +16,7 @@ export async function deleteDTO(treeData: TreeDataDevicesProvider,item:IotDevice
         const result=await treeData.DeleteDTO(item);
         contextUI.HideBackgroundNotification();
         //Output 
-        contextUI.Output(result.toMultiLineString("head"));
+        contextUI.Output(result.toStringWithHead());
         //Message
         if(result.Status==StatusResult.Ok) {        
             treeData.Refresh(); 

src/actionsDevice/deleteDevice.ts

@@ -15,7 +15,7 @@ export async function deleteDevice(treeData: TreeDataDevicesProvider,item:IotDev
         const result=await treeData.DeleteDevice(<string>item.IdDevice);
         contextUI.HideBackgroundNotification();
         //Output       
-        contextUI.Output(result.toMultiLineString("head"));
+        contextUI.Output(result.toStringWithHead());
         //Message
         if(result) {
             treeData.SaveDevices();