Team drive support

src/components/modals/providers/GoogleDrivePublishModal.vue

@@ -8,7 +8,7 @@
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If no folder ID is supplied, the file will be created in your root folder.
+          If not supplied, the file will be created in your Drive root folder.
         </div>
         <div class="form-entry__actions">
           <a href="javascript:void(0)" @click="openFolder">Choose folder</a>

src/components/modals/providers/GoogleDriveSaveModal.vue

@@ -8,7 +8,7 @@
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If no folder ID is supplied, the file will be created in your root folder.
+          If not supplied, the file will be created in your Drive root folder.
         </div>
         <div class="form-entry__actions">
           <a href="javascript:void(0)" @click="openFolder">Choose folder</a>

src/components/modals/providers/GoogleDriveWorkspaceModal.vue

@@ -8,7 +8,7 @@
       <form-entry label="Folder ID" info="optional">
         <input slot="field" class="textfield" type="text" v-model.trim="folderId" @keydown.enter="resolve()">
         <div class="form-entry__info">
-          If no folder ID is supplied, a new workspace folder will be created in your root folder.
+          If not supplied, a new workspace folder will be created in your Drive root folder.
         </div>
         <div class="form-entry__actions">
           <a href="javascript:void(0)" @click="openFolder">Choose folder</a>

src/services/providers/googleDriveWorkspaceProvider.js

@@ -101,6 +101,7 @@ export default providerRegistry.register({
             providerId: this.id,
             url: location.href,
             folderId: folder.id,
+            teamDriveId: folder.teamDriveId,
             dataFolderId: properties.dataFolderId,
             trashFolderId: properties.trashFolderId,
           },
@@ -223,7 +224,7 @@ export default providerRegistry.register({
     const workspace = store.getters['workspace/currentWorkspace'];
     const syncToken = store.getters['workspace/syncToken'];
     const startPageToken = store.getters['data/localSettings'].syncStartPageToken;
-    return googleHelper.getChanges(syncToken, startPageToken, false)
+    return googleHelper.getChanges(syncToken, startPageToken, false, workspace.teamDriveId)
       .then((result) => {
         // Collect possible parent IDs
         const parentIds = {};

src/services/providers/helpers/googleHelper.js

@@ -159,7 +159,6 @@ export default {
             pageToken,
             pageSize: 1000,
             fields: 'nextPageToken,revisions(id,modifiedTime,lastModifyingUser/permissionId,lastModifyingUser/displayName,lastModifyingUser/photoLink)',
-            supportsTeamDrives: true,
           },
         })
           .then((res) => {
@@ -186,9 +185,6 @@ export default {
         method: 'GET',
         url: `https://www.googleapis.com/drive/v3/files/${fileId}/revisions/${revisionId}?alt=media`,
         raw: true,
-        params: {
-          supportsTeamDrives: true,
-        },
       }).then(res => res.body));
   },
   getUser(userId) {
@@ -368,7 +364,7 @@ export default {
   addPhotosAccount() {
     return this.startOauth2(photosScopes);
   },
-  getChanges(token, startPageToken, isAppData) {
+  getChanges(token, startPageToken, isAppData, teamDriveId = null) {
     const result = {
       changes: [],
     };
@@ -387,7 +383,8 @@ export default {
             pageSize: 1000,
             fields: `nextPageToken,newStartPageToken,changes(fileId,${fileFields})`,
             supportsTeamDrives: true,
-            includeTeamDriveItems: true,
+            includeTeamDriveItems: !!teamDriveId,
+            teamDriveId,
           },
         })
           .then((res) => {
@@ -434,7 +431,7 @@ export default {
         method: 'GET',
         url: `https://www.googleapis.com/drive/v3/files/${id}`,
         params: {
-          fields: 'id,name,mimeType,appProperties',
+          fields: 'id,name,mimeType,appProperties,teamDriveId',
           supportsTeamDrives: true,
         },
       })
@@ -563,45 +560,36 @@ export default {
         switch (type) {
           default:
           case 'doc': {
-            const addView = (hasRootParent) => {
+            const mimeTypes = [
-              const view = new google.picker.DocsView(google.picker.ViewId.DOCS);
-              if (hasRootParent) {
-                view.setParent('root');
-              }
-              view.setMimeTypes([
               'text/plain',
               'text/x-markdown',
               'application/octet-stream',
-              ].join(','));
+            ].join(',');
+
+            const view = new google.picker.DocsView(google.picker.ViewId.DOCS);
+            view.setMimeTypes(mimeTypes);
             pickerBuilder.addView(view);
-            };
+
+            const teamDriveView = new google.picker.DocsView(google.picker.ViewId.DOCS);
+            teamDriveView.setMimeTypes(mimeTypes);
+            teamDriveView.setEnableTeamDrives(true);
+            pickerBuilder.addView(teamDriveView);
+
             pickerBuilder.enableFeature(google.picker.Feature.MULTISELECT_ENABLED);
-            addView(false);
+            pickerBuilder.enableFeature(google.picker.Feature.SUPPORT_TEAM_DRIVES);
-            // addView(true);
             break;
           }
           case 'folder': {
-            const addView = (hasRootParent) => {
+            const folderView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
+            folderView.setSelectFolderEnabled(true);
+            folderView.setMimeTypes(this.folderMimeType);
+            pickerBuilder.addView(folderView);
+
             const teamDriveView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
-              if (hasRootParent) {
-                teamDriveView.setParent('root');
-              }
             teamDriveView.setSelectFolderEnabled(true);
             teamDriveView.setEnableTeamDrives(true);
             teamDriveView.setMimeTypes(this.folderMimeType);
-
-              const folderView = new google.picker.DocsView(google.picker.ViewId.FOLDERS);
-              if (hasRootParent) {
-                folderView.setParent('root');
-              }
-              folderView.setSelectFolderEnabled(true);
-              folderView.setMimeTypes(this.folderMimeType);
-
             pickerBuilder.addView(teamDriveView);
-              pickerBuilder.addView(folderView);
-            };
-            addView(false);
-            // addView(true);
             break;
           }
           case 'img': {