Merge pull request #32 from inab/feature/recursive-workspace-tree

Fix and refactor workspace table to allow subfolders

Author: nicodr97

front_end/openVRE/public/applib/getDataMove.php

@@ -9,6 +9,51 @@
 	redirect($GLOBALS['BASEURL']."/workspace/");
 }
 
+/**
+ * Collect all directories under a project (depth-first) for move targets.
+ */
+function collectMoveTargetDirsRecursive($dirId, $projectPath, &$dirs)
+{
+	$dir = getGSFile_fromId($dirId);
+	if (!$dir || !isset($dir['files'])) {
+		return;
+	}
+
+	if (isset($dir['path']) && $dir['path'] == $_SESSION['User']['id']) {
+		return;
+	}
+
+	$relPath = substr($dir['path'], strlen($projectPath) + 1);
+
+	$dirs[] = [
+		"id"   => $dir["_id"],
+		"name" => $relPath,
+		"path" => $dir["path"],
+	];
+
+	foreach ($dir['files'] as $childId) {
+		$child = getGSFile_fromId($childId);
+		if ($child && isset($child['files'])) {
+			collectMoveTargetDirsRecursive($childId, $projectPath, $dirs);
+		}
+	}
+}
+
+function collectMoveTargetDirs($projectId, $projectPath)
+{
+	$dirs = [];
+	$project = getGSFile_fromId($projectId);
+	if (!isset($project['files'])) {
+		return $dirs;
+	}
+
+	foreach ($project['files'] as $childId) {
+		collectMoveTargetDirsRecursive($childId, $projectPath, $dirs);
+	}
+
+	return $dirs;
+}
+
 switch ($_REQUEST['op']){
 	case 'rename':
 		$file_raw = getGSFile_fromId($_REQUEST['id']);
@@ -19,19 +64,35 @@
 	 	$returnData = ["path"	=> $path, "name" => $name, "type" => $file["type"]];
 	 	print(json_encode($returnData));
 	 	break;
-	case 'move': 	$file_raw = getGSFile_fromId($_REQUEST['id']);
+	case 'move':
+		$file_raw = getGSFile_fromId($_REQUEST['id']);
 		$file = formatData($file_raw);
-		$prjData = ["name" => $file['longfilename'], "execution" => $file['longexecutionname'], "project" => $file['project'], "type" => $file['type'], "projects" => []];
+		$parentPath = ($file['type'] == 'file' && !empty($file['parentDir']))
+			? $file['parentDir']
+			: '';
+		$parentRelPath = '';
+		if ($parentPath !== '' && preg_match('/(.*\/__PROJ[^\/]*)/', $parentPath, $match)) {
+			$parentRelPath = substr($parentPath, strlen($match[1]) + 1);
+		}
+
+		$prjData = [
+			"name"            => $file['longfilename'],
+			"execution"       => $file['longexecutionname'],
+			"project"         => $file['project'],
+			"type"            => $file['type'],
+			"parent_path"     => $parentPath,
+			"parent_rel_path" => $parentRelPath,
+			"projects"        => [],
+		];
 		$projects = getProjects_byOwner();
 		foreach($projects as $pr) {
-			$excData = [];
-			foreach($pr["files"] as $execution) {
-				$exc = getGSFile_fromId($execution);
-				$p = explode("/",$exc["path"]);
-				$name = array_pop($p);
-				$excData[] = ["id" => $exc["_id"], "name" => $name, "path" => $exc["path"]];
-			}
-			$prjData["projects"][] = ["id" => $pr["_id"], "name" => $pr["name"], "path" => $pr["path"], "executions" => $excData];
+			$excData = collectMoveTargetDirs($pr['_id'], $pr['path']);
+			$prjData["projects"][] = [
+				"id"         => $pr["_id"],
+				"name"       => $pr["name"],
+				"path"       => $pr["path"],
+				"executions" => $excData,
+			];
 		}
 		print(json_encode($prjData, JSON_PRETTY_PRINT));
 		break;

front_end/openVRE/public/assets/layouts/layout/css/custom.min.css

@@ -556,6 +556,25 @@ input.tt-hint {
     cursor: pointer;
 }
 
+#workspace .folder-name-line .collapse-folder {
+    flex-shrink: 0;
+    margin: 0;
+    font-size: 18px;
+}
+
+#workspace .folder-name-line .fa-stack.collapse-folder {
+    margin-top: 12px;
+    height: 9px;
+    width: 20px;
+}
+
+#workspace .folder-name-line .truncate {
+    float: none;
+    flex: 0 1 auto;
+    min-width: 0;
+    max-width: 280px;
+}
+
 .denser {
     padding: 2px 4px 2px 4px!important;
 }

front_end/openVRE/public/assets/pages/scripts/actions-home.js

@@ -112,7 +112,8 @@ function move(file) {
 			usrPrjStr = JSON.parse(data);
 			$('#modalMove .modal-title').html('Move <strong>' + usrPrjStr.name + '</strong>');
 			if (usrPrjStr.type == "file") {
-				$('#modalMove .modal-body p').html('File <strong>' + usrPrjStr.name + '</strong> currently located at <strong>/' + usrPrjStr.project + '/' + usrPrjStr.execution + '/</strong>');
+				var currentLoc = usrPrjStr.parent_rel_path || usrPrjStr.execution;
+				$('#modalMove .modal-body p').html('File <strong>' + usrPrjStr.name + '</strong> currently located at <strong>/' + usrPrjStr.project + '/' + currentLoc + '/</strong>');
 				$('#col-1-move').addClass('col-md-3');
 				$('#col-1-move').removeClass('col-md-4');
 				$('#col-2-move').addClass('col-md-3');
@@ -144,7 +145,7 @@ function move(file) {
 				$("#project-name").append('<option value="' + v.id + '" ' + sel + '>' + v.name + '</option>');
 				if (v.name == usrPrjStr.project) {
 					$.each(v.executions, function (k1, v1) {
-						if (v1.name == usrPrjStr.execution) var sel = "selected";
+						var sel = (usrPrjStr.parent_path && v1.path == usrPrjStr.parent_path) ? "selected" : "";
 						$("#execution-name").append('<option value="' + v1.id + '" ' + sel + '>' + v1.name + '</option>');
 					});
 				}
@@ -178,7 +179,7 @@ function moveAllFiles() {
 		success: function (data) {
 
 			$('#modalMove .modal-title').html('Move selected files');
-			$('#modalMove .modal-body p').html('Select the project and execution where you want to move all the selected files:');
+			$('#modalMove .modal-body p').html('Select the project and folder where you want to move all the selected files:');
 			$('#col-1-move').addClass('col-md-4');
 			$('#col-1-move').removeClass('col-md-3');
 			$('#col-2-move').addClass('col-md-4');