From 8817b42dd13bd4ce3d31ce6416e2dde7550a3218 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Mon, 18 Dec 2023 11:03:41 -0600
Subject: [PATCH 1/7] WP-47: if user is Guest, disable rename & trash

---
 .../DataFilesToolbar/DataFilesToolbar.jsx     | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
index 63b22155a..152bb35e1 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
@@ -5,6 +5,7 @@ import PropTypes from 'prop-types';
 import { Button } from '_common';
 import getFilePermissions from 'utils/filePermissions';
 import { useModal, useSelectedFiles, useFileListing } from 'hooks/datafiles';
+import { useSystemRole } from '../DataFilesProjectMembers/_cells/SystemRoleSelector';
 import './DataFilesToolbar.scss';
 
 export const ToolbarButton = ({ text, iconName, onClick, disabled }) => {
@@ -45,7 +46,6 @@ const DataFilesToolbar = ({ scheme, api }) => {
   const reloadPage = () => {
     history.push(location.pathname);
   };
-
   const systemList = useSelector(
     (state) => state.systems.storage.configuration.filter((s) => !s.hidden),
     shallowEqual
@@ -55,6 +55,21 @@ const DataFilesToolbar = ({ scheme, api }) => {
     (sys) => sys.system === params.system && sys.scheme === params.scheme
   );
 
+  const { projectId } = useSelector(
+    (state) => state.projects.metadata
+  );
+  
+  const authenticatedUser = useSelector(
+    (state) => state.authenticatedUser.user.username
+  );
+
+  const { query: authenticatedUserQuery } = useSystemRole(
+    projectId,
+    authenticatedUser
+  );
+
+  const isGuest = authenticatedUserQuery?.data?.role === 'GUEST'
+
   const inTrash = useSelector((state) => {
     // remove leading slash from homeDir value
     const homeDir = selectedSystem?.homeDir?.slice(1);
@@ -177,10 +192,10 @@ const DataFilesToolbar = ({ scheme, api }) => {
     'areMultipleFilesOrFolderSelected',
     permissionParams
   );
-  const canRename = getFilePermissions('rename', permissionParams);
+  const canRename = getFilePermissions('rename', permissionParams) && !isGuest;
   const canMove = getFilePermissions('move', permissionParams);
   const canCopy = getFilePermissions('copy', permissionParams);
-  const canTrash = getFilePermissions('trash', permissionParams);
+  const canTrash = getFilePermissions('trash', permissionParams) && !isGuest;
   const canCompress = getFilePermissions('compress', permissionParams);
   const canExtract = getFilePermissions('extract', permissionParams);
   const canMakePublic =

From 0bc4814260334e26a4ae56ac5cccce1cec8a1991 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Mon, 18 Dec 2023 15:24:06 -0600
Subject: [PATCH 2/7] css to Update button

---
 .../DataFilesProjectMembers.module.scss                      | 4 ++++
 .../DataFilesProjectMembers/_cells/SystemRoleSelector.jsx    | 5 +++--
 .../DataFiles/DataFilesToolbar/DataFilesToolbar.jsx          | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesProjectMembers/DataFilesProjectMembers.module.scss b/client/src/components/DataFiles/DataFilesProjectMembers/DataFilesProjectMembers.module.scss
index e1fe53229..69f6d645e 100644
--- a/client/src/components/DataFiles/DataFilesProjectMembers/DataFilesProjectMembers.module.scss
+++ b/client/src/components/DataFiles/DataFilesProjectMembers/DataFilesProjectMembers.module.scss
@@ -69,6 +69,10 @@
   composes: c-button--secondary from '../../../styles/components/c-button.css';
 }
 
+.ownership-button {
+  margin-left: 5px;
+}
+
 div > .project-role-selector {
   height: auto; /* overwrite .form-control height to accommodate dropdown selector next to small button in this instance */
 }
diff --git a/client/src/components/DataFiles/DataFilesProjectMembers/_cells/SystemRoleSelector.jsx b/client/src/components/DataFiles/DataFilesProjectMembers/_cells/SystemRoleSelector.jsx
index 3ac8dd12b..f623c6b85 100644
--- a/client/src/components/DataFiles/DataFilesProjectMembers/_cells/SystemRoleSelector.jsx
+++ b/client/src/components/DataFiles/DataFilesProjectMembers/_cells/SystemRoleSelector.jsx
@@ -4,7 +4,7 @@ import { useSelector } from 'react-redux';
 import Cookies from 'js-cookie';
 import fetch from 'cross-fetch';
 import DropdownSelector from '_common/DropdownSelector';
-import { Button } from 'reactstrap';
+import { Button } from '_common';
 import styles from '../DataFilesProjectMembers.module.scss';
 import LoadingSpinner from '_common/LoadingSpinner';
 
@@ -109,7 +109,8 @@ const SystemRoleSelector = ({ projectId, username }) => {
       </DropdownSelector>
       {data.role !== selectedRole && !isFetching && (
         <Button
-          style={{ marginLeft: '5px' }}
+          type="secondary"
+          size="small"
           className={styles['ownership-button']}
           onClick={() => setSystemRole(selectedRole)}
         >
diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
index 152bb35e1..b948a677a 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
@@ -46,6 +46,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
   const reloadPage = () => {
     history.push(location.pathname);
   };
+  
   const systemList = useSelector(
     (state) => state.systems.storage.configuration.filter((s) => !s.hidden),
     shallowEqual

From cf048f8144dcdf58758cb95019fec3a6bb477787 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Mon, 18 Dec 2023 15:55:32 -0600
Subject: [PATCH 3/7] npm run prettier

---
 .../DataFiles/DataFilesToolbar/DataFilesToolbar.jsx    | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
index b948a677a..20aeea0c4 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
@@ -46,7 +46,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
   const reloadPage = () => {
     history.push(location.pathname);
   };
-  
+
   const systemList = useSelector(
     (state) => state.systems.storage.configuration.filter((s) => !s.hidden),
     shallowEqual
@@ -56,10 +56,8 @@ const DataFilesToolbar = ({ scheme, api }) => {
     (sys) => sys.system === params.system && sys.scheme === params.scheme
   );
 
-  const { projectId } = useSelector(
-    (state) => state.projects.metadata
-  );
-  
+  const { projectId } = useSelector((state) => state.projects.metadata);
+
   const authenticatedUser = useSelector(
     (state) => state.authenticatedUser.user.username
   );
@@ -69,7 +67,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
     authenticatedUser
   );
 
-  const isGuest = authenticatedUserQuery?.data?.role === 'GUEST'
+  const isGuest = authenticatedUserQuery?.data?.role === 'GUEST';
 
   const inTrash = useSelector((state) => {
     // remove leading slash from homeDir value

From f8de2d7dcc4a6eed39ab7327ba72dc128e60d788 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Tue, 19 Dec 2023 16:01:33 -0600
Subject: [PATCH 4/7] update to unit test

---
 .../DataFilesToolbar/DataFilesToolbar.test.js        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
index ccd0589e0..794e712d5 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
@@ -50,6 +50,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );
@@ -82,6 +84,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );
@@ -114,6 +118,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );
@@ -146,6 +152,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );
@@ -187,6 +195,8 @@ describe('DataFilesToolbar', () => {
           operationStatus: { trash: false },
         },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );
@@ -218,6 +228,8 @@ describe('DataFilesToolbar', () => {
         },
         //listing: {  } },
         systems: systemsFixture,
+        projects: {metadata: []},
+        authenticatedUser: {user: {username: 'testuser' }},
       }),
       createMemoryHistory()
     );

From 798df6b133a11f29eefaed064a5a0149000abfd9 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Tue, 19 Dec 2023 16:03:24 -0600
Subject: [PATCH 5/7] ran prettier

---
 .../DataFilesToolbar/DataFilesToolbar.test.js | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
index 794e712d5..0fe2eb874 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.test.js
@@ -50,8 +50,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );
@@ -84,8 +84,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );
@@ -118,8 +118,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );
@@ -152,8 +152,8 @@ describe('DataFilesToolbar', () => {
         },
         listing: { selected: { FilesListing: [] } },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );
@@ -195,8 +195,8 @@ describe('DataFilesToolbar', () => {
           operationStatus: { trash: false },
         },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );
@@ -228,8 +228,8 @@ describe('DataFilesToolbar', () => {
         },
         //listing: {  } },
         systems: systemsFixture,
-        projects: {metadata: []},
-        authenticatedUser: {user: {username: 'testuser' }},
+        projects: { metadata: [] },
+        authenticatedUser: { user: { username: 'testuser' } },
       }),
       createMemoryHistory()
     );

