contensis-cli 1.0.12-beta.1 → 1.0.12-beta.11

package/src/services/ContensisCliService.ts

@@ -6,18 +6,17 @@ import fetch from 'node-fetch';
 import path from 'path';
 
 import { Component, ContentType, Project } from 'contensis-core-api';
-import { Node } from 'contensis-delivery-api/lib/models';
 import { Entry, Role } from 'contensis-management-api/lib/models';
 import {
   ContensisMigrationService,
   MigrateRequest,
   PushBlockParams,
   SourceCms,
-  logEntriesTable,
   ContentTypesResult,
   Model,
   MigrateModelsResult,
   BlockActionType,
+  logEntitiesTable,
 } from 'migratortron';
 
 import ContensisAuthService from './ContensisAuthService';
@@ -39,9 +38,11 @@ import {
 } from '~/util';
 import {
   printBlockVersion,
-  printMigrateResult,
+  printEntriesMigrateResult,
   printModelMigrationAnalysis,
   printModelMigrationResult,
+  printNodeTreeOutput,
+  printNodesMigrateResult,
 } from '~/util/console.printer';
 import { csvFormatter } from '~/util/csv.formatter';
 import { xmlFormatter } from '~/util/xml.formatter';
@@ -62,23 +63,16 @@ class ContensisCli {
     process.exit(exitCode);
   };
 
-  private command: CliCommand;
   private format?: OutputFormat;
   private output?: string;
   private session: SessionCacheProvider;
-
+  
+  auth?: ContensisAuthService;
+  command: CliCommand;
   contensis?: ContensisMigrationService;
   contensisOpts: Partial<MigrateRequest>;
   currentProject: string;
 
-  devinit!: {
-    invokedBy: string;
-    credentials: {
-      clientId: string;
-      clientSecret: string;
-    };
-  };
-
   sourceAlias?: string;
   targetEnv?: string;
   urls:
@@ -98,10 +92,6 @@ class ContensisCli {
   noun: string;
   thirdArg: string;
 
-  get invokedBy() {
-    return this.command.createdUserId;
-  }
-
   get cache() {
     return this.session.Get();
   }
@@ -131,11 +121,6 @@ class ContensisCli {
     }
   }
 
