From 4efedee1729d9614b02c2122eef9ccdb7a1288d9 Mon Sep 17 00:00:00 2001 From: Benoit Schweblin Date: Wed, 11 Apr 2018 16:19:20 +0100 Subject: [PATCH] Fixed trash in Google Drive workspace --- .../providers/googleDriveWorkspaceProvider.js | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/services/providers/googleDriveWorkspaceProvider.js b/src/services/providers/googleDriveWorkspaceProvider.js index 7fcf5d17..622975b5 100644 --- a/src/services/providers/googleDriveWorkspaceProvider.js +++ b/src/services/providers/googleDriveWorkspaceProvider.js @@ -368,12 +368,22 @@ export default providerRegistry.register({ ifNotTooLate, ); } - // Type `file` or `folder` + + // For type `file` or `folder` const parentSyncData = store.getters['data/syncDataByItemId'][item.parentId]; + let parentId; + if (item.parentId === 'trash') { + parentId = workspace.trashFolderId; + } else if (parentSyncData) { + parentId = parentSyncData.id; + } else { + parentId = workspace.folderId; + } + return googleHelper.uploadFile( syncToken, item.name, - [parentSyncData ? parentSyncData.id : workspace.folderId], + [parentId], { id: item.id, folderId: workspace.folderId,