From 873f46e1d01e6232eaaa8ef103cc01f0a21a9925 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Fri, 22 Dec 2023 11:37:58 -0600
Subject: [PATCH 6/7] check for 'USER' to prevent file move

---
 Core-Portal                                                    | 1 +
 .../components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)
 create mode 160000 Core-Portal

diff --git a/Core-Portal b/Core-Portal
new file mode 160000
index 000000000..272c63258
--- /dev/null
+++ b/Core-Portal
@@ -0,0 +1 @@
+Subproject commit 272c63258beb289659dd2d5f6454f9f414923bc2
diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
index 20aeea0c4..c8cbb3663 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
@@ -68,6 +68,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
   );
 
   const isGuest = authenticatedUserQuery?.data?.role === 'GUEST';
+  const isUser = authenticatedUserQuery?.data?.role === 'USER';
 
   const inTrash = useSelector((state) => {
     // remove leading slash from homeDir value
@@ -192,7 +193,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
     permissionParams
   );
   const canRename = getFilePermissions('rename', permissionParams) && !isGuest;
-  const canMove = getFilePermissions('move', permissionParams);
+  const canMove = getFilePermissions('move', permissionParams) && !isUser;
   const canCopy = getFilePermissions('copy', permissionParams);
   const canTrash = getFilePermissions('trash', permissionParams) && !isGuest;
   const canCompress = getFilePermissions('compress', permissionParams);

From d10c35bb68e0d95b649920025b404287c1350df4 Mon Sep 17 00:00:00 2001
From: van-go <35277477+van-go@users.noreply.github.com>
Date: Fri, 22 Dec 2023 11:45:28 -0600
Subject: [PATCH 7/7] 'GUEST' cannot move files

---
 .../components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
index c8cbb3663..fee8929a8 100644
--- a/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
+++ b/client/src/components/DataFiles/DataFilesToolbar/DataFilesToolbar.jsx
@@ -68,7 +68,6 @@ const DataFilesToolbar = ({ scheme, api }) => {
   );
 
   const isGuest = authenticatedUserQuery?.data?.role === 'GUEST';
-  const isUser = authenticatedUserQuery?.data?.role === 'USER';
 
   const inTrash = useSelector((state) => {
     // remove leading slash from homeDir value
@@ -193,7 +192,7 @@ const DataFilesToolbar = ({ scheme, api }) => {
     permissionParams
   );
   const canRename = getFilePermissions('rename', permissionParams) && !isGuest;
-  const canMove = getFilePermissions('move', permissionParams) && !isUser;
+  const canMove = getFilePermissions('move', permissionParams) && !isGuest;
   const canCopy = getFilePermissions('copy', permissionParams);
   const canTrash = getFilePermissions('trash', permissionParams) && !isGuest;
   const canCompress = getFilePermissions('compress', permissionParams);