Merge pull request #1399 from hubmapconsortium/collectionsUI

Collections UI
hubmapconsortium · May 3, 2024 · d6efc52 · d6efc52
2 parents 9b83763 + 92d2071
commit d6efc52
Show file tree

Hide file tree

Showing 5 changed files with 140 additions and 171 deletions.
diff --git a/src/src/App.js b/src/src/App.js
@@ -217,14 +217,16 @@ export function App (props){
 
 
   function clearAuths() {  
-    console.debug('%c◉ clearAuths start ', 'color:#00ff7b' );
-    return new Promise((resolve) => {
-      setTimeout(() => { // Give it a chance to cleaer the local storage
-        localStorage.removeItem("info");
-        localStorage.removeItem("isAuthenticated");
-        resolve();
-      }, 2000);
-    });
+    if(process.env.REACT_APP_URL == "http://localhost:8585"){
+      console.debug('%c◉ clearAuths start ', 'color:#00ff7b' );
+      return new Promise((resolve) => {
+        setTimeout(() => { // Give it a chance to cleaer the local storage
+          localStorage.removeItem("info");
+          localStorage.removeItem("isAuthenticated");
+          resolve();
+        }, 2000);
+      });
+    }
   }
 
   function Logout(){
@@ -516,7 +518,7 @@ export function App (props){
               <Route path="/dataset/:uuid" element={<RenderDataset reportError={reportError} dataTypeList={dataTypeList} handleCancel={handleCancel}  allGroups={allGroups} status="view"/>} />
               <Route path="/upload/:uuid" element={<RenderUpload  reportError={reportError} handleCancel={handleCancel} status="view" allGroups={allGroups}/>} />
               <Route path="/publication/:uuid" element={<RenderPublication reportError={reportError} handleCancel={handleCancel} status="view" />} />
-              <Route path="/collection/:uuid" element={<RenderCollection groupsToken={groupsToken}  dtl_all={dataTypeListAll} onUpdated={(response) => updateSuccess(response)}  reportError={reportError} handleCancel={handleCancel} status="view" />} />
+              <Route path="/collection/:uuid" element={<RenderCollection groupsToken={groupsToken}  dataGroups={userDataGroups} dtl_all={dataTypeListAll} onUpdated={(response) => updateSuccess(response)}  reportError={reportError} handleCancel={handleCancel} status="view" />} />
 
               <Route path="/bulk/donors" exact element={<RenderBulk reportError={reportError} bulkType="donors" />} />
               <Route path="/bulk/samples" exact element={<RenderBulk reportError={reportError} bulkType="samples" />} />

diff --git a/src/src/components/collections.jsx b/src/src/components/collections.jsx
@@ -29,10 +29,10 @@ export const RenderCollection = (props) => {
   // let reportError = ;
 
   useEffect(() => {
-    const entityUUID = uuid.uuid
-    var authSet = JSON.parse(localStorage.getItem("info"));
-    console.debug('%c◉ entityUUID ', 'color:#00ff7b', entityUUID);
-    if (entityUUID) {
+    if (!newForm && uuid) {
+      const entityUUID = uuid.uuid
+      var authSet = JSON.parse(localStorage.getItem("info"));
+      console.debug('%c◉ entityUUID ', 'color:#00ff7b', entityUUID);
       entity_api_get_entity(entityUUID, authSet.groups_token)
       .then((response) => {
         console.debug('%c◉ response ', 'color:#00ff7b', response);