fixed #481

Author: paxtonhare

quick-start/src/main/java/com/marklogic/quickstart/model/SearchPathModel.java

@@ -18,10 +18,12 @@
 public class SearchPathModel {
 
 	public String name;
-	public String path;
+	public String relativePath;
+	public String absolutePath;
 
-	public SearchPathModel(String path, String name) {
-		this.path = path;
+	public SearchPathModel(String name, String relativePath, String absolutePath) {
+		this.relativePath = relativePath;
+		this.absolutePath = absolutePath;
 		this.name = name;
 	}
 }

quick-start/src/main/java/com/marklogic/quickstart/web/UtilController.java

@@ -39,42 +39,41 @@ public class UtilController extends EnvironmentAware {
 
 	@RequestMapping(value = "/searchPath", method = RequestMethod.GET)
 	@ResponseBody
-	public Map<String, Object> searchPath(@RequestParam String path, @RequestParam boolean absolute) {
+	public Map<String, Object> searchPath(@RequestParam String path) {
 		logger.debug("Search Path:" + path);
 		List<SearchPathModel> paths = new ArrayList<>();
-		String currentPath;
+		Path currentPath = Paths.get(".").toAbsolutePath().normalize();
+		Path relativePath;
 
 		if (path == null || path.length() == 0) {
-		    currentPath = "/";
-			File[] roots = File.listRoots();
-            for (File root : roots) {
-                paths.add(new SearchPathModel(root.getAbsolutePath(), root.getAbsolutePath()));
-            }
+            relativePath = Paths.get("/");
 		}
 		else {
-		    if (absolute) {
-                currentPath = Paths.get(path).toAbsolutePath().normalize().toString();
-            }
-            else {
-                currentPath = path;
-            }
-			if (!path.equals("/")) {
-				path = path + java.io.File.separator;
-				Path parent = Paths.get(path).toAbsolutePath().normalize().getParent();
-				if (parent != null) {
-				    paths.add(new SearchPathModel(parent.toString(), ".."));
-				}
-			}
+            relativePath = Paths.get(path).toAbsolutePath().normalize();
+        }
 
-			List<String> folders = FileUtil.listDirectFolders(new File(path));
-			for (String folder : folders) {
-				String absPath = Paths.get(path, folder).toAbsolutePath().normalize().toString();
-				paths.add(new SearchPathModel(absPath, folder));
-			}
-		}
+        Path parent = relativePath.getParent();
+        if (parent != null) {
+            String relativePathStr = currentPath.relativize(parent).toString();
+            String absolutePathStr = parent.toAbsolutePath().toString();
+            paths.add(new SearchPathModel("..", relativePathStr, absolutePathStr));
+        }
+
+        List<String> folders = FileUtil.listDirectFolders(relativePath.toFile());
+        for (String folder : folders) {
+            Path childPath = relativePath.resolve(folder);
+            String relativePathStr = currentPath.relativize(childPath).toString();
+            String absolutePathStr = childPath.toAbsolutePath().normalize().toString();
+            paths.add(new SearchPathModel(folder, relativePathStr, absolutePathStr));
+        }
 
 		Map<String, Object> result = new HashMap<>();
-		result.put("currentPath", currentPath);
+        String relativePathStr = currentPath.relativize(relativePath).toString();
+        if (relativePathStr.equals("")) {
+            relativePathStr = ".";
+        }
+		result.put("currentPath", relativePathStr);
+		result.put("currentAbsolutePath", relativePath.toString());
 		result.put("folders", paths);
 		return result;
 	}

quick-start/src/main/ui/app/folder-browser/folder-browser.component.ts

@@ -31,7 +31,7 @@ export class FolderBrowserComponent implements OnInit, OnChanges {
   }
 
   ngOnChanges(changes: any) {
-    if (changes.startPath) {
+    if (changes.startPath && changes.startPath.currentValue) {
       this.getFolders(changes.startPath.currentValue);
     }
   }
@@ -45,12 +45,15 @@ export class FolderBrowserComponent implements OnInit, OnChanges {
   getFolders(path: string): void {
     if (path) {
       this.isLoading = true;
-      this.http.get(`/api/utils/searchPath?path=${encodeURIComponent(path)}&absolute=${this.absoluteOnly}`)
+      this.http.get(`/api/utils/searchPath?path=${encodeURIComponent(path)}`)
       .map(this.extractData)
       .subscribe(resp => {
         this.folders = resp.folders;
-        this.currentPath = resp.currentPath;
-        this.folderChosen.emit(this.currentPath);
+        this.currentPath = this.absoluteOnly ? resp.currentAbsolutePath : resp.currentPath;
+        this.folderChosen.emit({
+          relativePath: resp.currentPath,
+          absolutePath: resp.currentAbsolutePath
+        });
       },
       error => {
         console.log(error);
@@ -62,7 +65,7 @@ export class FolderBrowserComponent implements OnInit, OnChanges {
   }
 
   entryClicked(entry: any): void {
-    this.getFolders(entry.path);
+    this.getFolders(entry.absolutePath);
   }
 
   private extractData(res: Response) {

quick-start/src/main/ui/app/login/login.component.ts

@@ -161,8 +161,8 @@ export class LoginComponent implements OnInit {
     this.router.navigate(['']);
   }
 
-  folderClicked(folder: string): void {
-    this.folder = folder;
+  folderClicked(folders: any): void {
+    this.folder = folders.absolutePath;
   }
 
   back() {

quick-start/src/main/ui/app/mlcp-ui/mlcp-ui.component.ts

@@ -26,7 +26,7 @@ interface MlcpOptions {
   styleUrls: ['./mlcp-ui.component.scss']
 })
 export class MlcpUiComponent implements OnChanges {
-  startPath: string = '.';
+  startPath: string;
   inputFilePath: string;
   mlcp = <MlcpOptions>{};
 
@@ -528,11 +528,9 @@ export class MlcpUiComponent implements OnChanges {
     return `${this.inputFilePath.replace(/\\/g, '/').replace(/^([A-Za-z]):/, '/$1:')},''`;
   }
 
-  folderClicked(folder: string): void {
-    if (!this.inputFilePath) {
-      this.inputFilePath = folder;
-    } else if (this.inputFilePath !== folder) {
-      this.inputFilePath = folder;
+  folderClicked(folders: any): void {
+    if (this.inputFilePath !== folders.absolutePath) {
+      this.inputFilePath = folders.absolutePath;
       // update the outputUriReplace options
       let generalGroup = _.find(this.groups, (group: any) => {
         return group.category === 'General Options';