@contrail/cli 1.0.42 → 1.0.44

package/lib/api/event-workflow-template-definition.d.ts

@@ -3,3 +3,4 @@ export declare function updateWorkflowTemplateDefinition(options: {
     id: string;
     updates: any;
 }): Promise<any>;
+export declare function deleteWorkflowTemplateDefinition(templateId: string): Promise<any>;

package/lib/api/event-workflow-template-definition.js

@@ -12,3 +12,9 @@ export async function updateWorkflowTemplateDefinition(options) {
         object: options.updates,
     });
 }
+export async function deleteWorkflowTemplateDefinition(templateId) {
+    return await new Entities().delete({
+        entityName: 'event-workflow-template-definition',
+        id: templateId,
+    });
+}

package/lib/types/interfaces.d.ts

@@ -12,6 +12,7 @@ export interface ReducedTypeProperty {
     slug: string;
     label: string;
     editable: boolean;
+    searchable: boolean;
     core: boolean;
     typePropertyOptionSetName: string;
     formula: string;

package/lib/types/types-extractor.js

@@ -72,6 +72,7 @@ export async function getReducedTypes(optionSets) {
                 propertyType: typeProperty.propertyType,
                 label: typeProperty.label,
                 editable: typeProperty.editable,
+                searchable: typeProperty.searchable,
                 core: typeProperty.core,
                 typePropertyOptionSetName: optionSetNameById[typeProperty.typePropertyOptionSetId],
                 formula: typeProperty.formula,

package/lib/types/types-uploader.js

@@ -136,6 +136,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         slug: newPropertyType.slug,
                         label: newPropertyType.label,
                         editable: newPropertyType.editable,
+                        searchable: newPropertyType.searchable,
                         core: newPropertyType.core,
                         typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
                         formula: newPropertyType.formula,
@@ -162,6 +163,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
                         slug: newPropertyType.slug,
                         label: newPropertyType.label,
                         editable: newPropertyType.editable,
+                        searchable: newPropertyType.searchable,
                         core: newPropertyType.core,
                         typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
                         formula: newPropertyType.formula,
@@ -204,6 +206,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         slug: typeProperty1.slug,
         label: typeProperty1.label,
         editable: typeProperty1.editable,
+        searchable: typeProperty1.searchable,
         core: typeProperty1.core,
         typePropertyOptionSetId: optionSetIdByName[typeProperty1.typePropertyOptionSetName],
         formula: typeProperty1.formula,
@@ -219,6 +222,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName) {
         slug: typeProperty2.slug,
         label: typeProperty2.label,
         editable: typeProperty2.editable,
+        searchable: typeProperty2.searchable,
         core: typeProperty2.core,
         typePropertyOptionSetId: optionSetIdByName[typeProperty2.typePropertyOptionSetName],
         formula: typeProperty2.formula,

package/lib/workflow-template-definitions/workflow-template-definition-deployer.js

@@ -2,7 +2,7 @@ import inquirer from 'inquirer';
 import chalk from 'chalk';
 import { getInstalledApps, getWorkflowTemplateDefinitionsForApp } from '../api/apps';
 import { createWorkflowTemplate } from '../api/event-workflow-templates';
-import { createWorkflowTemplateDefinition, updateWorkflowTemplateDefinition as apiUpdateWorkflowTemplateDefinition } from '../api/event-workflow-template-definition';
+import { createWorkflowTemplateDefinition, deleteWorkflowTemplateDefinition, updateWorkflowTemplateDefinition as apiUpdateWorkflowTemplateDefinition } from '../api/event-workflow-template-definition';
 import { getActionDeclarationIdentifier, getActionsForApp } from '../apps/deploy-app/actions-deployer';
 export class WorkflowTemplateDefinitionDeployer {
     async cliInstallWorkflowTemplateDefinitions() {
@@ -11,7 +11,7 @@ export class WorkflowTemplateDefinitionDeployer {
             console.log('%s \nNo apps are currently installed. You must install an app before installing its associated workflow template definitions.', chalk.red.bold('WORKFLOW DEFINITION'));
             return;
         }
-        let answers = await inquirer.prompt([{
+        const answers = await inquirer.prompt([{
                 type: 'list',
                 name: 'appIdentifier',
                 message: 'Which app\'s workflow would you like to install?',
@@ -22,27 +22,24 @@ export class WorkflowTemplateDefinitionDeployer {
         for (const definition of workflowTemplateDefinitions) {
             console.log(chalk.yellow.bold(`- ${definition.name}`));
         }
-        answers = await inquirer.prompt([{
-                type: 'confirm',
-                name: 'shouldInstall',
-                message: 'Confirmation: would you like to install these workflows? (yes)',
-                default: true,
-            }]);
-        if (!answers.shouldInstall) {
-            console.log('%s      Canceling installing workflows template definitions.', chalk.yellow.bold('WORKFLOW DEFINITION TEMPLATE'));
-            return;
-        }
         await this.installWorkflowTemplateDefinitions(workflowTemplateDefinitions);
     }
     async installWorkflowTemplateDefinitions(workflowTemplateDefinitions) {
-        const answers = await inquirer.prompt([{
+        let answers = await inquirer.prompt([{
+                type: 'checkbox',
+                name: 'workflowTemplateDefinitionsToInstall',
+                message: 'Which workflow templates would you like to install?',
+                choices: workflowTemplateDefinitions.map(x => { return { value: x.identifier, name: x.name }; }),
+            }]);
+        const workflowTemplateDefinitionsToInstall = workflowTemplateDefinitions.filter(x => answers.workflowTemplateDefinitionsToInstall.includes(x.identifier));
+        answers = await inquirer.prompt([{
                 type: 'confirm',
                 name: 'makeActive',
                 message: 'Should the workflows be active ?(yes)',
                 default: true,
             }]);
         const makeActive = answers.makeActive;
-        for (const definition of workflowTemplateDefinitions) {
+        for (const definition of workflowTemplateDefinitionsToInstall) {
             const newObject = {
                 name: definition.name,
                 triggerKey: definition.triggerKey,
@@ -81,6 +78,12 @@ export class WorkflowTemplateDefinitionDeployer {
                     await this.deployWorkflow(workflowKey, appDeclaration.workflows[workflowKey], app, existingWorkflows);
                 }
             }
+            // remove old templates that were removed by the app publisher
+            const localIdentifiers = localWorkflows.map(x => this.getWorkflowDeclarationIdentifier(x, app));
+            const workflowTemplateDefinitionsToDelete = existingWorkflows.filter(x => !localIdentifiers.includes(x.identifier));
+            for (const templateToDelete of workflowTemplateDefinitionsToDelete) {
+                await deleteWorkflowTemplateDefinition(templateToDelete.id);
+            }
         }
     }
     async deployWorkflow(workflowKey, workflow, app, existingWorkflows) {

package/lib/workflow-templates/workflow-template-commands.d.ts

@@ -1,4 +1,4 @@
 export declare function deleteWorkflowTemplates(): Promise<void>;
 export declare function localDeleteWorkflowTemplate(): Promise<void>;
 export declare function localDeployWorkflowTemplate(): Promise<void>;
-export declare function listWorkflowTemplate(): Promise<any>;
+export declare function listWorkflowTemplate(): Promise<void>;

package/lib/workflow-templates/workflow-template-deployer.d.ts

@@ -1,4 +1,4 @@
 export declare class WorkflowTemplateDeployer {
     deleteWorkflowTemplates(): Promise<void>;
-    listExistingWorkflowTemplates(): Promise<any>;
+    listExistingWorkflowTemplates(): Promise<void>;
 }

package/lib/workflow-templates/workflow-template-deployer.js

@@ -19,7 +19,8 @@ export class WorkflowTemplateDeployer {
     }
     async listExistingWorkflowTemplates() {
         const templates = await getExistingWorkflowTemplates();
-        console.log(templates);
-        return templates;
+        console.log('(Date Created) (active) workflow name');
+        console.log('------------------------');
+        console.log(chalk.green.bold(templates.map(x => `(${x.createdOn}) (${x.isActive ? 'active' : 'inactive'}) ${x.name} `).join('\n')));
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrail/cli",
-  "version": "1.0.42",
+  "version": "1.0.44",
   "description": "VibeIQ's Contrail Platform CLI.",
   "main": "lib/index.js",
   "bin": {

package/src/api/event-workflow-template-definition.ts

@@ -13,4 +13,11 @@ export async function updateWorkflowTemplateDefinition(options: {id: string, upd
     id: options.id,
     object: options.updates,
   });
+}
+
+export async function deleteWorkflowTemplateDefinition(templateId: string) {
+  return await new Entities().delete({
+    entityName: 'event-workflow-template-definition',
+    id: templateId,
+  });
 }

package/src/types/interfaces.ts

@@ -13,6 +13,7 @@ export interface ReducedTypeProperty {
   slug: string;
   label: string;
   editable: boolean;
+  searchable: boolean;
   core: boolean;
   typePropertyOptionSetName: string;
   formula: string;

package/src/types/types-extractor.ts

@@ -92,6 +92,7 @@ export async function getReducedTypes(optionSets) {
         propertyType: typeProperty.propertyType,
         label: typeProperty.label,
         editable: typeProperty.editable,
+        searchable: typeProperty.searchable,
         core: typeProperty.core,
         typePropertyOptionSetName: optionSetNameById[typeProperty.typePropertyOptionSetId],
         formula: typeProperty.formula,

package/src/types/types-uploader.ts

@@ -162,6 +162,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
               slug: newPropertyType.slug,
               label: newPropertyType.label,
               editable: newPropertyType.editable,
+              searchable: newPropertyType.searchable,
               core: newPropertyType.core,
               typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
               formula: newPropertyType.formula,
@@ -188,6 +189,7 @@ async function uploadReducedTypeProperties(type, currentPropertyTypes, newProper
             slug: newPropertyType.slug,
             label: newPropertyType.label,
             editable: newPropertyType.editable,
+            searchable: newPropertyType.searchable,
             core: newPropertyType.core,
             typePropertyOptionSetId: optionSetIdByName[newPropertyType.typePropertyOptionSetName],
             formula: newPropertyType.formula,
@@ -234,6 +236,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName): b
     slug: typeProperty1.slug,
     label: typeProperty1.label,
     editable: typeProperty1.editable,
+    searchable: typeProperty1.searchable,
     core: typeProperty1.core,
     typePropertyOptionSetId: optionSetIdByName[typeProperty1.typePropertyOptionSetName],
     formula: typeProperty1.formula,
@@ -250,6 +253,7 @@ function typePropertiesEqual(typeProperty1, typeProperty2, optionSetIdByName): b
     slug: typeProperty2.slug,
     label: typeProperty2.label,
     editable: typeProperty2.editable,
+    searchable: typeProperty2.searchable,
     core: typeProperty2.core,
     typePropertyOptionSetId: optionSetIdByName[typeProperty2.typePropertyOptionSetName],
     formula: typeProperty2.formula,

package/src/workflow-template-definitions/workflow-template-definition-deployer.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import { App, AppDeclaration, WorkflowDefinition, WorkflowTemplate } from '../interfaces';
 import { getInstalledApps, getWorkflowTemplateDefinitionsForApp } from '../api/apps';
 import { createWorkflowTemplate } from '../api/event-workflow-templates';
-import { createWorkflowTemplateDefinition, updateWorkflowTemplateDefinition as apiUpdateWorkflowTemplateDefinition } from '../api/event-workflow-template-definition';
+import { createWorkflowTemplateDefinition, deleteWorkflowTemplateDefinition, updateWorkflowTemplateDefinition as apiUpdateWorkflowTemplateDefinition } from '../api/event-workflow-template-definition';
 import { getActionDeclarationIdentifier, getActionsForApp } from '../apps/deploy-app/actions-deployer';
 
 export class WorkflowTemplateDefinitionDeployer {
@@ -15,7 +15,7 @@ export class WorkflowTemplateDefinitionDeployer {
       return;
     }
 
-    let answers = await inquirer.prompt([{
+    const answers = await inquirer.prompt([{
       type: 'list',
       name: 'appIdentifier',
       message: 'Which app\'s workflow would you like to install?',
@@ -26,31 +26,26 @@ export class WorkflowTemplateDefinitionDeployer {
     for (const definition of workflowTemplateDefinitions) {
       console.log(chalk.yellow.bold(`- ${definition.name}`));
     }
-    answers = await inquirer.prompt([{
-      type: 'confirm',
-      name: 'shouldInstall',
-      message: 'Confirmation: would you like to install these workflows? (yes)',
-      default: true,
-    }]);
-
-    if (!answers.shouldInstall) {
-      console.log('%s      Canceling installing workflows template definitions.', chalk.yellow.bold('WORKFLOW DEFINITION TEMPLATE'));
-      return;
-    }
-
     await this.installWorkflowTemplateDefinitions(workflowTemplateDefinitions);
   }
 
   async installWorkflowTemplateDefinitions(workflowTemplateDefinitions: WorkflowTemplate[]) {
+    let answers = await inquirer.prompt([{
+      type: 'checkbox',
+      name: 'workflowTemplateDefinitionsToInstall',
+      message: 'Which workflow templates would you like to install?',
+      choices: workflowTemplateDefinitions.map(x => {return {value: x.identifier, name: x.name};}),
+    }]);
 
-    const answers = await inquirer.prompt([{
+    const workflowTemplateDefinitionsToInstall = workflowTemplateDefinitions.filter(x => answers.workflowTemplateDefinitionsToInstall.includes(x.identifier));
+    answers = await inquirer.prompt([{
       type: 'confirm',
       name: 'makeActive',
       message: 'Should the workflows be active ?(yes)',
       default: true,
     }]);
     const makeActive = answers.makeActive;
-    for (const definition of workflowTemplateDefinitions) {
+    for (const definition of workflowTemplateDefinitionsToInstall) {
       const newObject: WorkflowTemplate = {
         name: definition.name,
         triggerKey: definition.triggerKey,
@@ -100,6 +95,13 @@ export class WorkflowTemplateDefinitionDeployer {
           );
         }
       }
+
+      // remove old templates that were removed by the app publisher
+      const localIdentifiers = localWorkflows.map(x=> this.getWorkflowDeclarationIdentifier(x, app));
+      const workflowTemplateDefinitionsToDelete = existingWorkflows.filter(x=> !localIdentifiers.includes(x.identifier));
+      for(const templateToDelete of workflowTemplateDefinitionsToDelete) {
+        await deleteWorkflowTemplateDefinition(templateToDelete.id);
+      }
     }
   }
 

package/src/workflow-templates/workflow-template-deployer.ts

@@ -23,7 +23,8 @@ export class WorkflowTemplateDeployer {
 
   public async listExistingWorkflowTemplates() {
     const templates = await getExistingWorkflowTemplates();
-    console.log(templates);
-    return templates;
+    console.log('(Date Created) (active) workflow name');
+    console.log('------------------------');
+    console.log(chalk.green.bold(templates.map(x => `(${x.createdOn}) (${x.isActive? 'active': 'inactive'}) ${x.name} `).join('\n')));
   }
 }