Fixes for #533, #530, #529 (partially), #528

- SFTP notifications have wrong icons #533
- Fields on 'Server Setup' page of wizard are misaligned #530
- Wizard has no 'Previous' buttons #528
- Don't delete existing sftp.json configuration file #529 (partially - for user config we make a backup)

Signed-off-by: Alexey Utkin <[email protected]>

Author: alexey-utkin

vscode-plugin/media/wizard.html

@@ -111,7 +111,7 @@ <h2>🖥️  Server Setup</h2>
                 <td>
                     <label
                         class="utbot-form__tab_label"
-                        style="width: auto; display: inline;"
+                        style="width: 10ex; display: inline;"
                         for="portGRPCInput">GRPC port</label>
                     <input class="utbot-form__tab_input"
                         style="width: auto; display: inline;"
@@ -126,15 +126,15 @@ <h2>🖥️  Server Setup</h2>
                 </td>
                 <td>
                     <span id="GRPC_connection_loader">⏳ Connecting...</span>
-                    <span id="GRPC_connection_success">✔️ Successfully pinged GRPC server! </span>
+                    <span id="GRPC_connection_success">✔️ Successfully pinged GRPC server!</span>
                     <span id="GRPC_connection_warning" format="⚠️ Warning! Versions are different: "></span>
-                    <span id="GRPC_connection_failure">❌ Failed to establish GRPC connection! </span>
+                    <span id="GRPC_connection_failure">❌ Failed to establish GRPC connection!</span>
                 </td>
             </tr>
             <tr style="display: grid; grid-template-columns: auto 1fr">
                 <td>
                     <label class="utbot-form__tab_label"
-                        style="width: auto; display: inline;"
+                        style="width: 10ex; display: inline;"
                         for="portSFTPInput">SFTP port</label>
                     <input class="utbot-form__tab_input"
                         style="width: auto; display: inline;"
@@ -149,9 +149,9 @@ <h2>🖥️  Server Setup</h2>
                 </td>
                 <td>
                     <span id="SFTP_connection_loader">⏳ Connecting SFTP...</span>
-                    <span id="SFTP_connection_success">✔️ Successfully pinged SFTP server! </span>
-                    <span id="SFTP_connection_warning">SFTP synchronization is not used.</span>
-                    <span id="SFTP_connection_failure">❌ Failed to establish SFTP connection! </span>
+                    <span id="SFTP_connection_success">✔️ Successfully pinged SFTP server!</span>
+                    <span id="SFTP_connection_warning">ⓘ SFTP synchronization is not used.</span>
+                    <span id="SFTP_connection_failure">❌ Failed to establish SFTP connection!</span>
                 </td>
             </tr>
         </table>
@@ -168,7 +168,7 @@ <h2>🖥️  Server Setup</h2>
             <input class="utbot-form__tab_input"
                    id="serverPath"
                    value="{{predictedRemotePath}}"
-             placeholder="/tmp/XXXX">
+                   placeholder="Ex. /tmp/XXXX">
             Project path on server specifies the path to the project's copy on the server host.
             May point to a directory shared by the client and server. In this case, SFTP synchronization
             must be disabled by leaving the <b>SFTP port field empty</b>.

vscode-plugin/media/wizardHTML.js

@@ -171,7 +171,7 @@ function showTab(tabIndex) {
 
     showElement(currentTabElement, true);
     // Show previous button if necessary
-    showElement(prevButton, tabIndex === 0);
+    showElement(prevButton, tabIndex !== 0);
 
     // Set nextButton title according to tab number
     if (tabIndex === tabElements.length - 1) {

vscode-plugin/src/wizard/wizard.ts

@@ -26,7 +26,6 @@ function getNonce(): string {
 }
 
 export class UtbotWizardPanel {
-
     public static currentPanel: UtbotWizardPanel | undefined;
     private disposables: vs.Disposable[] = [];
     private static PING_TIMEOUT_MS = 5000;
@@ -124,6 +123,7 @@ export class UtbotWizardPanel {
         });
     }
 
+    private static GENERATED = "This file is automatically generated by UnitTestBot.";
     private async setupSFTP(
         activate: boolean,
         host: string,
@@ -142,9 +142,21 @@ export class UtbotWizardPanel {
                 const workspaceFolder = workspaceFolderUrl.fsPath;
                 const sftpConfigPath = pathUtils.fsJoin(workspaceFolder, '.vscode', 'sftp.json');
                 try {
+                    // backup config: sftp.json -> sftp.json.old if we have user's version
+                    if (fs.existsSync(sftpConfigPath)) {
+                        const configContentOld = fs.readFileSync(sftpConfigPath, {encoding:'utf8', flag:'r'});
+                        // checks, that the configuration was not created by UTBot
+                        if (!configContentOld.includes(UtbotWizardPanel.GENERATED)) {
+                            const oldConfigPath = sftpConfigPath + ".old";
+                            console.log(`Back up ".vscode/${sftpConfigPath}" to ".vscode/${oldConfigPath}"`);
+                            fs.writeFileSync(oldConfigPath, configContentOld);
+                        }
+                    }
+
                     if (activate) {
-                        const configContent = 
+                        const configContent =
 `{
+    "//comment": "${UtbotWizardPanel.GENERATED}",
     "name": "UTBot Server",
     "host": "${host}",
     "protocol": "sftp",
@@ -159,23 +171,24 @@ export class UtbotWizardPanel {
                         if (!fs.existsSync(sftpConfigPath)) {
                            fs.writeFileSync(sftpConfigPath, ' ');
                         }
+
                         const doc = await vs.workspace.openTextDocument(sftpConfigPath);
                         const editor = await vs.window.showTextDocument(doc, {preview: true, preserveFocus: false});
                         // we need to generate the `onDidSaveTextDocument` event 
-                        // it is the only event that is processed by SFTP pluging to change the preload configuration
+                        // it is the only event that is processed by SFTP plugin to change the preload configuration
                         void editor.edit( builder => {
                             builder.delete(new vs.Range(0, 0, 10000, 10000));
                             builder.insert(new vs.Position(0, 0), configContent);
                         })
                         .then( () => {
                             void editor.document.save().then( saved => {
                                 if (saved) {
-                                    messages.showWarningMessage(`New configuration ".vscode/sftp.json" was saved!`);
+                                    messages.showInfoMessage(`New configuration ".vscode/sftp.json" was saved!`);
                                 }
                                 void vs.commands.executeCommand('workbench.action.closeActiveEditor');
                                 const postponedSync = (): void => {
                                     void vs.commands.executeCommand("sftp.sync.localToRemote", workspaceFolderUrl).then(
-                                        () => messages.showWarningMessage(`Project copy was created on UTBot Server at "${remotePath}"`),
+                                        () => messages.showInfoMessage(`Project copy was created on UTBot Server at "${remotePath}"`),
                                         (err) => messages.showWarningMessage(`Project copy was not created on UTBot Server at "${remotePath}" with error ` + err)
                                     );
                                 };