Merge pull request #1460 from hubmapconsortium/collectionContributors

Collection contributors
hubmapconsortium · Aug 30, 2024 · e80cdbc · e80cdbc
2 parents a9c9d5e + 50c7141
commit e80cdbc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 14 deletions.
diff --git a/src/src/components/collections/collections.jsx b/src/src/components/collections/collections.jsx
@@ -69,15 +69,15 @@ export function CollectionForm (props){
     title:"",
     description: "",
     dataset_uuids: "",
-    creators: [],
+    contributors: [],
     // contacts: [],
     bulk_dataset_uuids:["","",""]
   });
   var [formValues, setFormValues] = useState({
     title: '',
     description: '',
     dataset_uuids: [],
-    creators: [],
+    contributors: [],
     group_uuid:"",
     // contacts: [],
   });
@@ -109,8 +109,8 @@ export function CollectionForm (props){
         formVals.dataset_uuids = UUIDs
         setassociatedEntitiesInitial(UUIDs)
       }
-      if (editingCollection.creators && editingCollection.creators.length > 0) {
-        formVals.contributors = editingCollection.creators
+      if (editingCollection.contributors && editingCollection.contributors.length > 0) {
+        formVals.contributors = editingCollection.contributors
       }
       setFormValues(formVals);  
       setLoadingDatasets(false);
@@ -375,8 +375,7 @@ export function CollectionForm (props){
     console.debug('%c⊙', 'color:#00ff7b', "contributors",contributors );
     if (contributors && (contributors[0] && contributors[0].orcid!==undefined)) {
       // formValuesSubmit.contributors = contributors
-      // Still called creators on the back end
-      formValuesSubmit.creators = contributors
+      formValuesSubmit.contributors = contributors
       setFormErrors((prevValues) => ({
         ...prevValues,
         'contributors': "",
@@ -447,6 +446,7 @@ export function CollectionForm (props){
   };
 
   const handleCreate = (formSubmit) => {
+    setOpenGroupModal(false);
     entity_api_create_entity("collection", formSubmit, props.authToken)
       .then((response) => {
         props.onProcessed(response);

diff --git a/src/src/components/collections/epicollections.jsx b/src/src/components/collections/epicollections.jsx
@@ -69,15 +69,15 @@ export function EPICollectionForm (props){
     title:"",
     description: "",
     dataset_uuids: "",
-    creators: [],
+    contributors: [],
     // contacts: [],
     bulk_dataset_uuids:["","",""]
   });
   var [formValues, setFormValues] = useState({
     title: '',
     description: '',
     dataset_uuids: [],
-    creators: [],
+    contributors: [],
     group_uuid:"",
     // contacts: [],
   });
@@ -109,8 +109,8 @@ export function EPICollectionForm (props){
         formVals.dataset_uuids = UUIDs
         setassociatedEntitiesInitial(UUIDs)
       }
-      if (editingCollection.creators && editingCollection.creators.length > 0) {
-        formVals.contributors = editingCollection.creators
+      if (editingCollection.contributors && editingCollection.contributors.length > 0) {
+        formVals.contributors = editingCollection.contributors
       }
       setFormValues(formVals);  
       setLoadingDatasets(false);
@@ -376,8 +376,7 @@ export function EPICollectionForm (props){
     console.debug('%c⊙', 'color:#00ff7b', "contributors",contributors );
     if (contributors && (contributors[0] && contributors[0].orcid!==undefined)) {
       // formValuesSubmit.contributors = contributors
-      // Still called creators on the back end
-      formValuesSubmit.creators = contributors
+      formValuesSubmit.contributors = contributors
       setFormErrors((prevValues) => ({
         ...prevValues,
         'contributors': "",
@@ -454,6 +453,7 @@ export function EPICollectionForm (props){
   };
 
   const handleCreate = (formSubmit) => {
+    setOpenGroupModal(false);
     entity_api_create_entity("epicollection", formSubmit, props.authToken)
       .then((response) => {
         if(response.status === 200){

diff --git a/src/src/components/search/searchTable.jsx b/src/src/components/search/searchTable.jsx
@@ -203,7 +203,7 @@ export const RenderSearchTable = (props) => {
   }, [allGroups,entityTypeList]);
 
   function handlePageChange(pageInfo) {
-    console.debug("%c⭗", "color:#ff005d", "AAAAAAAAAAAAAAAAAAA", pageInfo);
+    // console.debug("%c⭗", "color:#ff005d", "AAAAAAAAAAAAAAAAAAA", pageInfo);
     setPage(pageInfo.page);
     setPageSize(pageInfo.pageSize);
   }

diff --git a/src/src/components/uuid/groupModal.jsx b/src/src/components/uuid/groupModal.jsx
@@ -17,7 +17,6 @@ class GroupModal extends Component {
 
   render() {
     return (
-
        <Dialog aria-labelledby="group-dialog" open={this.props.show}>
        <DialogContent>
         <div className="row">