update cds-plugin to simpler annotations

Author: SirSimon04

cds-plugin.js

@@ -1,9 +1,13 @@
 const {
     getFieldsHoldingPrintConfig,
-    getAnnotatedParamsOfAction
+    getAnnotatedParamsOfAction,
+    getPrintParamsAttributeFromAction
 } = require('./lib/annotation-helper');
 
 const cds = require('@sap/cds');
+const LOG = cds.log('print');
+
+const PRINT = "@print";
 
 cds.once("served", async () => {
     // Iterate over all services
@@ -24,35 +28,43 @@ cds.once("served", async () => {
                 });
             }
 
-            // Track the fields holding print configurations
-            await getFieldsHoldingPrintConfig(entity);
+            if(!entity.actions) continue
 
-            // Check if the entity has actions
-            if (entity.actions) {
-                let actionsArray;
+            for(const action of entity.actions) {
+                if(action[PRINT]) {
 
-                // Convert actions to an array if it's an object
-                if (Array.isArray(entity.actions)) {
-                  actionsArray = entity.actions;
-                } else if (typeof entity.actions === 'object') {
-                  actionsArray = Object.values(entity.actions);
-                }
+                    const printer = await cds.connect.to("print");
+
+                    const { numberOfCopiesAttribute, queueIDAttribute, fileNameAttribute, contentAttribute } = getPrintParamsAttributeFromAction(entity, action);
+
+                    srv.on(action.name, entity, async (req) => {
+
+
+                        const numberOfCopies = req.data[numberOfCopiesAttribute];
+                        const queueID = req.data[queueIDAttribute];
 
-                // Iterate over all bound actions
-                for (let boundAction of actionsArray) {
-                    if(boundAction['@print']) {
-                        
-                        // Track the action parameters holding print configurations
-                        getAnnotatedParamsOfAction(boundAction);
-
-                        const actionName = boundAction.name.split('.').pop();
-
-                        // Register for print related handling
-                         const printer = await cds.connect.to("print");
-                        srv.after(actionName, async (results, req) => {
-                            return printer.print(req);
-                        });
-                    }
+                        const object = await SELECT.one.from(req.subject).columns([fileNameAttribute, contentAttribute]);
+
+                        try {
+
+                            await printer.print({
+                                qname: queueID, 
+                                numberOfCopies: numberOfCopies,
+                                docsToPrint: [{
+                                    fileName: object[fileNameAttribute],
+                                    content: object[contentAttribute].toString('base64'),
+                                    isMainDocument: true
+                                }]
+                            })
+
+                        }
+                        catch (error) {
+                            LOG.error(error)
+                            req.reject(500, `Printing failed: ${error.message ?? "Unknown error"}`);
+                        }
+
+
+                    });
                 }
             }
         }

lib/annotation-helper.js

@@ -1,23 +1,6 @@
 const fieldsHoldingPrintConfig = new Map();
 const annotatedParametersOfAction = new Map();
-
-/**
- * This method captures annotated fields of an entity.
- * Fields of entity which are annotated to be used in specific action are stored in actionSpecificConfigFields.
- * Rest of the annotated fields are stored in genericConfigFields.
- * @param {Object} entity - The entity object containing elements to be processed.
- * @returns {Map} - A map containing the fields holding print configuration.
- */
-const getFieldsHoldingPrintConfig = async function(entity) {
-    const {genericConfigFields, actionSpecificConfigFields} = extractFieldsHoldingPrintConfig(entity.elements);
-    if (Object.keys(genericConfigFields).length > 0 || Object.keys(actionSpecificConfigFields).length > 0) {
-        fieldsHoldingPrintConfig.set(entity.name, {
-            genericConfigFields,
-            actionSpecificConfigFields
-        });
-    }
-    return fieldsHoldingPrintConfig;
-}
+const cds = require('@sap/cds');
 
 /**
  * This method captures annotated parameters of an action.
@@ -293,9 +276,31 @@ function getQueueValueHelpEntity(entity) {
     }
 }
 
+function getPrintParamsAttributeFromAction(entity, action) {
+
+    const copiesElement = Object.values(action.params).find(el => el['@print.numberOfCopies']);
+    const queueElement = Object.values(action.params).find(el => el['@print.queue']);
+
+    const fileName = Object.values(entity.elements).find(el => el['@print.fileName']);
+    const content = Object.values(entity.elements).find(el => el['@print.fileContent']);
+
+
+    if(!copiesElement || !queueElement, !fileName || !content) {
+        cds.error(`Print action ${action.name} is missing required annotations. Make sure @print.numberOfCopies, @print.queue are present in the action and @print.fileName and @print.fileContent are present in the entity.`);
+    }
+
+    return {
+        numberOfCopiesAttribute: copiesElement.name,
+        queueIDAttribute: queueElement.name,
+        fileNameAttribute: fileName.name,
+        contentAttribute: content.name
+    };
+}
+
+
 module.exports = {
-    getFieldsHoldingPrintConfig,
     getAnnotatedParamsOfAction,
     getPrintConfigFromActionOrEntity,
-    getQueueValueHelpEntity
+    getQueueValueHelpEntity,
+    getPrintParamsAttributeFromAction
 }

srv/printToConsole.js

@@ -50,8 +50,9 @@ module.exports = class PrintToConsole extends PrintService {
         LOG.info(`\nDocument ${index + 1}: ${doc.fileName}`);
         LOG.info('-------------------------------');        
         // Decode base64 content and display
+        // Add following lines to show Base64
         // const content = Buffer.from(doc.content, 'base64').toString('utf-8');
-        console.log(doc.content);
+        // console.log({ content });
 
         LOG.info('-------------------------------\n');
       });