@contrail/cli 1.0.46 → 1.0.47

package/lib/projects/interfaces.d.ts

@@ -33,3 +33,41 @@ export declare class ProjectConfiguration {
     assortments: AssortmentConfiguration[];
     subFolders: Folder[];
 }
+export declare class ProjectConfigurationTemplate {
+    projectName: string;
+    identifier: string;
+    commonConfig: CommonConfiguration;
+    allFolders: FolderSlim[];
+    allAssortments: AssortmentConfigurationSlim[];
+    allAssortmentRelationships: AssortmentConfigurationRelationships[];
+}
+export declare class FolderSlim {
+    identifier: string;
+    name: string;
+    folderIdentifier: string;
+}
+export declare class AssortmentConfigurationSlim {
+    identifier: string;
+    name: string;
+    type: AssortmentType;
+    folderIdentifier: string;
+    sourceAssortmentIdentifier?: string;
+    composedFromAssortmentIdentifiers?: string[];
+    ownerAtts?: {
+        [key: string]: any;
+    };
+    assortmentAtts?: {
+        [key: string]: any;
+    };
+}
+export declare class AssortmentConfigurationRelationships {
+    identifier: string;
+    sourceAssortmentIdentifier?: string;
+    composedFromAssortmentIdentifiers?: string[];
+    ownerAtts?: {
+        [key: string]: any;
+    };
+    assortmentAtts?: {
+        [key: string]: any;
+    };
+}

package/lib/projects/interfaces.js

@@ -13,3 +13,11 @@ export class Folder {
 }
 export class ProjectConfiguration {
 }
+export class ProjectConfigurationTemplate {
+}
+export class FolderSlim {
+}
+export class AssortmentConfigurationSlim {
+}
+export class AssortmentConfigurationRelationships {
+}

package/lib/projects/project-uploader.js

@@ -34,7 +34,8 @@ function getProjectFile(fileName) {
     }
 }
 async function uploadProject(templateFileLocation) {
-    const projectConfiguration = getProjectFile(templateFileLocation);
+    const projectConfigurationFromFile = getProjectFile(templateFileLocation);
+    const projectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
     console.log('Configuring Project.');
     await Request.request('/project-configurator', {
         method: 'POST',
@@ -45,3 +46,59 @@ async function uploadProject(templateFileLocation) {
         },
     });
 }
+function getProjectConfiguration(projectConfigurationFromFile) {
+    if (!projectConfigurationFromFile.allFolders && !projectConfigurationFromFile.allAssortments && !projectConfigurationFromFile.allAssortmentRelationships) {
+        return projectConfigurationFromFile;
+    }
+    const parsed = parseToProjectConfiguration(projectConfigurationFromFile);
+    return parsed;
+}
+function parseToProjectConfiguration(projectConfigurationFromFile) {
+    const projectConfiguration = {
+        projectName: projectConfigurationFromFile.projectName,
+        identifier: projectConfigurationFromFile.identifier,
+        commonConfig: projectConfigurationFromFile.commonConfig,
+        assortments: [],
+        subFolders: [],
+    };
+    const foldersByIdentifier = { [projectConfiguration.identifier]: projectConfiguration };
+    for (const folder of projectConfigurationFromFile.allFolders) {
+        foldersByIdentifier[folder.identifier] = folder;
+    }
+    const assortmentsByIdentifier = {};
+    for (const assortment of projectConfigurationFromFile.allAssortments) {
+        assortmentsByIdentifier[assortment.identifier] = assortment;
+    }
+    for (const assortmentRelationships of projectConfigurationFromFile.allAssortmentRelationships) {
+        const assortment = assortmentsByIdentifier[assortmentRelationships.identifier];
+        if (!assortment) {
+            console.warn('Relationship defined for assortment that is not defined.', assortmentRelationships);
+        }
+        else {
+            Object.assign(assortment, assortmentRelationships);
+        }
+    }
+    for (const assortment of projectConfigurationFromFile.allAssortments) {
+        const folder = foldersByIdentifier[assortment.folderIdentifier];
+        if (!folder) {
+            console.warn('Assortment defined for folder that is not defined.', assortment);
+        }
+        if (!folder.assortments) {
+            folder.assortments = [];
+        }
+        delete assortment.folderIdentifier;
+        folder.assortments.push(assortment);
+    }
+    for (const folderSlim of projectConfigurationFromFile.allFolders) {
+        const folder = foldersByIdentifier[folderSlim.folderIdentifier];
+        if (!folder) {
+            console.warn('Folder defined for folder that is not defined.', folderSlim);
+        }
+        if (!folder.subFolders) {
+            folder.subFolders = [];
+        }
+        delete folderSlim.folderIdentifier;
+        folder.subFolders.push(folderSlim);
+    }
+    return projectConfiguration;
+}

package/package.json

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

package/src/projects/interfaces.ts

