From f9697efcdcb19c844913c44a035b358d3f920bc1 Mon Sep 17 00:00:00 2001 From: shayanaijaz Date: Wed, 4 Dec 2024 15:56:37 -0600 Subject: [PATCH 1/3] changes projects to datasets --- .../DataFilesModals/DataFilesProjectEditDescriptionModal.jsx | 2 +- .../DataFilesProjectFileListing.jsx | 2 +- .../drp/DataFilesProjectPublish/DataFilesProjectPublish.jsx | 4 ++-- .../DataFilesProjectPublishWizardSteps/ProjectDescription.jsx | 4 ++-- .../ReviewProjectStructure.jsx | 2 +- .../drp/DataFilesProjectReview/DataFilesProjectReview.jsx | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx index 0a07f9f1f..03b5aa54c 100644 --- a/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx +++ b/client/src/components/DataFiles/DataFilesModals/DataFilesProjectEditDescriptionModal.jsx @@ -90,7 +90,7 @@ const DataFilesProjectEditDescriptionModal = () => { {({ isValid, dirty }) => (
- Edit Project + Edit Dataset { {canEditSystem ? ( <> | diff --git a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublish.jsx b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublish.jsx index 25dc6d63e..bee5d4bd2 100644 --- 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={
- Request Project Publication | {metadata.title} + Request Dataset Publication | {metadata.title}
} 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 diff --git a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx index e314d0a3b..99c7a593b 100644 --- a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx +++ b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ProjectDescription.jsx @@ -134,14 +134,14 @@ const ProjectDescription = ({ project }) => { return ( Proofread Project} + header={
Proofread Dataset
} headerActions={ <> {canEdit && (
<>
diff --git a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx index 8d8edef5e..9c8c787da 100644 --- a/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx +++ b/client/src/components/_custom/drp/DataFilesProjectPublish/DataFilesProjectPublishWizardSteps/ReviewProjectStructure.jsx @@ -46,7 +46,7 @@ export const ReviewProjectStructure = ({ projectTree }) => {
<>
diff --git a/client/src/components/_custom/drp/DataFilesProjectReview/DataFilesProjectReview.jsx b/client/src/components/_custom/drp/DataFilesProjectReview/DataFilesProjectReview.jsx index 6c660720a..f11acc224 100644 --- 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 From 271ce8c2b88fdc9d92613a954af42f6489f52e09 Mon Sep 17 00:00:00 2001 From: shayanaijaz Date: Wed, 4 Dec 2024 16:58:42 -0600 Subject: [PATCH 2/3] publication rejection email bug fix --- .../workspace_operations/project_publish_operations.py | 2 +- server/portal/settings/settings_default.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/server/portal/apps/projects/workspace_operations/project_publish_operations.py b/server/portal/apps/projects/workspace_operations/project_publish_operations.py index 0157b41b8..1cd37ac71 100644 --- 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 index 813ec0405..6ba54927f 100644 --- 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', From c3dfa0029975d73ba8f6105c911ea2f2ef3a563d Mon Sep 17 00:00:00 2001 From: Jake Rosenberg Date: Tue, 10 Dec 2024 11:44:37 -0600 Subject: [PATCH 3/3] Fix case bug in project metadata search (#1001) Co-authored-by: Shayan Khan --- server/portal/apps/projects/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/portal/apps/projects/views.py b/server/portal/apps/projects/views.py index e1ac3d179..e5b6246c1 100644 --- 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))