contensis-cli 1.0.0-beta.38 → 1.0.0-beta.40

package/src/commands/list.ts

@@ -1,20 +1,16 @@
 import { Command } from 'commander';
 import { cliCommand } from '~/services/ContensisCliService';
 
-// projects
-// content types
-// components
-// api keys
-// roles
-// webhooks
 export const makeListCommand = () => {
   const list = new Command()
     .command('list')
+    .addHelpText('after', `\n`)
     .showHelpAfterError(true)
     .exitOverride();
 
   list
     .command('envs')
+    .description('List all previously connected environments')
     .addHelpText(
       'after',
       `
@@ -25,11 +21,31 @@ Example call:
     .action(opts => {
       cliCommand(['list', 'envs'], opts).PrintEnvironments();
     });
-  list.command('projects').action(async opts => {
-    await cliCommand(['list', 'projects'], opts).PrintProjects();
-  });
+
+  list
+    .command('projects')
+    .description('Print list of projects')
+    .action(async opts => {
+      await cliCommand(['list', 'projects'], opts).PrintProjects();
+    });
+
+  list
+    .command('models')
+    .description('Print list of content models')
+    .addHelpText(
+      'after',
+      `
+Example call:
+  > list models
+`
+    )
+    .action(async opts => {
+      await cliCommand(['list', 'models'], opts).PrintContentModels();
+    });
+
   list
     .command('contenttypes')
+    .description('Print list of content types')
     .addHelpText(
       'after',
       `
@@ -40,8 +56,10 @@ Example call:
     .action(async opts => {
       await cliCommand(['list', 'contenttypes'], opts).PrintContentTypes();
     });
+
   list
     .command('components')
+    .description('Print list of components')
     .addHelpText(
       'after',
       `
@@ -52,8 +70,10 @@ Example call:
     .action(async opts => {
       await cliCommand(['list', 'components'], opts).PrintComponents();
     });
+
   list
     .command('blocks')
+    .description('Print list of content blocks')
     .addHelpText(
       'after',
       `
@@ -64,8 +84,10 @@ Example call:
     .action(async opts => {
       await cliCommand(['list', 'blocks'], opts).PrintBlocks();
     });
+
   list
     .command('keys')
+    .description('Print list of API keys')
     .addHelpText(
       'after',
       `
@@ -76,10 +98,13 @@ Example call:
     .action(async opts => {
       await cliCommand(['list', 'keys'], opts).PrintApiKeys();
     });
+
   list
     .command('webhooks')
+    .description('Print list of webhooks')
     .argument('[name]', 'find webhooks matching the supplied name')
     .option('-i --id <id...>', 'the subscription id(s) to get')
+    .addHelpText('after', `\n`)
     .action(async (name?: string, { id, ...opts }: any = {}) => {
       await cliCommand(['list', 'webhooks'], opts).PrintWebhookSubscriptions(
         id,

package/src/commands/push.ts

@@ -6,6 +6,7 @@ import { cliCommand } from '~/services/ContensisCliService';
 export const makePushCommand = () => {
   const push = new Command()
     .command('push')
+    .addHelpText('after', `\n`)
     .showHelpAfterError(true)
     .exitOverride();
 

package/src/commands/release.ts

@@ -4,6 +4,7 @@ import { cliCommand } from '~/services/ContensisCliService';
 export const makeReleaseCommand = () => {
   const release = new Command()
     .command('release')
+    .addHelpText('after', `\n`)
     .showHelpAfterError(true)
     .exitOverride();
 

package/src/commands/remove.ts

@@ -6,6 +6,7 @@ import { commit, mapContensisOpts } from './globalOptions';
 export const makeRemoveCommand = () => {
   const remove = new Command()
     .command('remove')
+    .addHelpText('after', `\n`)
     .showHelpAfterError(true)
     .exitOverride();
 
@@ -13,6 +14,7 @@ export const makeRemoveCommand = () => {
     .command('project')
     .argument('<projectId>', 'the project id to delete')
     .usage('<projectId>')
+    .addHelpText('after', `\n`)
     .action(async (projectId, opts) => {
       const project = await cliCommand(
         ['remove', 'project', projectId],
@@ -49,7 +51,7 @@ Example call:
     )
     .action(async (id: string[], opts) => {
       await cliCommand(
-        ['remove', 'components', id.join(', ')],
+        ['remove', 'components', id.join(' ')],
         opts
       ).RemoveComponents(id, opts.commit);
     });
@@ -68,7 +70,7 @@ Example call:
     )
     .action(async (id: string[], opts) => {
       await cliCommand(
-        ['remove', 'contenttypes', id.join(', ')],
+        ['remove', 'contenttypes', id.join(' ')],
         opts
       ).RemoveContentTypes(id, opts.commit);
     });

package/src/commands/set.ts

@@ -5,12 +5,14 @@ import { shell } from '~/shell';
 export const makeSetCommand = () => {
   const set = new Command()
     .command('set')
+    .addHelpText('after', `\n`)
     .showHelpAfterError(true)
     .exitOverride();
   set
     .command('project')
     .argument('<projectId>', 'the project id to work with')
     .usage('<projectId>')
+    .addHelpText('after', `\n`)
     .action(async projectId => {
       const project = cliCommand(['set', 'project', projectId]).SetProject(
         projectId
@@ -25,6 +27,7 @@ export const makeSetCommand = () => {
         .default('latest')
     )
     .usage('<latest/published>')
+    .addHelpText('after', `\n`)
     .action(async versionStatus => {
       const success = cliCommand(['set', 'version', versionStatus]).SetVersion(
         versionStatus

package/src/localisation/en-GB.ts

@@ -1,4 +1,8 @@
-import { BlockRunningStatus, MigrateStatus } from 'migratortron';
+import {
+  BlockRunningStatus,
+  MigrateModelsResult,
+  MigrateStatus,
+} from 'migratortron';
 import { Logger } from '~/util/logger';
 
 export const LogMessages = {
@@ -94,16 +98,56 @@ export const LogMessages = {
     tip: () =>
       `You need to set your current working project with "set project {projectId}"`,
   },
+  migrate: {
+    models: {
+      result: (
+        status: keyof MigrateModelsResult['project']['contentTypes']
+      ) => {
+        switch (status) {
+          case 'created':
+          case 'updated':
+            return Logger.successText;
+          case 'errors':
+            return Logger.errorText;
+          default:
+            return Logger.infoText;
+        }
+      },
+    },
+    status: (status: MigrateStatus) => {
+      switch (status) {
+        case 'no change':
+          return Logger.successText;
+        case 'create':
+        case 'two-pass':
+        case 'update':
+        case 'delete':
+          return Logger.warningText;
+        case 'error':
+        case 'not found':
+          return Logger.errorText;
+        default:
+          return Logger.infoText;
+      }
+    },
+  },
+  models: {
+    list: (projectId: string) => `Content models in "${projectId}":`,
+    noList: (projectId: string) =>
+      `[${projectId}] Cannot retrieve content models`,
+    get: (projectId: string, id: string) =>
+      `[${projectId}] Content models ${Logger.infoText(`[ ${id} ]`)}`,
+    failedGet: (projectId: string, id: string) =>
+      `[${projectId}] Unable to get content models "${id}"`,
+  },
   contenttypes: {
     list: (projectId: string) => `Content types in "${projectId}":`,
-    noList: (projectId: string) =>
-      `[${projectId}] Cannot retrieve content types list`,
-    get: (projectId: string, contentTypeId: string) =>
-      `[${projectId}] Content type "${contentTypeId}"`,
-    failedGet: (projectId: string, contentTypeId: string) =>
-      `[${projectId}] Unable to get content type "${contentTypeId}"`,
-    created: (projectId: string, componentId: string, status?: string) =>
-      `[${projectId}] Content type ${status}d "${componentId}"`,
+    get: (projectId: string, id: string) =>
+      `[${projectId}] Content type "${id}"`,
+    failedGet: (projectId: string, id: string) =>
+      `[${projectId}] Unable to get content type "${id}"`,
+    created: (projectId: string, id: string, status?: string) =>
+      `[${projectId}] Content type ${status}d "${id}"`,
     removed: (env: string, id: string, commit: boolean) =>
       `[${env}] ${commit ? `Deleted` : `Will delete`} content type "${id}"`,
     failedRemove: (env: string, id: string) =>
@@ -111,14 +155,11 @@ export const LogMessages = {
   },
   components: {
     list: (projectId: string) => `Components in "${projectId}":`,
-    noList: (projectId: string) =>
-      `[${projectId}] Cannot retrieve components list`,
-    get: (projectId: string, componentId: string) =>
-      `[${projectId}] Component "${componentId}"`,
-    failedGet: (projectId: string, componentId: string) =>
-      `[${projectId}] Unable to get component "${componentId}"`,
-    created: (projectId: string, componentId: string, status?: string) =>
-      `[${projectId}] Component ${status}d "${componentId}"`,
+    get: (projectId: string, id: string) => `[${projectId}] Component "${id}"`,
+    failedGet: (projectId: string, id: string) =>
+      `[${projectId}] Unable to get component "${id}"`,
+    created: (projectId: string, id: string, status?: string) =>
+      `[${projectId}] Component ${status}d "${id}"`,
     removed: (env: string, id: string, commit: boolean) =>
       `[${env}] ${commit ? `Deleted` : `Will delete`} component "${id}"`,
     failedRemove: (env: string, id: string) =>
@@ -133,22 +174,6 @@ export const LogMessages = {
       `No Contensis environment set, connect to your Contensis cloud instance using "contensis connect {cms alias}"`,
   },
   entries: {
-    migrateStatus: (status: MigrateStatus) => {
-      switch (status) {
-        case 'no change':
-          return Logger.successText;
-        case 'create':
-        case 'two-pass':
-        case 'update':
-        case 'delete':
-          return Logger.warningText;
-        case 'error':
-        case 'not found':
-          return Logger.errorText;
-        default:
-          return Logger.infoText;
-      }
-    },
     removed: (env: string, id: string, commit: boolean) =>
       `[${env}] ${commit ? `Deleted` : `Will delete`} entry "${id}"`,
     failedRemove: (env: string, id: string) =>

package/src/providers/SessionCacheProvider.ts

@@ -72,7 +72,8 @@ class SessionCacheProvider {
 
   UpdateEnv = (
     updateContent: Partial<EnvironmentCache>,
-    env = this.cache.currentEnvironment
+    env = this.cache.currentEnvironment,
+    setCurrentEnv = true
   ) => {
     try {
       const environment = this.cache.environments[env || ''];
@@ -82,7 +83,7 @@ class SessionCacheProvider {
         ...updateContent,
       };
       this.Update({
-        currentEnvironment: env,
+        currentEnvironment: setCurrentEnv ? env : this.cache.currentEnvironment,
         environments: this.cache.environments,
       });
     } catch (ex: any) {

package/src/providers/file-provider.ts

@@ -69,4 +69,5 @@ export const checkDir = (filePath: string) => {
     fs.mkdirSync(directoryPath, { recursive: true });
 };
 
-export const localPath = (filePath: string) => path.join(appRoot, filePath);
+export const localPath = (filePath: string) =>
+  path.isAbsolute(filePath) ? filePath : path.join(appRoot, filePath);