-  constructor(
-    args: string[],
-    outputOpts?: OutputOptionsConstructorArg,
-    contensisOpts?: Partial<MigrateRequest>
-  );
   constructor(
     args: string[],
     outputOpts?: OutputOptionsConstructorArg,
@@ -163,15 +148,19 @@ class ContensisCli {
     const environments = this.cache.environments || {};
     this.currentEnv = currentEnvironment;
 
+    // Set env from command options
     const env = this.env;
-
     if (outputOpts?.projectId) env.currentProject = outputOpts.projectId;
     if (outputOpts?.user) env.lastUserId = outputOpts.user;
     // setting this in env means passwordFallback is written to environments.json
     if (outputOpts?.password) env.passwordFallback = outputOpts.password;
     if (outputOpts?.clientId) env.lastUserId = outputOpts.clientId;
     if (outputOpts?.sharedSecret)
-      env.passwordFallback = outputOpts.sharedSecret;
+      if (outputOpts.sharedSecret.startsWith('-'))
+        throw new Error(
+          `Shared secret option provided a value of ${outputOpts.sharedSecret}`
+        );
+      else env.passwordFallback = outputOpts.sharedSecret;
 
     this.currentProject = env?.currentProject || 'null';
     this.sourceAlias = outputOpts?.sourceAlias || currentEnvironment;
@@ -183,7 +172,7 @@ class ContensisCli {
     this.command = {
       commandText,
       createdDate: new Date().toISOString(),
-      createdUserId: env?.lastUserId,
+      invokedBy: env?.lastUserId,
     };
 
     if (currentEnvironment) {
@@ -423,7 +412,10 @@ class ContensisCli {
 
       if (credentialError && !credentials.current) {
         // Log problem with Credential Provider
-        log.error(credentialError as any);
+        log.error(
+          `Unable to find credentials for user ${userId} at ${currentEnv}`,
+          credentialError as any
+        );
         return;
       }
 
@@ -491,7 +483,7 @@ class ContensisCli {
           }
 
           if (inputPassword || cachedPassword || cachedSecret) {
-            const authService = new ContensisAuthService({
+            this.auth = new ContensisAuthService({
               username: userId,
               password: inputPassword || cachedPassword,
               projectId: env?.currentProject || 'website',
@@ -500,9 +492,7 @@ class ContensisCli {
               clientSecret: sharedSecret || cachedSecret,
             });
 
-            const [authError, bearerToken] = await to(
-              authService.BearerToken()
-            );
+            const [authError, bearerToken] = await to(this.auth.BearerToken());
 
             // Login successful
             if (bearerToken) {
@@ -783,7 +773,7 @@ class ContensisCli {
     }
   };
 
-  CreateApiKey = async (name: string, description?: string) => {
+  CreateApiKey = async (name: string, description = '') => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
 
@@ -897,9 +887,9 @@ class ContensisCli {
                 )}: ${permissions.contentTypes
                   .map(
                     p =>
-                      `${p.id} [${p.actions.join(',')}] ${p.languages.join(
-                        ' '
-                      )}`
+                      `${p.id} [${p.actions.join(',')}] ${(
+                        p as any
+                      ).languages.join(' ')}`
                   )
                   .join(', ')}`
               );
@@ -1037,6 +1027,98 @@ class ContensisCli {
     }
   };
 
+  PrintWorkflows = async () => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve workflows list for env
+      const [workflowsErr, workflows] =
+        await contensis.content.sourceRepo.workflows.GetWorkflows();
+
+      if (Array.isArray(workflows)) {
+        log.success(messages.workflows.list(currentEnv));
+
+        if (!workflows.length) log.help(messages.workflows.noneExist());
+
+        const stringFromLanguageObject = (o: { [lang: string]: string }) =>
+          Object.values(o || {})?.[0];
+
+        this.HandleFormattingAndOutput(workflows, () => {
+          // print the workflows to console
+          // log.object(workflows);
+          for (const {
+            id,
+            name,
+            description,
+            states,
+            eventGroups,
+            isSystem,
+          } of workflows as any) {
+            const color = isSystem ? (s: string) => s : log.infoText;
+
+            console.log(
+              color(
+                `  - ${chalk.bold(
+                  stringFromLanguageObject(name)
+                )} ${log.infoText(id)}`
+              )
+            );
+            if (description)
+              console.log(
+                log.infoText(`    ${stringFromLanguageObject(description)}`)
+              );
+            if (isSystem === false)
+              console.log(`      ${chalk.bold.grey('isSystem')}: false`);
+            if (states?.length)
+              console.log(
+                `      ${chalk.bold.grey('states')}: ${states
+                  .map((state: any) => state.id)
+                  .join(', ')}`
+              );
+            if (eventGroups?.length)
+              console.log(
+                `      ${chalk.bold.grey('eventGroups')}: ${eventGroups
+                  .map((evtGrp: any) => evtGrp.id)
+                  .join(', ')}`
+              );
+          }
+        });
+      }
+
+      if (workflowsErr) {
+        log.error(messages.workflows.noList(currentEnv));
+        log.error(jsonFormatter(workflowsErr));
+      }
+    }
+  };
+
+  PrintWorkflow = async (workflowNameOrId: string) => {
+    const { currentEnv, log, messages } = this;
+    const contensis = await this.ConnectContensis();
+
+    if (contensis) {
+      // Retrieve workflows list for env
+      const [workflowsErr, workflows] =
+        await contensis.content.sourceRepo.workflows.GetWorkflows();
+
+      if (Array.isArray(workflows)) {
+        log.success(messages.workflows.list(currentEnv));
+
+        const workflow = findByIdOrName(workflows, workflowNameOrId);
+
+        if (workflow) this.HandleFormattingAndOutput(workflow, log.object);
+        else
+          log.error(messages.workflows.failedGet(currentEnv, workflowNameOrId));
+      }
+
+      if (workflowsErr) {
+        log.error(messages.workflows.noList(currentEnv));
+        log.error(jsonFormatter(workflowsErr));
+      }
+    }
+  };
+
   CreateProject = async (project: Project) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();
@@ -1304,7 +1386,7 @@ class ContensisCli {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(contentTypeIds);
@@ -1481,7 +1563,7 @@ class ContensisCli {
     const { currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
     if (contensis) {
       const [err, result] = await contensis.DeleteContentTypes(
@@ -1567,7 +1649,7 @@ class ContensisCli {
     const { currentEnv, currentProject, log, messages } = this;
     const contensis = await this.ConnectContensisImport({
       commit,
-      importDataType: 'user-input',
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
     });
 
     if (contensis) {
@@ -1580,9 +1662,9 @@ class ContensisCli {
       if (result)
         this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
-          printMigrateResult(this, result, {
+          printEntriesMigrateResult(this, result, {
             action: 'delete',
-            showAllEntries: true,
+            showAll: true,
           });
         });
       if (
@@ -1597,7 +1679,7 @@ class ContensisCli {
         }
       } else {
         log.error(messages.entries.failedRemove(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!result?.entriesToMigrate?.[currentProject]?.totalCount)
           log.help(messages.entries.notFound(currentEnv));
       }
     }
@@ -1616,11 +1698,11 @@ class ContensisCli {
       const entries = await contensis.GetEntries({ withDependents });
       this.HandleFormattingAndOutput(entries, () =>
         // print the entries to console
-        logEntriesTable(
+        logEntitiesTable({
           entries,
-          currentProject,
-          contensis.payload.query?.fields
-        )
+          projectId: currentProject,
+          fields: contensis.payload.query?.fields,
+        })
       );
     } else {
       log.warning(messages.models.noList(currentProject));
@@ -1659,9 +1741,9 @@ class ContensisCli {
       else
         this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
-          printMigrateResult(this, result, {
-            showAllEntries: logOutput === 'all',
-            showChangedEntries: logOutput === 'changes',
+          printEntriesMigrateResult(this, result, {
+            showAll: logOutput === 'all',
+            showChanged: logOutput === 'changes',
           });
         });
 
@@ -1688,7 +1770,7 @@ class ContensisCli {
         }
       } else {
         log.error(messages.entries.failedImport(currentEnv), err);
-        if (!result.entriesToMigrate[currentProject].totalCount)
+        if (!result?.entriesToMigrate?.[currentProject]?.totalCount)
           log.help(messages.entries.notFound(currentEnv));
       }
     } else {
@@ -1703,52 +1785,19 @@ class ContensisCli {
 
     if (contensis) {
       log.line();
-      const [err] = await to(
-        contensis.content.sourceRepo.nodes.GetNodes(rootPath, depth)
-      );
+      const [err, nodes] = await to(contensis.nodes.GetNodes(rootPath, depth));
       if (err) {
         log.error(messages.nodes.failedGet(currentProject), err);
         return;
       }
-      const root = contensis.content.sourceRepo.nodes.tree;
+      const root = contensis.nodes.sourceRepo.nodes.tree;
 
       log.success(messages.nodes.get(currentProject, rootPath, depth));
 
-      const outputNode = (node: Node | any, spaces: string) =>
-        `${node.entry ? log.highlightText('e') : log.infoText('-')}${
-          node.isCanonical ? log.highlightText('c') : log.infoText('-')
-        }${
-          node.includeInMenu ? log.highlightText('m') : log.infoText('-')
-        }${spaces}${
-          node.isCanonical ? log.boldText(`/${node.slug}`) : `/${node.slug}`
-        }${node.entry ? ` ${log.helpText(node.entry.sys.contentTypeId)}` : ''}${
-          node.childCount ? ` +${node.childCount}` : ``
-        } ${log.infoText(node.displayName)}`;
-
-      this.HandleFormattingAndOutput(root, () => {
+      this.HandleFormattingAndOutput(nodes, () => {
         // print the nodes to console
-        log.object({ ...root, children: undefined });
-        log.raw('');
-        log.info(
-          `${log.highlightText('e')} = has entry; ${log.highlightText(
-            'c'
-          )} = canonical; ${log.highlightText('m')} = include in menu`
-        );
-        log.line();
-        const outputChildren = (root: Node | undefined, depth = 2) => {
-          let str = '';
-          for (const node of (root as any)?.children as Node[]) {
-            str += `${outputNode(node, Array(depth + 1).join('  '))}\n`;
-            if ('children' in node) str += outputChildren(node, depth + 1);
-          }
-          return str;
-        };
-
-        const children = outputChildren(root);
-        log.limits(
-          `${outputNode(root, '  ')}${children ? `\n${children}` : ''}`,
-          100
-        );
+        log.object({ ...root, children: undefined, language: undefined });
+        printNodeTreeOutput(this, root);
       });
     } else {
       log.warning(messages.models.noList(currentProject));
@@ -1760,10 +1809,12 @@ class ContensisCli {
     commit,
     fromFile,
     logOutput,
+    logLimit,
   }: {
     commit: boolean;
     fromFile: string;
     logOutput: string;
+    logLimit: number;
   }) => {
     const { currentEnv, currentProject, log, messages } = this;
 
@@ -1782,28 +1833,34 @@ class ContensisCli {
       }
 
       const [err, result] = await contensis.MigrateNodes();
+      const migrateTree =
+        contensis.nodes.targetRepos[currentProject].nodes.migrateNodesTreeView;
 
-      if (err) logError(err);
+      if (err) log.raw(``);
       else
         this.HandleFormattingAndOutput(result, () => {
           // print the migrateResult to console
-          // TODO: fix
-          printMigrateResult(this, result, {
-            showAllEntries: logOutput === 'all',
-            showChangedEntries: logOutput === 'changes',
+          printNodeTreeOutput(this, migrateTree, logOutput, logLimit);
+          printNodesMigrateResult(this, result, {
+            showAll: logOutput === 'all',
+            showChanged: logOutput === 'changes',
           });
         });
 
-      const nodesTotalCount = result?.nodesToMigrate[currentProject].totalCount;
+      const nodesMigrateCount =
+        result?.nodesToMigrate?.[currentProject].totalCount;
       const nodesCreated = result?.nodesResult?.['created'] || 0;
       const nodesUpdated = result?.nodesResult?.['updated'] || 0;
-      const noChange = result.nodesToMigrate[currentProject]['no change'] !== 0;
+      const nodesErrored = result?.nodesResult?.['errors'] || 0;
+      const noChanges =
+        result?.nodesToMigrate?.[currentProject]['no change'] &&
+        nodesMigrateCount === 0;
 
       if (
         !err &&
-        !result.errors?.length &&
-        ((!commit && nodesTotalCount) ||
-          (commit && (nodesCreated || nodesUpdated)))
+        (!result.errors?.length || this.contensisOpts.ignoreErrors) &&
+        ((!commit && nodesMigrateCount) ||
+          (commit && (nodesCreated || nodesUpdated || result.errors?.length)))
       ) {
         let totalCount: number;
         if (commit) {
@@ -1813,20 +1870,20 @@ class ContensisCli {
           totalCount = created + updated;
         } else {
           totalCount =
-            typeof nodesTotalCount === 'number' ? nodesTotalCount : 0;
+            typeof nodesMigrateCount === 'number' ? nodesMigrateCount : 0;
         }
 
         log.success(messages.nodes.imported(currentEnv, commit, totalCount));
+        log.raw(``);
         if (!commit) {
-          log.raw(``);
           log.help(messages.nodes.commitTip());
         }
       } else {
-        if (noChange) {
-          log.help(messages.nodes.noChange(currentEnv), err);
+        if (noChanges && !err && !nodesErrored) {
+          log.help(messages.nodes.noChange(currentEnv));
         } else {
           log.error(messages.nodes.failedImport(currentEnv), err);
-          if (!nodesTotalCount) log.help(messages.nodes.notFound(currentEnv));
+          if (!nodesMigrateCount) log.help(messages.nodes.notFound(currentEnv));
         }
       }
     } else {
@@ -1835,6 +1892,54 @@ class ContensisCli {
     }
   };
 
+  RemoveNodes = async (commit = false) => {
+    const { currentEnv, currentProject, log, messages } = this;
+    const contensis = await this.ConnectContensisImport({
+      commit,
+      importDataType: 'user-input', // 'user-input' import type does not require a source cms
+    });
+
+    if (contensis) {
+      if (contensis.isPreview) {
+        console.log(log.successText(` -- PREVIEW -- `));
+      } else {
+        console.log(log.warningText(` *** COMMITTING DELETE *** `));
+      }
+      const [err, result] = await contensis.DeleteNodes();
+      if (result) {
+        this.HandleFormattingAndOutput(result, () => {
+          // print the migrateResult to console
+          printNodeTreeOutput(
+            this,
+            contensis.nodes.targetRepos[currentProject].nodes
+              .migrateNodesTreeView
+          );
+          // printNodesMigrateResult(this, result, {
+          //   action: 'delete',
+          //   showAll: true,
+          // });
+        });
+      }
+      if (
+        !err &&
+        ((!commit && result.nodesToMigrate[currentProject].totalCount) ||
+          (commit && result.nodesResult?.deleted))
+      ) {
+        log.success(
+          messages.nodes.removed(currentEnv, commit, contensis.nodes.rootPath)
+        );
+        log.raw(``);
+        if (!commit) {
+          log.help(messages.nodes.commitTip());
+        }
+      } else {
+        log.error(messages.nodes.failedRemove(currentEnv), err);
+        if (!result?.nodesToMigrate?.[currentProject]?.totalCount)
+          log.help(messages.nodes.notFound(currentEnv));
+      }
+    }
+  };
+
   PrintWebhookSubscriptions = async (subscriptionIdsOrNames?: string[]) => {
     const { currentEnv, log, messages } = this;
     const contensis = await this.ConnectContensis();