task/WI-454 - DPM Merge into Main

.gitignore

@@ -22,6 +22,7 @@ server/docs
 *settings_secret.py
 *settings_custom.py
 *settings_local.py
+*settings_forms.py
 
 docker_repo.var
 server/src

README.md

@@ -10,7 +10,7 @@ The base Portal code for TACC WMA Workspace Portals
 
 # Local Development Setup
 
-## Prerequisites for running the portal application
+## Prerequisites for running the portal application:
 
 * Docker > 28
 * Python 3.12.x

client/package.json

@@ -7,6 +7,7 @@
     "@emotion/react": "^11.13.3",
     "@emotion/styled": "^11.13.0",
     "@mui/material": "^6.1.1",
+    "@mui/x-tree-view": "^7.26.0",
     "@niivue/niivue": "^0.32.0",
     "@tanstack/react-query": "^5.59.16",
     "antd": "^5.29.3",
@@ -29,6 +30,7 @@
     "react-redux": "^7.2.5",
     "react-resize-detector": "^11.0.1",
     "react-router-dom": "^5.3.0",
+    "react-step-wizard": "^5.3.11",
     "react-table": "^7.0.5",
     "react-virtualized-auto-sizer": "^1.0.6",
     "react-window": "^1.8.6",

client/src/components/Applications/AppBrowser/AppBrowser.scss

@@ -10,10 +10,10 @@
 
   --panel-vertical-buffer: 10px;
   --panel-max-item-count: 5;
-  --panel-item-height: 34px; /* (~30px design * 1.2 design-to-app ratio) */
+  --panel-item-height: 35px; /* (~30px design * 1.2 design-to-app ratio) */
   --panel-height: calc(
     (var(--panel-max-item-count) * var(--panel-item-height)) +
-      var(--panel-vertical-buffer)
+      (var(--panel-vertical-buffer) * 2)
   );
 
   border-bottom: 1px solid #707070;

client/src/components/DataFiles/CombinedBreadcrumbs/CombinedBreadcrumbs.jsx

@@ -20,6 +20,7 @@ CombinedBreadcrumbs.propTypes = {
   path: PropTypes.string.isRequired,
   section: PropTypes.string.isRequired,
   isPublic: PropTypes.bool,
+  basePath: PropTypes.string,
   className: PropTypes.string,
 };
 

client/src/components/DataFiles/DataFiles.jsx

@@ -11,7 +11,11 @@ import {
   SectionMessage,
   LoadingSpinner,
 } from '_common';
-import { useFileListing, useSystems } from 'hooks/datafiles';
+import {
+  useFileListing,
+  useSystems,
+  useAddonComponents,
+} from 'hooks/datafiles';
 import DataFilesToolbar from './DataFilesToolbar/DataFilesToolbar';
 import DataFilesListing from './DataFilesListing/DataFilesListing';
 import DataFilesSidebar from './DataFilesSidebar/DataFilesSidebar';
@@ -20,6 +24,9 @@ import DataFilesModals from './DataFilesModals/DataFilesModals';
 import DataFilesProjectsList from './DataFilesProjectsList/DataFilesProjectsList';
 import DataFilesProjectFileListing from './DataFilesProjectFileListing/DataFilesProjectFileListing';
 import { useSystemRole } from './DataFilesProjectMembers/_cells/SystemRoleSelector';
