Merge branch 'task/digital-rocks' into task/WC-148--prj-ownership-cha…

…nge-toast
TACC · Dec 10, 2024 · e2d34da · e2d34da
2 parents 4777b60 + c3dfa00
commit e2d34da
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx
@@ -90,7 +90,7 @@ const DataFilesProjectEditDescriptionModal = () => {
         {({ isValid, dirty }) => (
           <Form>
             <ModalHeader toggle={toggle} charCode="&#xe912;">
-              Edit Project
+              Edit Dataset
             </ModalHeader>
             <ModalBody className={styles['modal-body']}>
               <FormField

diff --git a/client/src/components/DataFiles/DataFilesProjectFileListing/DataFilesProjectFileListing.jsx b/client/src/components/DataFiles/DataFilesProjectFileListing/DataFilesProjectFileListing.jsx
@@ -125,7 +125,7 @@ const DataFilesProjectFileListing = ({ rootSystem, system, path }) => {
           {canEditSystem ? (
             <>
               <Button type="link" onClick={onEdit}>
-                Edit Project
+                Edit Dataset
               </Button>
               <span className={styles.separator}>|</span>
             </>

diff --git a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublish.jsx b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublish.jsx
@@ -110,7 +110,7 @@ const DataFilesProjectPublish = ({ rootSystem, system }) => {
           className={styles.root}
           header={
             <div className={styles.title}>
-              Request Project Publication | {metadata.title}
+              Request Dataset Publication | {metadata.title}
             </div>
           }
           headerActions={
@@ -120,7 +120,7 @@ const DataFilesProjectPublish = ({ rootSystem, system }) => {
                   className="wb-link"
                   to={`${ROUTES.WORKBENCH}${ROUTES.DATA}/tapis/projects/${rootSystem}/${system}`}
                 >
-                  Back to Project
+                  Back to Dataset
                 </Link>
               </>
             </div>

diff --git a/...tom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx b/...tom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx
@@ -134,14 +134,14 @@ const ProjectDescription = ({ project }) => {
 
   return (
     <SectionTableWrapper
-      header={<div className={styles.title}>Proofread Project</div>}
+      header={<div className={styles.title}>Proofread Dataset</div>}
       headerActions={
         <>
           {canEdit && (
             <div className={styles.controls}>
               <>
                 <Button type="link" onClick={onEdit}>
-                  Edit Project
+                  Edit Dataset
                 </Button>
               </>
             </div>

diff --git a/...drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx b/...drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx
@@ -46,7 +46,7 @@ export const ReviewProjectStructure = ({ projectTree }) => {
             <div className={styles.controls}>
               <>
                 <Button type="link" onClick={onEdit}>
-                  Edit Project
+                  Edit Dataset
                 </Button>
               </>
             </div>

diff --git a/client/src/components/_custom/drp/DataFilesProjectReview/DataFilesProjectReview.jsx b/client/src/components/_custom/drp/DataFilesProjectReview/DataFilesProjectReview.jsx
@@ -98,7 +98,7 @@ const DataFilesProjectReview = ({ rootSystem, system }) => {
                   className="wb-link"
                   to={`${ROUTES.WORKBENCH}${ROUTES.DATA}/tapis/projects/${rootSystem}/${system}`}
                 >
-                  Back to Project
+                  Back to Dataset
                 </Link>
               </>
             </div>

diff --git a/server/portal/apps/projects/views.py b/server/portal/apps/projects/views.py
@@ -94,12 +94,12 @@ def get(self, request, root_system=None):
         if query_string:
             search = IndexedProject.search()
 
-            ngram_query = Q("query_string", query=query_string,
+            ngram_query = Q("query_string", query=query_string.lower(),
                             fields=["title", "id"],
                             minimum_should_match='100%',
                             default_operator='or')
 
-            wildcard_query = Q("wildcard", title=f'*{query_string}*') | Q("wildcard", id=f'*{query_string}*')
+            wildcard_query = Q("wildcard", title=f'*{query_string.lower()}*') | Q("wildcard", id=f'*{query_string.lower()}*')
 
             search = search.query(ngram_query | wildcard_query)
             search = search.extra(from_=int(offset), size=int(limit))

diff --git a/server/portal/apps/projects/workspace_operations/project_publish_operations.py b/server/portal/apps/projects/workspace_operations/project_publish_operations.py
@@ -290,7 +290,7 @@ def send_publication_accept_email(self, project_id):
 
 
 @shared_task(bind=True, queue='default')
-def send_publication_reject_email(self, project_id: str, version: Optional[int], error: str):
+def send_publication_reject_email(self, project_id: str):
     """
     Alert project authors that their request has been rejected.
     """

diff --git a/server/portal/settings/settings_default.py b/server/portal/settings/settings_default.py
@@ -103,7 +103,7 @@
         "siteSearchPriority": 0,
     },
     {
-        'name': 'Projects',
+        'name': 'Dataset',
         'scheme': 'projects',
         'api': 'tapis',
         'icon': 'publications',
@@ -114,7 +114,7 @@
         'rootDir': '/corral-repl/utexas/OTH21076/data_pprd/projects',
     },
     {
-        'name': 'Published',
+        'name': 'Published Datasets',
         'scheme': 'projects',
         'api': 'tapis',
         'icon': 'publications',