enso-org/enso
1
1
Fork 0
mirror of https://github.com/enso-org/enso.git synced 2024-12-23 00:52:09 +03:00
Code Issues Projects Releases Wiki Activity

Fix updating conflicting project (#11111)

Browse Source 
This PR fixes a bug, when uploading a duplicate project to local backend threw a crash on windows.


https://github.com/user-attachments/assets/fe1bd7a7-d840-4bb1-b3f6-e0beec70fcd4
I found a bug when we upload a project to a remote backend, it throws a 500 error. Notified @PabloBuchu about that.

Also, @hubertp proved that the ProjectManager always duplicates a project no matter which option we choose(either "update" or "rename“).  So I removed the "update" button if we upload a project locally
This commit is contained in:
Sergei Garin 2024-10-10 17:51:59 +03:00 committed by GitHub
parent 3458fe4fe1
commit 239a6803bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/dashboard/src/layouts/AssetsTable.tsx
View File

@ -1770,7 +1770,7 @@ export default function AssetsTable(props: AssetsTableProps) {
addIdToSelection(projectId)
await getProjectDetailsMutation
.mutateAsync([projectId, asset.parentId, file.name])
.mutateAsync([projectId, asset.parentId, asset.title])
.catch((error) => {
deleteAsset(projectId)
toastAndLog('uploadProjectError', error)
@ -1887,13 +1887,7 @@ export default function AssetsTable(props: AssetsTableProps) {
const asset = isUpdating ? conflict.current : conflict.new
fileMap.set(
asset.id,
new File([conflict.file], asset.title, {
type: conflict.file.type,
lastModified: conflict.file.lastModified,
}),
)
fileMap.set(asset.id, conflict.file)
insertAssets([asset], event.parentId)
void doUploadFile(asset, isUpdating ? 'update' : 'new')

3
app/dashboard/src/modals/DuplicateAssetsModal.tsx
View File

@ -214,6 +214,7 @@ export default function DuplicateAssetsModal(props: DuplicateAssetsModalProps) {
>
{getText('update')}
</ariaComponents.Button>
<ariaComponents.Button
variant="outline"
onPress={() => {
@ -252,6 +253,7 @@ export default function DuplicateAssetsModal(props: DuplicateAssetsModalProps) {
: getText('andOtherProjects', otherProjectsCount)}
</aria.Text>
)}
<ariaComponents.ButtonGroup className="relative">
<ariaComponents.Button
variant="submit"
@ -263,6 +265,7 @@ export default function DuplicateAssetsModal(props: DuplicateAssetsModalProps) {
>
{count === 1 ? getText('update') : getText('updateAll')}
</ariaComponents.Button>
<ariaComponents.Button
variant="accent"
onPress={() => {