Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix/WG-436: use system path during project creation #330

Merged
merged 4 commits into from
Feb 18, 2025
Merged

fix/WG-436: use system path during project creation #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
dcb0462
Use system path on file creation
nathanfranklin Feb 18, 2025
cb6ab6a
Use depenencies
nathanfranklin Feb 18, 2025
6f4df9d
Fix display of my data and ds project names
nathanfranklin Feb 18, 2025
33398cc
Fix path
nathanfranklin Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions react/src/components/CreateMapModal/CreateMapModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ const CreateMapModal = ({ isOpen, closeModal }: CreateMapModalProps) => {
setValue('systemFile', systemFilename);
oldSystemFilename.current = systemFilename;
}
}, [mapName]);
}, [getValues, mapName, setValue]);

const handleClose = () => {
setErrorMessage('');
Expand Down Expand Up @@ -142,7 +142,7 @@ const CreateMapModal = ({ isOpen, closeModal }: CreateMapModalProps) => {
description: values.description,
system_file: values.systemFile,
system_id: values.systemId,
system_path: `/${userData.username}`,
system_path: values.systemPath,
watch_content: values.syncFolder,
watch_users: values.syncFolder,
};
Expand Down
8 changes: 4 additions & 4 deletions react/src/components/ManageMapProjectPanel/SaveTabContent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const SaveTabContent: React.FC<SaveTabProps> = ({ project }) => {

if (project.system_id) {
if (project.system_id.startsWith('project')) {
dsFolderHref = `${dsDataDepotUrl}projects/${dsProj?.value.projectId}${project.system_path}`;
dsFolderHref = `${dsDataDepotUrl}projects/${dsProj?.value.projectId}/${project.system_path}`;

if (project.system_file) {
dsProjectHref = `${dsDataDepotUrl}projects/${dsProj?.value.projectId}`;
Expand Down Expand Up @@ -98,9 +98,9 @@ const SaveTabContent: React.FC<SaveTabProps> = ({ project }) => {
rel="noreferrer"
style={{ padding: 0 }}
>
{dsProj?.value.projectId}
{dsProj.value.projectId}
{' | '}
{project.name}
{dsProj.value.title}
</Button>
) : (
<Button
Expand All @@ -110,7 +110,7 @@ const SaveTabContent: React.FC<SaveTabProps> = ({ project }) => {
rel="noreferrer"
style={{ padding: 0 }}
>
{project.system_id}
My Data
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If we show My Data here for designsafe.storage.default, we should change the project.system_path above to be handled similarly to the saveLocationDisplay:

hazmapper/react/src/components/CreateMapModal/CreateMapModal.tsx

Line 99 in 33398cc

const saveLocationDisplay =

Copy link
Collaborator Author

@nathanfranklin nathanfranklin Feb 18, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good idea. gonna merge current PR and draft up this change.

@rstijerina , put in https://tacc-main.atlassian.net/browse/WG-437

</Button>
)}
</>
Expand Down
Loading