contensis-cli 1.0.12-beta.0 → 1.0.12-beta.10

package/src/commands/import.ts

@@ -1,6 +1,11 @@
 import { Command, Option } from 'commander';
 import { cliCommand } from '~/services/ContensisCliService';
-import { commit, mapContensisOpts } from './globalOptions';
+import {
+  commit,
+  getEntryOptions,
+  ignoreErrors,
+  mapContensisOpts,
+} from './globalOptions';
 
 export const makeImportCommand = () => {
   const program = new Command()
@@ -94,13 +99,15 @@ Example call:
       );
     });
 
-  program
-    .command('entries')
-    .description('import entries')
-    .argument(
-      '[search phrase]',
-      'get entries with the search phrase, use quotes for multiple words'
-    )
+  getEntryOptions(
+    program
+      .command('entries')
+      .description('import entries')
+      .argument(
+        '[search phrase]',
+        'get entries with the search phrase, use quotes for multiple words'
+      )
+  )
     .addOption(commit)
     .option(
       '-preserve --preserve-guids',
@@ -114,6 +121,7 @@ Example call:
         .choices(['errors', 'changes', 'all'])
         .default('errors')
     )
+    .addOption(ignoreErrors)
     .addHelpText(
       'after',
       `
@@ -137,24 +145,44 @@ Example call:
   program
     .command('nodes')
     .description('import nodes')
+    .argument('[root]', 'import nodes from the specified path e.g. /blog', '/')
+    .option(
+      '-preserve --preserve-guids',
+      'include this flag when you are importing nodes that you have previously exported and wish to update'
+    )
+    .addOption(ignoreErrors)
     .addOption(commit)
+    .addOption(
+      new Option(
+        '-od --output-detail <outputDetail>',
+        'how much detail to output from the import'
+      )
+        .choices(['errors', 'changes', 'all'])
+        .default('errors')
+    )
+    .option(
+      '-ol --output-limit <outputLimit>',
+      'expand or limit the number of records output to the console',
+      '200'
+    )
     .addHelpText(
       'after',
       `
 Example call:
-  > import nodes --from-file component-backup.json
-  > import nodes --source-alias example-alias --source-project-id example-project
+  > import nodes /blog --source-alias example-alias --source-project-id example-project
+  > import nodes --from-file site-backup.json --preserve-guids
 `
     )
-    .action(async opts => {
+    .action(async (root: string, opts) => {
       await cliCommand(
         ['import', 'nodes'],
         opts,
-        mapContensisOpts({ ...opts })
+        mapContensisOpts({ paths: root.split(' '), ...opts })
       ).ImportNodes({
         commit: opts.commit,
         fromFile: opts.fromFile,
-        logOutput: opts.outputNodes,
+        logOutput: opts.outputDetail,
+        logLimit: Number(opts.outputLimit),
       });
     });
 

package/src/commands/index.ts

@@ -10,7 +10,6 @@ import { makeGetCommand } from './get';
 import {
   addAuthenticationOptions,
   addConnectOptions,
-  addGetEntryOptions,
   addGlobalOptions,
   addImportOptions,
 } from './globalOptions';
@@ -60,7 +59,7 @@ const commands = () => {
   );
   program.addCommand(
     addGlobalOptions(
-      addGetEntryOptions(addImportOptions(makeDiffCommand()))
+      addImportOptions(makeDiffCommand())
     ).copyInheritedSettings(program)
   );
   program.addCommand(
@@ -68,7 +67,7 @@ const commands = () => {
   );
   program.addCommand(
     addGlobalOptions(
-      addGetEntryOptions(addImportOptions(makeImportCommand()))
+      addImportOptions(makeImportCommand())
     ).copyInheritedSettings(program)
   );
   program.addCommand(

package/src/commands/list.ts

@@ -160,5 +160,20 @@ Example call:
         name ? [name] : id
       );
     });
+
+  list
+    .command('workflows')
+    .description('print list of workflow definitions')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > list workflows
+`
+    )
+    .action(async opts => {
+      await cliCommand(['list', 'workflows'], opts).PrintWorkflows();
+    });
+
   return list;
 };

package/src/commands/remove.ts

@@ -135,5 +135,25 @@ Example call:
       }
     });
 
+  remove
+    .command('nodes')
+    .description('delete nodes from the site view tree')
+    .argument('<root>', 'remove nodes from the specified path e.g. /blog or /')
+    .addOption(commit)
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > remove nodes /blog
+`
+    )
+    .action(async (root: string, opts) => {
+      await cliCommand(
+        ['remove', 'nodes', root],
+        opts,
+        mapContensisOpts({ paths: root.split(' '), ...opts })
+      ).RemoveNodes(opts.commit);
+    });
+
   return remove;
 };

package/src/localisation/en-GB.ts

@@ -158,8 +158,8 @@ export const LogMessages = {
     imported: (env: string, commit: boolean, count: number) =>
       `[${env}] ${commit ? `Imported` : `Will import`} ${count} nodes`,
     failedImport: (env: string) => `[${env}] Unable to import nodes`,
-    removed: (env: string, commit: boolean) =>
-      `[${env}] ${commit ? `Deleted` : `Will delete`} nodes`,
+    removed: (env: string, commit: boolean, root: string) =>
+      `[${env}] ${commit ? `Deleted` : `Will delete`} nodes at ${root}`,
     failedRemove: (env: string) => `[${env}] Unable to delete nodes`,
     notFound: (env: string) => `[${env}] Nodes were not found `,
     commitTip: () => `Add --commit flag to commit the previewed changes`,
@@ -432,6 +432,13 @@ export const LogMessages = {
         id
       )}`,
   },
