@inizioevoke/veeva-astroclm-core 1.4.4 → 1.4.5

package/dist/tasks/create-csv.d.ts

@@ -1,19 +1,20 @@
 import type { IVeevaConfig } from '../types';
 export interface AdditionalField {
     header: string;
-    value?: string;
+    value?: any;
     property?: string;
 }
+export interface AdditionalFields {
+    presentation?: AdditionalField[];
+    slides?: AdditionalField[];
+    shared?: AdditionalField[];
+}
 interface Params {
     config: IVeevaConfig;
     deployDir: string;
     buildName: string;
     fieldsOnly?: boolean;
-    additional?: {
-        presentation: AdditionalField[];
-        slides: AdditionalField[];
-        shared: AdditionalField[];
-    };
+    additionalFields?: AdditionalFields;
 }
-export default function ({ config, deployDir, buildName, fieldsOnly, additional }: Params): Promise<void>;
+export default function ({ config, deployDir, buildName, fieldsOnly, additionalFields }: Params): Promise<void>;
 export {};

package/dist/tasks/create-csv.js

@@ -2,29 +2,32 @@ import { writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import logger from '../lib/logger.js';
 import { pathToSlideZip } from '../lib/utils.js';
-export default async function ({ config, deployDir, buildName, fieldsOnly = false, additional }) {
+export default async function ({ config, deployDir, buildName, fieldsOnly = false, additionalFields }) {
     logger.info('Creating multichannel loader CSV');
-    const headers = fieldsOnly ? CSV_HEADERS_FIELDS_ONLY : CSV_HEADERS;
+    const headers = [...(fieldsOnly ? CSV_HEADERS_FIELDS_ONLY : CSV_HEADERS)];
+    const additional = filterAdditionalFields(config, additionalFields);
     additional?.presentation?.forEach((a) => {
-        if (a.value || (a.property && config.presentation[a.property])) {
+        if (!headers.includes(a.header) && (a.value || (a.property && config.presentation[a.property] !== undefined))) {
             headers.push(a.header);
         }
     });
     additional?.slides?.forEach((a) => {
-        if (a.value) {
-            headers.push(a.header);
-        }
-        else if (a.property && config.presentation.slides) {
-            const slide = config.presentation.slides.find((s) => {
-                return s[a.property];
-            });
-            if (slide) {
+        if (!headers.includes(a.header)) {
+            if (a.value) {
                 headers.push(a.header);
             }
+            else if (a.property && config.presentation.slides) {
+                const slide = config.presentation.slides.find((s) => {
+                    return s[a.property] !== undefined;
+                });
+                if (slide) {
+                    headers.push(a.header);
+                }
+            }
         }
     });
     additional?.shared?.forEach((a) => {
-        if (a.value || (a.property && config.presentation.shared && config.presentation.shared[a.property])) {
+        if (!headers.includes(a.header) && (a.value || (a.property && config.presentation.shared && config.presentation.shared[a.property] !== undefined))) {
             headers.push(a.header);
         }
     });
@@ -48,6 +51,21 @@ export default async function ({ config, deployDir, buildName, fieldsOnly = fals
     shared && rows.push(shared);
     await writeFile(join(deployDir, `_${config.presentation.presentationId}_${buildName}.csv`), rows.map((r) => { return r.join(','); }).join('\n'), { encoding: 'utf8' });
 }
+function filterAdditionalFields(config, additionalFields) {
+    if (!additionalFields)
+        return undefined;
+    const additional = {};
+    additional.presentation = additionalFields?.presentation?.filter((v, i, a) => {
+        return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+    });
+    additional.slides = additionalFields?.slides?.filter((v, i, a) => {
+        return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+    });
+    additional.shared = additionalFields?.shared?.filter((v, i, a) => {
+        return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+    });
+    return additional;
+}
 const VEEVA_YES = 'YES', VEEVA_NO = 'NO', VEEVA_TYPE_PRESENTATION = 'Presentation', VEEVA_TYPE_SLIDE = 'Slide', VEEVA_TYPE_SHARED = 'Shared', VEEVA_LIFECYCLE_BINDER = 'Binder Lifecycle', VEEVA_LIFECYCLE_CRM_CONTENT = 'CRM Content Lifecycle', VEEVA_IOS_RESOLUTION_DEFAULT = 'Default For Device', VEEVA_MEDIATYPE_HTML = 'HTML', 
 // HEADERS
 HEADER_FIELDS_ONLY = 'Fields Only', HEADER_EXTERNAL_ID = 'external_id__v', HEADER_NAME = 'name__v', HEADER_TYPE = 'Type', HEADER_LIFECYCLE = 'lifecycle__v', HEADER_PRES_ID = 'pres.crm_presentation_id__v', HEADER_PRES_TITLE = 'pres.title__v', HEADER_PRES_PRODUCT = 'pres.product__v.name__v', HEADER_PRES_COUNTRY = 'pres.country__v.name__v', HEADER_PRES_LANGUAGE = 'pres.language__v', HEADER_PRES_CLM_CONTENT = 'pres.clm_content__v', HEADER_PRES_CLM_HIDDEN = 'pres.crm_hidden__v', HEADER_PRES_TRAINING = 'pres.crm_training__v', HEADER_PRES_CRM_TARGET = 'pres.crm_target_platform__v', HEADER_PRES_CRM_ORG = 'pres.crm_org__v.crm_org_id__v', HEADER_PRES_CRM_PRODUCT = 'pres.crm_product__v.id', // Get the Veeva ID from the URL
@@ -127,7 +145,7 @@ function createPresentationRow(headers, config, additional) {
         addColumn(headers, row, header, presentation[key]);
     }
     additional?.forEach((a) => {
-        addColumn(headers, row, a.header, a.property ? presentation[a.property] : a.value);
+        addColumn(headers, row, a.header, a.value ?? presentation[a.property]);
     });
     return row;
 }
@@ -162,7 +180,7 @@ function createSlideRow(headers, config, slide, additional) {
         addColumn(headers, row, header, slide[key] ?? config.presentation.slideSettings?.[key] ?? config.slideSettings?.[key]);
     }
     additional?.forEach((a) => {
-        addColumn(headers, row, a.header, a.property ? slide[a.property] : a.value);
+        addColumn(headers, row, a.header, a.value ?? slide[a.property]);
     });
     return row;
 }
@@ -189,7 +207,7 @@ function createSharedRow(headers, config, additional) {
         addColumn(headers, row, header, shared[key] ?? config.presentation.slideSettings?.[key] ?? config.slideSettings?.[key]);
     }
     additional?.forEach((a) => {
-        addColumn(headers, row, a.header, a.property ? shared[a.property] : a.value);
+        addColumn(headers, row, a.header, a.value ?? shared[a.property]);
     });
     return row;
 }

package/dist/tasks/deploy.d.ts

@@ -1,10 +1,12 @@
 import { IVeevaConfig } from '../types';
+import { type AdditionalFields } from './create-csv.js';
 interface Opts {
     root: string;
     config: IVeevaConfig;
     env: string;
     csvOnly?: boolean;
     serverPort?: number;
+    additionalCsvFields?: AdditionalFields;
 }
-export default function ({ root, config, env, csvOnly, serverPort }: Opts): Promise<void>;
+export default function ({ root, config, env, csvOnly, serverPort, additionalCsvFields }: Opts): Promise<void>;
 export {};

package/dist/tasks/deploy.js

@@ -14,7 +14,7 @@ const argv = parseArgv({
     mode: 'string',
     fieldsOnly: 'boolean'
 });
-export default async function ({ root, config, env, csvOnly = false, serverPort = 4320 }) {
+export default async function ({ root, config, env, csvOnly = false, serverPort = 4320, additionalCsvFields }) {
     const rootDir = root ?? process.cwd();
     // we could import the astro config and see if the outDir was set but right now it's not necessary
     const astroConfig = await getAstroConfig(root);
@@ -50,7 +50,7 @@ export default async function ({ root, config, env, csvOnly = false, serverPort
         await server.stop();
         await createZips({ config, deployDir });
     }
-    await createCsv({ config, deployDir, buildName, fieldsOnly: csvOnly });
+    await createCsv({ config, deployDir, buildName, fieldsOnly: csvOnly, additionalFields: additionalCsvFields });
 }
 async function getAstroConfig(root) {
     let config = undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@inizioevoke/veeva-astroclm-core",
-  "version": "1.4.4",
+  "version": "1.4.5",
   "description": "",
   "license": "ISC",
   "author": "",

package/src/tasks/create-csv.ts

@@ -6,43 +6,50 @@ import { pathToSlideZip } from '../lib/utils.js';
 
 export interface AdditionalField {
   header: string;
-  value?: string;
+  value?: any;
   property?: string;
 }
 
+export interface AdditionalFields {
+  presentation?: AdditionalField[];
+  slides?: AdditionalField[];
+  shared?: AdditionalField[];
+}
+
 interface Params {
   config: IVeevaConfig
   deployDir: string;
   buildName: string;
   fieldsOnly?: boolean;
-  additional?: {
-    presentation: AdditionalField[];
-    slides: AdditionalField[];
-    shared: AdditionalField[];
-  }
+  additionalFields?: AdditionalFields;
 }
-export default async function({ config, deployDir, buildName, fieldsOnly = false, additional }: Params) {
+export default async function({ config, deployDir, buildName, fieldsOnly = false, additionalFields }: Params) {
   logger.info('Creating multichannel loader CSV');
-  const headers: string[] = fieldsOnly ? CSV_HEADERS_FIELDS_ONLY : CSV_HEADERS;
+  const headers: string[] = [...(fieldsOnly ? CSV_HEADERS_FIELDS_ONLY : CSV_HEADERS)];
+
+  const additional = filterAdditionalFields(config, additionalFields);
+
   additional?.presentation?.forEach((a) => {
-    if (a.value || (a.property && config.presentation[a.property as keyof typeof config.presentation])) {
+    if (!headers.includes(a.header) && (a.value || (a.property && (config.presentation as any)[a.property] !== undefined))) {
       headers.push(a.header);
     }
   });
   additional?.slides?.forEach((a) => {
-    if (a.value) {
-      headers.push(a.header);
-    } else if (a.property && config.presentation.slides) {
-      const slide = config.presentation.slides.find((s) => {  
-        return s[a.property as keyof typeof s]
-      });
-      if (slide) {
+    if (!headers.includes(a.header)) {
+      if (a.value) {
         headers.push(a.header);
+      } else if (a.property && config.presentation.slides) {
+        const slide = config.presentation.slides.find((s) => {  
+          return s[a.property as keyof typeof s] !== undefined;
+        });
+        if (slide) {
+          headers.push(a.header);
+        }
       }
     }
   });
   additional?.shared?.forEach((a) => {
-    if (a.value || (a.property && config.presentation.shared && config.presentation.shared[a.property as keyof typeof config.presentation.shared])) {
+    if (!headers.includes(a.header) && (a.value || (a.property && config.presentation.shared && (config.presentation.shared as any)[a.property] !== undefined))) {
       headers.push(a.header);
     }
   });
@@ -70,6 +77,23 @@ export default async function({ config, deployDir, buildName, fieldsOnly = false
   await writeFile(join(deployDir, `_${config.presentation.presentationId}_${buildName}.csv`), rows.map((r)=>{return r.join(',');}).join('\n'), { encoding: 'utf8' });
 }
 
+function filterAdditionalFields(config: IVeevaConfig, additionalFields?: AdditionalFields): AdditionalFields | undefined {
+  if (!additionalFields) return undefined;
+
+  const additional: AdditionalFields = {};
+  additional.presentation = additionalFields?.presentation?.filter((v, i, a) => {
+    return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+  });
+  additional.slides = additionalFields?.slides?.filter((v, i, a) => {
+    return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+  });
+  additional.shared = additionalFields?.shared?.filter((v, i, a) => {
+    return a.findIndex(x => x.header === v.header) === i && (v.value !== undefined || v.property !== undefined);
+  });
+
+  return additional;
+} 
+
 
 const
   VEEVA_YES = 'YES',
@@ -200,7 +224,7 @@ function createPresentationRow(headers: string[], config: IVeevaConfig, addition
     addColumn(headers, row, header, presentation[key as keyof IVeevaClmBinderFields]);
   }
   additional?.forEach((a) => {
-    addColumn(headers, row, a.header, a.property ? presentation[a.property as keyof typeof presentation] : a.value)
+    addColumn(headers, row, a.header, a.value ?? (presentation as any)[a.property as string]);
   });
   return row;
 }
@@ -241,7 +265,7 @@ function createSlideRow(headers: string[], config: IVeevaConfig, slide: IVeevaCo
     addColumn(headers, row, header, slide[key as keyof IVeevaClmBinderFields] ?? config.presentation.slideSettings?.[key as keyof IVeevaClmBinderFields] ?? config.slideSettings?.[key as keyof IVeevaClmBinderFields]);
   }
   additional?.forEach((a) => {
-    addColumn(headers, row, a.header, a.property ? slide[a.property as keyof typeof slide] : a.value)
+    addColumn(headers, row, a.header, a.value ?? (slide as any)[a.property as string]);
   });
   return row; 
 }
@@ -269,7 +293,7 @@ function createSharedRow(headers: string[], config: IVeevaConfig, additional?: A
     addColumn(headers, row, header, shared[key as keyof IVeevaClmBinderFields] ?? config.presentation.slideSettings?.[key as keyof IVeevaClmBinderFields] ?? config.slideSettings?.[key as keyof IVeevaClmBinderFields]);
   }
   additional?.forEach((a) => {
-    addColumn(headers, row, a.header, a.property ? shared[a.property as keyof typeof shared] : a.value)
+    addColumn(headers, row, a.header, a.value ?? (shared as any)[a.property as string]);
   });
   return row; 
 }

package/src/tasks/deploy.ts

@@ -12,7 +12,7 @@ import copyFiles from './copy-files.js';
 import generateThumbs from './generate-thumbs.js';
 import updateShared from './update-shared.js';
 import createZips from './create-zips.js';
-import createCsv from './create-csv.js';
+import createCsv, { type AdditionalFields } from './create-csv.js';
 
 const argv = parseArgv({ 
   mode: 'string', 
@@ -27,8 +27,9 @@ interface Opts {
   env: string;
   csvOnly?: boolean;
   serverPort?: number;
+  additionalCsvFields?: AdditionalFields;
 }
-export default async function({ root, config, env, csvOnly = false, serverPort = 4320 }: Opts) {
+export default async function({ root, config, env, csvOnly = false, serverPort = 4320, additionalCsvFields }: Opts) {
   const rootDir = root ?? process.cwd();
   // we could import the astro config and see if the outDir was set but right now it's not necessary
   const astroConfig = await getAstroConfig(root);
@@ -70,7 +71,7 @@ export default async function({ root, config, env, csvOnly = false, serverPort =
     await createZips({ config, deployDir });
   }
 
-  await createCsv({ config, deployDir, buildName, fieldsOnly: csvOnly })
+  await createCsv({ config, deployDir, buildName, fieldsOnly: csvOnly, additionalFields: additionalCsvFields })
 }