Pārlūkot izejas kodu

refactor: dont send raw item data for all providers

Ifedapo Olarewaju 6 gadi atpakaļ
vecāks
revīzija
9dd9de0ed3

+ 4 - 0
packages/@uppy/companion/src/server/provider/drive/adapter.js

@@ -60,3 +60,7 @@ exports.getItemModifiedDate = (item) => {
 exports.getItemThumbnailUrl = (item) => {
   return `/drive/thumbnail/${exports.getItemRequestPath(item)}`
 }
+
+exports.isTeamDrive = (item) => {
+  return item.kind === 'drive#teamDrive'
+}

+ 3 - 1
packages/@uppy/companion/src/server/provider/drive/index.js

@@ -146,7 +146,9 @@ class Drive {
         thumbnail: uppy.buildURL(adapter.getItemThumbnailUrl(item), true),
         requestPath: adapter.getItemRequestPath(item),
         modifiedDate: adapter.getItemModifiedDate(item),
-        raw: item
+        custom: {
+          isTeamDrive: adapter.isTeamDrive(item)
+        }
       })
     })
 

+ 1 - 2
packages/@uppy/companion/src/server/provider/dropbox/index.js

@@ -146,8 +146,7 @@ class DropBox {
         id: adapter.getItemId(item),
         thumbnail: uppy.buildURL(adapter.getItemThumbnailUrl(item), true),
         requestPath: adapter.getItemRequestPath(item),
-        modifiedDate: adapter.getItemModifiedDate(item),
-        raw: item
+        modifiedDate: adapter.getItemModifiedDate(item)
       })
     })
 

+ 1 - 2
packages/@uppy/companion/src/server/provider/instagram/index.js

@@ -108,8 +108,7 @@ class Instagram {
         id: adapter.getItemId(item),
         thumbnail: adapter.getItemThumbnailUrl(item),
         requestPath: adapter.getItemRequestPath(item),
-        modifiedDate: adapter.getItemModifiedDate(item),
-        raw: item
+        modifiedDate: adapter.getItemModifiedDate(item)
       })
     })
 

+ 1 - 1
packages/@uppy/google-drive/src/DriveProviderViews.js

@@ -6,7 +6,7 @@ module.exports = class DriveProviderViews extends ProviderViews {
     e.preventDefault()
 
     // Team Drives aren't selectable; for all else, defer to the base ProviderView.
-    if (file.raw.kind !== 'drive#teamDrive') {
+    if (!file.custom.isTeamDrive) {
       super.toggleCheckbox(e, file)
     }
   }