From 625493ee9be85c4ef6d0cd8fd1731baed32f500e Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Fri, 31 Mar 2023 14:47:53 -0400
Subject: [PATCH 1/6] Switch the failing Submit priv check to an Admin priv
 check instead

---
 src/src/components/ingest/publications_edit.jsx | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/src/components/ingest/publications_edit.jsx b/src/src/components/ingest/publications_edit.jsx
index fcfc52e3..db40e8f5 100644
--- a/src/src/components/ingest/publications_edit.jsx
+++ b/src/src/components/ingest/publications_edit.jsx
@@ -1426,7 +1426,8 @@ class PublicationEdit extends Component {
   renderButtons() {
     var latestCheck = !this.state.editingPublication.next_revision_uuid ||this.state.editingPublication.next_revision_uuid === undefined;
     var writeCheck = this.state.has_write_priv
-    var subCheck = this.state.has_submit_priv
+    var adminCheck = this.state.has_admin_priv
+    // var subCheck = this.state.has_submit_priv // Not Working for Pubs yet (/ingest-api/issues/301)
     var versCheck = this.state.has_version_priv
     var pubCheck = this.state.editingPublication.status === "Published"
     var newCheck = this.state.editingPublication.status === "New"
@@ -1441,7 +1442,7 @@ class PublicationEdit extends Component {
         )}
         {!pubCheck && writeCheck && (<>{this.saveButton()}</>)}
         {newFormCheck && (<>{this.saveButton()}</>)}
-        {subCheck && !newFormCheck && newCheck  && (<>{this.submitButton()}</>)}
+        {adminCheck && !newFormCheck && newCheck  && (<>{this.submitButton()}</>)}
         {this.cancelModalButton()}
       </div>
     );

From bc65e2daa3e07999794b167c8241f8f801f1f5ce Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Fri, 31 Mar 2023 14:49:53 -0400
Subject: [PATCH 2/6] Fix Console log for changed sub/admin check

---
 src/src/components/ingest/publications_edit.jsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/src/components/ingest/publications_edit.jsx b/src/src/components/ingest/publications_edit.jsx
