Added --publish flag to Drupal import. Fixed drupal import bugs. Adde…

…d link to folder after import completes. Fixed createSmartComponent function call using incorrect endpoint.
pantheon-systems · Aug 6, 2024 · 68da812 · 68da812
1 parent 436179d
commit 68da812
Show file tree

Hide file tree

Showing 5 changed files with 109 additions and 70 deletions.
diff --git a/.changeset/afraid-maps-smell.md b/.changeset/afraid-maps-smell.md
@@ -0,0 +1,7 @@
+---
+"@pantheon-systems/pcc-cli": patch
+---
+
+Added --publish flag to Drupal import. Fixed drupal import bugs. Added link to
+folder after import completes. Fixed createSmartComponent function call using
+incorrect endpoint.
diff --git a/packages/cli/src/cli/commands/import/common.ts b/packages/cli/src/cli/commands/import/common.ts
@@ -8,31 +8,38 @@ import AddOnApiHelper from "../../../lib/addonApiHelper";
 import { getLocalAuthDetails } from "../../../lib/localStorage";
 import { Logger } from "../../../lib/logger";
 
-export async function createFileOnDrive(
-  requestBody: Partial<drive_v3.Schema$File>,
-  body: string,
-) {
+export async function createFileOnDrive({
+  requestBody,
+  body,
+  drive,
+}: {
+  requestBody: Partial<drive_v3.Schema$File>;
+  body: string;
+  drive?: drive_v3.Drive;
+}) {
   const logger = new Logger();
 
-  // Check user has required permission to create drive file
-  await AddOnApiHelper.getIdToken([
-    "https://www.googleapis.com/auth/drive.file",
-  ]);
-  const authDetails = await getLocalAuthDetails();
-  if (!authDetails) {
-    logger.error(chalk.red(`ERROR: Failed to retrieve login details.`));
-    exit(1);
+  if (!drive) {
+    // Check user has required permission to create drive file
+    await AddOnApiHelper.getIdToken([
+      "https://www.googleapis.com/auth/drive.file",
+    ]);
+    const authDetails = await getLocalAuthDetails();
+    if (!authDetails) {
+      logger.error(chalk.red(`ERROR: Failed to retrieve login details.`));
+      exit(1);
+    }
+
+    const oauth2Client = new OAuth2Client();
+    oauth2Client.setCredentials(authDetails);
+    drive = google.drive({
+      version: "v3",
+      auth: oauth2Client,
+    });
   }
 
   // Create Google Doc
   const spinner = ora("Creating document on the Google Drive...").start();
-  const oauth2Client = new OAuth2Client();
-  oauth2Client.setCredentials(authDetails);
-  const drive = google.drive({
-    version: "v3",
-    auth: oauth2Client,
-  });
-
   const res = (await drive.files.create({
     requestBody: {
       ...requestBody,

diff --git a/packages/cli/src/cli/commands/import/drupal.ts b/packages/cli/src/cli/commands/import/drupal.ts
@@ -18,6 +18,7 @@ type DrupalImportParams = {
   baseUrl: string;
   siteId: string;
   verbose: boolean;
+  automaticallyPublish: boolean;
 };
 
 interface DrupalPost {
@@ -76,7 +77,12 @@ async function getDrupalPosts(url: string) {
 }
 
 export const importFromDrupal = errorHandler<DrupalImportParams>(
-  async ({ baseUrl, siteId, verbose }: DrupalImportParams) => {
+  async ({
+    baseUrl,
+    siteId,
+    verbose,
+    automaticallyPublish,
+  }: DrupalImportParams) => {
     const logger = new Logger();
 
     if (baseUrl) {
@@ -100,7 +106,7 @@ export const importFromDrupal = errorHandler<DrupalImportParams>(
       }
     }
 
-    await AddOnApiHelper.getIdToken([
+    const idToken = await AddOnApiHelper.getIdToken([
       "https://www.googleapis.com/auth/drive.file",
     ]);
 
@@ -118,11 +124,12 @@ export const importFromDrupal = errorHandler<DrupalImportParams>(
       auth: oauth2Client,
     });
 
+    const folderName = `PCC Import from Drupal on ${new Date().toLocaleDateString()} unique id: ${randomUUID()}`;
     const folderRes = (await drive.files
       .create({
         fields: "id,name",
         requestBody: {
-          name: `PCC Import from Drupal on ${new Date().toLocaleDateString()} unique id: ${randomUUID()}`,
+          name: folderName,
           mimeType: "application/vnd.google-apps.folder",
         },
       })
@@ -188,23 +195,24 @@ export const importFromDrupal = errorHandler<DrupalImportParams>(
 
         // Initially create a blank document, just to get an article id
         // that we can work with for further steps, such as adding smart components.
-        const { fileId, spinner, drive } = await createFileOnDrive(
-          {
+        const { fileId, spinner } = await createFileOnDrive({
+          requestBody: {
             name: post.attributes.title,
 
             parents: [folderId],
           },
-          "",
-        );
+          body: "",
+          drive,
+        });
         spinner.succeed();
 
         // Add it to the PCC site.
-        await AddOnApiHelper.getDocument(fileId, true);
+        await AddOnApiHelper.getDocument(fileId, true, undefined, idToken);
 
         // Set the document's content.
-        const res = (await drive.files.update({
+        (await drive.files.update({
+          fileId,
           requestBody: {
-            id: fileId,
             mimeType: "application/vnd.google-apps.document",
           },
           media: {
@@ -235,7 +243,9 @@ export const importFromDrupal = errorHandler<DrupalImportParams>(
             verbose,
           );
 
-          await AddOnApiHelper.publishDocument(fileId);
+          if (automaticallyPublish) {
+            await AddOnApiHelper.publishDocument(fileId);
+          }
         } catch (e) {
           console.error(e instanceof AxiosError ? e.response?.data : e);
           throw e;
@@ -248,7 +258,7 @@ export const importFromDrupal = errorHandler<DrupalImportParams>(
 
     logger.log(
       chalk.green(
-        `Successfully imported ${allPosts.length} documents into ${folderRes.data.name}`,
+        `Successfully imported ${allPosts.length} documents into ${folderName} (https://drive.google.com/drive/u/0/folders/${folderRes.data.id})`,
       ),
     );
   },

diff --git a/packages/cli/src/cli/index.ts b/packages/cli/src/cli/index.ts
@@ -666,13 +666,20 @@ yargs(hideBin(process.argv))
                 default: false,
                 demandOption: false,
               })
+              .option("publish", {
+                describe: "Automatically publish each imported article.",
+                type: "boolean",
+                default: false,
+                demandOption: false,
+              })
               .demandOption(["baseUrl", "siteId"]);
           },
           async (args) =>
             await importFromDrupal({
               baseUrl: args.baseUrl as string,
               siteId: args.siteId as string,
               verbose: args.verbose as boolean,
+              automaticallyPublish: args.publish as boolean,
             }),
         )
         .command(