Da-326 cb import sometimes collection and scope field can be blank (#327

)

Fix Bugs:
1. Collections and scope field not adjusting to spaces and newline
characters
2. CB Export -> path separator for windows was not present, might have
broken it

src/commands/tools/dataImport.ts

@@ -920,7 +920,7 @@ export class DataImport {
                             // NO Validation Error on Page 1, We can shift to next page
                             const elementSplit = await this.getSampleElementContentSplit(formData.dataset);
                             const defaultKeysValue = await this.matchElements(elementSplit, this.possibleKeyFields);
-                            
+
                             currentPanel.webview.html =
                                 getLoader("Data Import");
                             currentPanel.webview.html =
@@ -980,8 +980,8 @@ export class DataImport {
                                         const defaultCollectionValue = await this.matchElements(elementSplit, this.possibleCollectionFields);
                                         currentPanel.webview.postMessage({
                                             command: "vscode-couchbase.tools.dataImport.defaultScopeAndCollectionDynamicField",
-                                            defaultScopeValue: `%${defaultScopeValue}%`,
-                                            defaultCollectionValue: `%${defaultCollectionValue}%`
+                                            defaultScopeValue: defaultScopeValue.trim().length > 0 ?  `%${defaultScopeValue}%` : "",
+                                            defaultCollectionValue: defaultCollectionValue.trim().length>0 ? `%${defaultCollectionValue}%` : ""
                                         });
                                     } else {
                                         logger.error("error while reading dataset: \n " + errors.join("\n"));

src/tools/CBExport.ts

@@ -4,6 +4,7 @@ import { Constants } from "../util/constants";
 import { getCurrentDateTime } from "../util/util";
 import * as keytar from "keytar";
 import * as vscode from 'vscode';
+import * as path from 'path';
 
 export class CBExport {
     static async export(
@@ -45,13 +46,7 @@ export class CBExport {
         scp.push(...collections);
 
         const fileName = `${bucket}_cbexport_${getCurrentDateTime()}.json`;
-        let currentPath: string;
-
-        if (filePath.endsWith("/")) { //TODO: Verify for windows
-            currentPath = filePath + fileName;
-        } else {
-            currentPath = `${filePath}/${fileName}`;
-        }
+        let currentPath: string = path.join(filePath, fileName);
 
         const includeData = scp.join(",");
         const fullPath = `\"${currentPath}\"`;