+  workflows: {
+    list: (env: string) => `[${env}] Retrieved workflows`,
+    noList: (env: string) => `[${env}] Cannot retrieve workflows`,
+    noneExist: () => `No workflows found`,
+    failedGet: (env: string, name: string) =>
+      `[${env}] Unable to find workflow ${Logger.highlightText(name)}`,
+  },
   devinit: {
     intro: () => `Contensis developer environment initialisation`,
     //`This will initialise your local working directory to develop with the current connected Contensis project`,
@@ -444,7 +451,7 @@ export const LogMessages = {
     ) =>
       `
       Project: ${Logger.standardText(name)}
-      - Home: ${Logger.standardText(process.cwd())}
+      - Home: ${Logger.standardText(git.gitcwd())}
       - Repository: ${Logger.standardText(git.home)} 
       - Block id: ${Logger.highlightText(blockId)}
     

package/src/mappers/DevInit-to-CIWorkflow.ts

@@ -102,12 +102,10 @@ const mapGitLabCIWorkflowContent = async (
       alias: cli.currentEnv,
       project_id: cli.currentProject,
       client_id:
-        loc === 'env'
-          ? cli.devinit?.credentials.clientId
-          : '$CONTENSIS_CLIENT_ID',
+        loc === 'env' ? cli.deployCredentials.clientId : '$CONTENSIS_CLIENT_ID',
       shared_secret:
         loc === 'env'
-          ? cli.devinit?.credentials.clientSecret
+          ? cli.deployCredentials.clientSecret
           : '$CONTENSIS_SHARED_SECRET',
     },
   };
@@ -120,12 +118,12 @@ const mapGitLabCIWorkflowContent = async (
     setWorkflowElement(
       workflowDoc,
       `variables.CONTENSIS_CLIENT_ID`,
-      `${cli.devinit.credentials.clientId}`
+      `${cli.deployCredentials.clientId}`
     );
     setWorkflowElement(
       workflowDoc,
       `variables.CONTENSIS_CLIENT_SECRET`,
-      `${cli.devinit.credentials.clientSecret}`
+      `${cli.deployCredentials.clientSecret}`
     );
   }
 
@@ -298,12 +296,12 @@ const mapGitHubActionCIWorkflowContent = async (
     setWorkflowElement(
       workflowDoc,
       `env.CONTENSIS_CLIENT_ID`,
-      cli.devinit?.credentials.clientId
+      cli.deployCredentials.clientId
     );
     setWorkflowElement(
       workflowDoc,
       'env.CONTENSIS_SHARED_SECRET',
-      cli.devinit?.credentials.clientSecret
+      cli.deployCredentials.clientSecret
     );
   }
 

package/src/mappers/DevInit-to-RolePermissions.ts

@@ -1,6 +1,7 @@
 import { Role } from 'contensis-management-api/lib/models';
 
 export const devKeyPermissions = {} as Partial<Role['permissions']>;
+
 export const deployKeyPermissions = {
   blocks: { actions: ['push', 'release', 'view'] },
 } as Role['permissions'];

package/src/models/Cache.d.ts

@@ -19,7 +19,7 @@ type EnvironmentCache = {
 
 type CliCommand = {
   createdDate: string;
-  createdUserId: string;
+  invokedBy: string;
   commandText: string;
   result?: any;
 };

package/src/providers/file-provider.ts

@@ -11,7 +11,8 @@ export const appRootDir =
     : path.join(userHomeDir, '.contensis/');
 
 export const readJsonFile = <T>(filePath: string) => {
-  const file = readFile(filePath);
+  const directoryPath = cwdPath(filePath);
+  const file = readFile(directoryPath);
   if (file) return tryParse(file) as T | string;
   return undefined;
 };
@@ -81,3 +82,6 @@ export const checkDir = (filePath: string) => {
 
 export const localPath = (filePath: string) =>
   path.isAbsolute(filePath) ? filePath : path.join(appRootDir, filePath);
+
+export const cwdPath = (filePath: string) =>
+  path.isAbsolute(filePath) ? filePath : path.join(process.cwd(), filePath);

package/src/services/ContensisAuthService.ts

@@ -25,7 +25,15 @@ class ContensisAuthService {
       clientType: ClientGrantType;
       clientDetails: ClientGrants;
     };
-    if (username && password) {
+    if (clientId && clientSecret) {
+      credentials = {
+        clientType: 'client_credentials',
+        clientDetails: {
+          clientId,
+          clientSecret,
+        },
+      };
+    } else if (username && password) {
       credentials = {
         clientType: 'contensis_classic',
         clientDetails: {
@@ -41,13 +49,7 @@ class ContensisAuthService {
         },
       };
     } else {
-      credentials = {
-        clientType: 'client_credentials',
-        clientDetails: {
-          clientId,
-          clientSecret,
-        },
-      };
+      credentials = { clientType: 'none', clientDetails: { refreshToken: '' } };
     }
 
     this.client = NodejsClient.create({
@@ -57,7 +59,7 @@ class ContensisAuthService {
     });
   }
 
-  ClassicToken = async () => {
+  ClassicToken = async (): Promise<string | null | undefined> => {
     // make sure our token isn't expried.
     await this.client.ensureBearerToken();
     return (this.client as any).contensisClassicToken;