@@ -32,4 +32,38 @@ export class ProjectConfiguration {
   commonConfig: CommonConfiguration;
   assortments: AssortmentConfiguration[];
   subFolders: Folder[];
+}
+
+export class ProjectConfigurationTemplate {
+  projectName: string;
+  identifier: string;
+  commonConfig: CommonConfiguration;
+  allFolders: FolderSlim[];
+  allAssortments: AssortmentConfigurationSlim[];
+  allAssortmentRelationships: AssortmentConfigurationRelationships[];
+}
+
+export class FolderSlim {
+  identifier: string;
+  name: string;
+  folderIdentifier: string;
+}
+
+export class AssortmentConfigurationSlim {
+  identifier: string;
+  name: string;
+  type: AssortmentType;
+  folderIdentifier: string;
+  sourceAssortmentIdentifier?: string;
+  composedFromAssortmentIdentifiers?: string[];
+  ownerAtts?: {[key: string]: any};
+  assortmentAtts?: {[key: string]: any};
+}
+
+export class AssortmentConfigurationRelationships {
+  identifier: string;
+  sourceAssortmentIdentifier?: string;
+  composedFromAssortmentIdentifiers?: string[];
+  ownerAtts?: {[key: string]: any};
+  assortmentAtts?: {[key: string]: any};
 }

package/src/projects/project-uploader.ts

@@ -3,7 +3,7 @@ import chalk from 'chalk';
 import fs from 'fs';
 import { authUser } from '../auth/login';
 import { getSeparatorByPlatform } from '../common';
-import { ProjectConfiguration } from './interfaces';
+import { ProjectConfiguration, ProjectConfigurationTemplate } from './interfaces';
 
 import yaml from 'js-yaml';
 
@@ -42,7 +42,9 @@ function getProjectFile(fileName){
 }
 
 async function uploadProject(templateFileLocation) {
-  const projectConfiguration: ProjectConfiguration[] = getProjectFile(templateFileLocation);
+  const projectConfigurationFromFile = getProjectFile(templateFileLocation);
+  const projectConfiguration: ProjectConfiguration = getProjectConfiguration(projectConfigurationFromFile);
+
   console.log('Configuring Project.');
 
   await Request.request(
@@ -55,5 +57,74 @@ async function uploadProject(templateFileLocation) {
         'Content-Type': 'application/json',
       },
     });
+}
+
+function getProjectConfiguration(projectConfigurationFromFile): ProjectConfiguration {
+  if (!projectConfigurationFromFile.allFolders && !projectConfigurationFromFile.allAssortments && !projectConfigurationFromFile.allAssortmentRelationships) {
+    return projectConfigurationFromFile;
+  }
+
+  const parsed = parseToProjectConfiguration(projectConfigurationFromFile);
+  return parsed;
+}
+
+function parseToProjectConfiguration(projectConfigurationFromFile: ProjectConfigurationTemplate): ProjectConfiguration {
+
+  const projectConfiguration: ProjectConfiguration = {
+    projectName: projectConfigurationFromFile.projectName,
+    identifier: projectConfigurationFromFile.identifier,
+    commonConfig: projectConfigurationFromFile.commonConfig,
+    assortments: [],
+    subFolders: [],
+  };
+
+  const foldersByIdentifier: any = {[projectConfiguration.identifier]: projectConfiguration};
+  for (const folder of projectConfigurationFromFile.allFolders) {
+    foldersByIdentifier[folder.identifier] = folder;
+  }
+
+  const assortmentsByIdentifier = {};
+  for (const assortment of projectConfigurationFromFile.allAssortments) {
+    assortmentsByIdentifier[assortment.identifier] = assortment;
+  }
+
+  for (const assortmentRelationships of projectConfigurationFromFile.allAssortmentRelationships) {
+    const assortment = assortmentsByIdentifier[assortmentRelationships.identifier];
+    if (!assortment) {
+      console.warn('Relationship defined for assortment that is not defined.', assortmentRelationships);
+    }
+    else {
+      Object.assign(assortment, assortmentRelationships);
+    }
+  }
+
+  for (const assortment of projectConfigurationFromFile.allAssortments) {
+    const folder = foldersByIdentifier[assortment.folderIdentifier];
+    if (!folder) {
+      console.warn('Assortment defined for folder that is not defined.', assortment);
+    }
+
+    if (!folder.assortments) {
+      folder.assortments = [];
+    }
+
+    delete assortment.folderIdentifier;
+    folder.assortments.push(assortment);
+  }
+
+  for (const folderSlim of projectConfigurationFromFile.allFolders) {
+    const folder = foldersByIdentifier[folderSlim.folderIdentifier];
+    if (!folder) {
+      console.warn('Folder defined for folder that is not defined.', folderSlim);
+    }
+
+    if (!folder.subFolders) {
+      folder.subFolders = [];
+    }
+
+    delete folderSlim.folderIdentifier;
+    folder.subFolders.push(folderSlim);
+  }
 
+  return projectConfiguration;
 }