index db40e8f5..d32019b6 100644
--- a/src/src/components/ingest/publications_edit.jsx
+++ b/src/src/components/ingest/publications_edit.jsx
@@ -1432,7 +1432,7 @@ class PublicationEdit extends Component {
     var pubCheck = this.state.editingPublication.status === "Published"
     var newCheck = this.state.editingPublication.status === "New"
     var newFormCheck = this.props.newForm
-    console.table({latestCheck,writeCheck, subCheck, versCheck, pubCheck, newCheck, newFormCheck});
+    console.table({latestCheck,writeCheck, adminCheck, versCheck, pubCheck, newCheck, newFormCheck});
 
     return (
       <div className="buttonWrapRight">

From 0a6b91f22c38205a74469d3d84fbca15460822c7 Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Mon, 3 Apr 2023 14:41:52 -0400
Subject: [PATCH 3/6] Introduce system for restricting & controlling the
 SearchComponent when rendering for source selection, and restrict Publication
 sources to datatypes

---
 src/src/components/ingest/publications_edit.jsx |  9 ++++++---
 src/src/components/search/SearchComponent.jsx   | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/src/components/ingest/publications_edit.jsx b/src/src/components/ingest/publications_edit.jsx
index d32019b6..036f2dcc 100644
--- a/src/src/components/ingest/publications_edit.jsx
+++ b/src/src/components/ingest/publications_edit.jsx
@@ -1432,7 +1432,7 @@ class PublicationEdit extends Component {
     var pubCheck = this.state.editingPublication.status === "Published"
     var newCheck = this.state.editingPublication.status === "New"
     var newFormCheck = this.props.newForm
-    console.table({latestCheck,writeCheck, adminCheck, versCheck, pubCheck, newCheck, newFormCheck});
+    // console.table({latestCheck,writeCheck, adminCheck, versCheck, pubCheck, newCheck, newFormCheck});
 
     return (
       <div className="buttonWrapRight">
@@ -1891,6 +1891,9 @@ class PublicationEdit extends Component {
                   custom_title="Search for a Source ID for your Publication"
                   filter_type="Publication"
                   modecheck="Source"
+                  restrictions={{
+                    entityType : "dataset"
+                  }}
                 />
               </DialogContent>
               <DialogActions>
@@ -1981,10 +1984,10 @@ class PublicationEdit extends Component {
           {/* pub Status */}
           <div className={"form-gropup mb-4 "+this.state.formErrors.publication_status}>
             <FormControl
-              error={this.state.validationStatus.publication_status}  >
+              error={ this.state.validationStatus.publication_status.length>0 ? true : false}  >
               <FormLabel 
                 id="publication_status"
-                error={this.state.validationStatus.publication_status}>
+                error={ this.state.validationStatus.publication_status.length>0 ? true : false }>
                   Has this Publication been Published?
               </FormLabel>
               <RadioGroup
diff --git a/src/src/components/search/SearchComponent.jsx b/src/src/components/search/SearchComponent.jsx
index 0f169a23..8a3569d0 100644
--- a/src/src/components/search/SearchComponent.jsx
+++ b/src/src/components/search/SearchComponent.jsx
@@ -62,6 +62,7 @@ class SearchComponent extends Component {
       show_search: true,
       table_loading:false,
       updateSuccess: false,
+      restrictions:this.props.restrictions ? this.props.restrictions : {},
       search_filters:{
         entityType: "",
         keywords: "",
@@ -71,8 +72,17 @@ class SearchComponent extends Component {
   }
 
   componentDidMount() {    
+    console.debug("!!!SearchComponent: componentDidMount", this.state.restrictions, this.props.restrictions);
+    if(this.props.restrictions){
+      // So we can apply the object right to the state instead of do parse tango
+      var restrictedState = this.state.restrictions;
+      restrictedState.search_filters = this.state.restrictions;
+      this.setState(restrictedState,
+        function(){ 
+        this.handleSearchClick();
+      })
+    }
     if(this.props.packagedQuery){
-      
       this.setState({
         entityType: this.props.packagedQuery.entityType,
         keywords: this.props.packagedQuery.keywords,
@@ -890,6 +900,7 @@ renderInfoPanel() {
                           name="entityType"
                           id="entityType"
                           className="select-css"
+                          disabled={this.props.restrictions && this.props.restrictions.entityType ? true : false}
                           onChange={this.handleInputChange}
                           value={this.state.search_filters.entityType}
                         >

From cb471cbae6c518e8bc8b7fc72fb28587e511eecb Mon Sep 17 00:00:00 2001
From: shirey <shirey@pitt.edu>
Date: Thu, 6 Apr 2023 09:48:56 -0400
Subject: [PATCH 4/6] bumped version number

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 3a660ff4..be14458a 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.3.13
+2.3.15

From 28fb8a934329d57d280a39c1626b0e996c3b2ce7 Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Fri, 7 Apr 2023 07:05:04 -0400
Subject: [PATCH 5/6] Fix SOurce Modal not closing on cancel

---
 src/src/components/ingest/publications_edit.jsx | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/src/components/ingest/publications_edit.jsx b/src/src/components/ingest/publications_edit.jsx
index 036f2dcc..97df087c 100644
--- a/src/src/components/ingest/publications_edit.jsx
+++ b/src/src/components/ingest/publications_edit.jsx
@@ -512,6 +512,12 @@ class PublicationEdit extends Component {
     });
   };
 
+  cancelLookUpModal = () => {
+    this.setState({
+      LookUpShow: false,
+      lookUpCancelled: true
+    });
+  };
   
   cancelGroupModal = () => {
     this.setState({

From c947c9b303bfb0f4e235c9345792f612ddc9983b Mon Sep 17 00:00:00 2001
From: Birdmachine <jeswaldrip@gmail.com>
Date: Fri, 14 Apr 2023 10:54:15 -0400
Subject: [PATCH 6/6] Fix Submit button Direction and Spinner Activation

---
 src/src/components/ingest/publications_edit.jsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/src/components/ingest/publications_edit.jsx b/src/src/components/ingest/publications_edit.jsx
index 97df087c..0385c876 100644
--- a/src/src/components/ingest/publications_edit.jsx
+++ b/src/src/components/ingest/publications_edit.jsx
@@ -1553,8 +1553,8 @@ class PublicationEdit extends Component {
       <Button
         type="button"
         variant="contained"
-        onClick={() => this.handleSubmit("save")}>
-        {this.state.buttonSpinnerTarget === "save" && (
+        onClick={() => this.handleSubmit("submit")}>
+        {this.state.buttonSpinnerTarget === "submit" && (
           <span>
             <FontAwesomeIcon icon={faSpinner} spin />
           </span>