+import DataFilesPublicationsList from './DataFilesPublicationsList/DataFilesPublicationsList';
+import DataFilesReviewProjectList from './DataFilesReviewProjectsList/DataFilesReviewProjectList';
+import { getDecodedPath } from 'utils/datafilesUtil';
 
 const DefaultSystemRedirect = () => {
   const systems = useSelector(
@@ -30,28 +37,91 @@ const DefaultSystemRedirect = () => {
   useEffect(() => {
     if (systems.length === 0) return;
     const defaultSystem = systems[0];
-    history.push(
-      `/workbench/data/${defaultSystem.api}/${defaultSystem.scheme}/${
-        defaultSystem.scheme === 'projects'
-          ? ''
-          : `${defaultSystem.system}${defaultSystem.homeDir || ''}/`
-      }`
-    );
+
+    let path = `/workbench/data/${defaultSystem.api}/${defaultSystem.scheme}`;
+
+    if (defaultSystem.scheme === 'projects') {
+      path += defaultSystem.system ? `/${defaultSystem.system}` : '/';
+    } else {
+      path += `/${defaultSystem.system}${defaultSystem.homeDir || ''}/`;
+    }
+
+    history.push(path);
   }, [systems]);
   return <></>;
 };
 
 const DataFilesSwitch = React.memo(() => {
   const { path } = useRouteMatch();
+
+  const portalName = useSelector((state) => state.workbench.portalName);
+
+  const { DataFilesProjectPublish, DataFilesProjectReview } =
+    useAddonComponents({ portalName });
+
+  const systems = useSelector(
+    (state) => state.systems.storage.configuration.filter((s) => !s.hidden),
+    shallowEqual
+  );
+
   return (
     <Switch>
+      {DataFilesProjectPublish && (
+        <Route
+          path={`${path}/tapis/projects/:root_system/:system/publish`}
+          render={({ match: { params } }) => {
+            return (
+              <SectionTableWrapper contentShouldScroll>
+                <DataFilesProjectPublish
+                  system={params.system}
+                  rootSystem={params.root_system}
+                />
+              </SectionTableWrapper>
+            );
+          }}
+        />
+      )}
+      {DataFilesProjectReview && (
+        <Route
+          path={`${path}/tapis/projects/:root_system/:system/review`}
+          render={({ match: { params } }) => {
+            return (
+              <SectionTableWrapper contentShouldScroll>
+                <DataFilesProjectReview
+                  system={params.system}
+                  rootSystem={params.root_system}
+                />
+              </SectionTableWrapper>
+            );
+          }}
+        />
+      )}
       <Route
-        path={`${path}/tapis/projects/:system/:path*`}
+        exact
+        path={`${path}/tapis/projects/:system`}
         render={({ match: { params } }) => {
+          const system = systems.find((s) => s.system === params.system);
+
+          if (system.publicationProject) {
+            return <DataFilesPublicationsList rootSystem={params.system} />;
+          } else if (system.reviewProject) {
+            return <DataFilesReviewProjectList rootSystem={params.system} />;
+          }
+
+          return <DataFilesProjectsList rootSystem={params.system} />;
+        }}
+      />
+      <Route
+        path={`${path}/tapis/projects/:root_system/:system/:path*`}
+        render={({ match: { params } }) => {
+
+          const decodedPath = getDecodedPath(params.path);
+
           return (
             <DataFilesProjectFileListing
+              rootSystem={params.root_system}
               system={params.system}
-              path={params.path || '/'}
+              path={decodedPath}
             />
           );
         }}
@@ -71,9 +141,6 @@ const DataFilesSwitch = React.memo(() => {
           );
         }}
       />
-      <Route path={`${path}/tapis/projects`}>
-        <DataFilesProjectsList />
-      </Route>
       <Route path={`${path}`}>
         <DefaultSystemRedirect />
       </Route>

client/src/components/DataFiles/DataFilesBreadcrumbs/DataFilesBreadcrumbs.jsx

@@ -141,7 +141,7 @@ const DataFilesBreadcrumbs = ({
     });
   };
 
-  const { fetchSelectedSystem } = useSystems();
+  const { fetchSelectedSystem, isRootProjectSystem } = useSystems();
 
   const selectedSystem = fetchSelectedSystem({ scheme, system, path });
 
@@ -183,9 +183,7 @@ const DataFilesBreadcrumbs = ({
     <div className="breadcrumb-container">
       <div className={`breadcrumbs ${className}`}>
         {currentDirectory.length === 0 ? (
-          <span className="system-name">
-            {truncateMiddle(systemName || 'Shared Workspaces', 30)}
-          </span>
+          <span className="system-name">{truncateMiddle(systemName, 30)}</span>
         ) : (
           currentDirectory.map((pathComp, i) => {
             if (i === fullPath.length - 1) {
@@ -194,11 +192,13 @@ const DataFilesBreadcrumbs = ({
           })
         )}
       </div>
-      {systemName && api === 'tapis' && (
-        <Button type="link" onClick={openFullPathModal}>
-          View Full Path
-        </Button>
-      )}
+      {systemName &&
+        api === 'tapis' &&
+        !isRootProjectSystem(selectedSystem ?? '') && (
+          <Button type="link" onClick={openFullPathModal}>
+            View Full Path
+          </Button>
+        )}
     </div>
   );
 };