Revert "[parents_migration] Add and backfill Google Drive "Shared wit…

…h me" fo…" (#9543) This reverts commit 5176705.
dust-tt · Dec 19, 2024 · 18bdec2 · 18bdec2
1 parent 5176705
commit 18bdec2
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 70 deletions.
diff --git a/connectors/migrations/20241218_backfill_gdrive_shared_with_me.ts b/connectors/migrations/20241218_backfill_gdrive_shared_with_me.ts
diff --git a/connectors/src/connectors/google_drive/index.ts b/connectors/src/connectors/google_drive/index.ts
@@ -409,7 +409,7 @@ export class GoogleDriveConnectorManager extends BaseConnectorManager<null> {
         // that are not living in a shared drive.
         nodes.push({
           provider: c.type,
-          internalId: getInternalId(GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID),
+          internalId: GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID,
           parentInternalId: null,
           type: "folder" as const,
           preventSelection: true,
@@ -435,10 +435,7 @@ export class GoogleDriveConnectorManager extends BaseConnectorManager<null> {
         // The "Shared with me" view requires to look for folders
         // with the flag `sharedWithMe=true`, but there is no need to check for the parents.
         let gdriveQuery = `mimeType='application/vnd.google-apps.folder'`;
-        if (
-          parentInternalId ===
-          getInternalId(GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID)
-        ) {
+        if (parentInternalId === GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID) {
           gdriveQuery += ` and sharedWithMe=true`;
         } else {
           gdriveQuery += ` and '${parentDriveId}' in parents`;

diff --git a/connectors/src/connectors/google_drive/temporal/activities.ts b/connectors/src/connectors/google_drive/temporal/activities.ts
@@ -7,10 +7,7 @@ import StatsD from "hot-shots";
 import PQueue from "p-queue";
 import { Op } from "sequelize";
 
-import {
-  GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID,
-  GOOGLE_DRIVE_USER_SPACE_VIRTUAL_DRIVE_ID,
-} from "@connectors/connectors/google_drive/lib/consts";
+import { GOOGLE_DRIVE_USER_SPACE_VIRTUAL_DRIVE_ID } from "@connectors/connectors/google_drive/lib/consts";
 import { getGoogleDriveObject } from "@connectors/connectors/google_drive/lib/google_drive_api";
 import { getFileParentsMemoized } from "@connectors/connectors/google_drive/lib/hierarchy";
 import { syncOneFile } from "@connectors/connectors/google_drive/temporal/file";
@@ -57,26 +54,6 @@ type LightGoogleDrive = {
 
 export const statsDClient = new StatsD();
 
-/**
- *  Upserts to data_sources_folders (core) a top-level folder "Shared with me".
- */
-export async function upsertSharedWithMeFolder(connectorId: ModelId) {
-  const connector = await ConnectorResource.fetchById(connectorId);
-  if (!connector) {
-    throw new Error(`Connector ${connectorId} not found`);
-  }
-
-  const folderId = getInternalId(GOOGLE_DRIVE_SHARED_WITH_ME_VIRTUAL_ID);
-  await upsertDataSourceFolder({
-    dataSourceConfig: dataSourceConfigFromConnector(connector),
-    folderId,
-    parents: [folderId],
-    parentId: null,
-    title: "Shared with me",
-    mimeType: "application/vnd.dust.googledrive.folder",
-  });
-}
-
 export async function getDrives(
   connectorId: ModelId
 ): Promise<LightGoogleDrive[]> {

diff --git a/connectors/src/connectors/google_drive/temporal/workflows.ts b/connectors/src/connectors/google_drive/temporal/workflows.ts
@@ -25,7 +25,6 @@ const {
   garbageCollectorFinished,
   markFolderAsVisited,
   shouldGarbageCollect,
-  upsertSharedWithMeFolder,
 } = proxyActivities<typeof activities>({
   startToCloseTimeout: "20 minutes",
 });
@@ -105,8 +104,6 @@ export async function googleDriveFullSync({
     }
   });
 
-  await upsertSharedWithMeFolder(connectorId);
-
   // Temp to clean up the running workflows state
   foldersToBrowse = uniq(foldersToBrowse);
 

diff --git a/connectors/src/resources/connector/google_drive.ts b/connectors/src/resources/connector/google_drive.ts
@@ -3,9 +3,11 @@ import type { Transaction } from "sequelize";
 
 import {
   GoogleDriveConfig,
+  GoogleDriveSheet,
+} from "@connectors/lib/models/google_drive";
+import {
   GoogleDriveFiles,
   GoogleDriveFolders,
-  GoogleDriveSheet,
   GoogleDriveSyncToken,
 } from "@connectors/lib/models/google_drive";
 import type {