@yousolution/node-red-contrib-you-sap-service-layer 0.1.1 → 0.2.2

package/nodes/patchSap.html

@@ -1,88 +1,94 @@
 <script type="text/javascript">
-  RED.nodes.registerType('patchSap',{
+  RED.nodes.registerType('patchSap', {
     category: 'Sap',
     color: '#FFC300',
     defaults: {
-      name: {value: ''},
-      method: {value: 'PATCH'},
-      entity: {value: ''},
-      udo: {value: ''},
-      udt: {value: ''},
-      entityId: {value: ''},
-      docEntry: {value: ''},
-      code: {value: ''},
-      headers: {value: ''},
-      bodyPatch: {value: ''}
+      name: { value: '' },
+      method: { value: 'PATCH' },
+      entity: { value: '' },
+      udo: { value: '' },
+      udt: { value: '' },
+      entityId: { value: '' },
+      docEntry: {
+        value: '',
+        validate: (v) => true,
+      },
+      code: {
+        value: '',
+        validate: (v) => true,
+      },
+      headers: { value: '' },
+      bodyPatch: { value: '' },
     },
-    inputs:1,
-    outputs:1,
+    inputs: 1,
+    outputs: 1,
     icon: 'font-awesome/fa-pencil-square',
-    label: function() {
-      return this.name||"Sap patch";
+    label: function () {
+      return this.name || 'Sap patch';
     },
-    oneditprepare: function() {
-      $("#node-input-entityId").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-entityId-type",
-        value: 'entityId'
+    oneditprepare: function () {
+      $('#node-input-entityId').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-entityId-type',
+        value: 'entityId',
       });
 
-      $("#node-input-docEntry").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-docEntry-type",
-        value: 'docEntry'
+      $('#node-input-docEntry').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-docEntry-type',
+        value: 'docEntry',
       });
 
-      $("#node-input-code").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-code-type",
-        value: 'code'
+      $('#node-input-code').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-code-type',
+        value: 'code',
       });
 
-      $("#node-input-headers").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-headers-type",
-        value: 'headers'
+      $('#node-input-headers').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-headers-type',
+        value: 'headers',
       });
 
-      $("#node-input-bodyPatch").typedInput({
-        type:"msg",
-        types:["msg"],
-        typeField: "#node-input-bodyPatch-type",
-        value: 'bodyPatch'
+      $('#node-input-bodyPatch').typedInput({
+        type: 'msg',
+        types: ['msg'],
+        typeField: '#node-input-bodyPatch-type',
+        value: 'bodyPatch',
       });
 
-      jQuery("#node-input-entity").change(function() {
+      jQuery('#node-input-entity').change(function () {
         jQuery('#container-udo').hide();
         jQuery('#container-docEntry').hide();
         jQuery('#container-udt').hide();
         jQuery('#container-code').hide();
         jQuery('#container-entityId').hide();
 
-        if (jQuery(this).val() === 'UDO'){ 
+        if (jQuery(this).val() === 'UDO') {
           jQuery('#container-udo').show();
           jQuery('#container-docEntry').show();
-        } 
-        if (jQuery(this).val() === 'UDT'){ 
+        }
+        if (jQuery(this).val() === 'UDT') {
           jQuery('#container-udt').show();
           jQuery('#container-code').show();
-        } 
-        if(jQuery(this).val() !== 'UDO' && jQuery(this).val() !== 'UDT') {
+        }
+        if (jQuery(this).val() !== 'UDO' && jQuery(this).val() !== 'UDT') {
           jQuery('#container-entityId').show();
         }
       });
-    }
+    },
   });
 </script>
-  
+
 <script type="text/html" data-template-name="patchSap">
   <div class="form-row">
     <label for="node-input-name"><i class="fa fa-tag"></i> Name</label>
-    <input type="text" id="node-input-name" placeholder="Name">
+    <input type="text" id="node-input-name" placeholder="Name" />
   </div>
 
   <div class="form-row">
@@ -339,96 +345,80 @@
     </select>
   </div>
 
-  <div class="form-row" style="display:none" id="container-UDO">
+  <div class="form-row" style="display:none" id="container-udo">
     <label for="node-input-udo"><i class="fa fa-tag"></i> UDO</label>
-    <input type="text" id="node-input-udo" placeholder="UDO Name">
+    <input type="text" id="node-input-udo" placeholder="UDO Name" />
   </div>
 
-  <div class="form-row" style="display:none" id="container-UDT">
+  <div class="form-row" style="display:none" id="container-udt">
     <label for="node-input-udt"><i class="fa fa-tag"></i> UDT</label>
-    <input type="text" id="node-input-udt" placeholder="UDT Name">
+    <input type="text" id="node-input-udt" placeholder="UDT Name" />
   </div>
 
   <div class="form-row" style="display:none" id="container-entityId">
     <label for="node-input-type"><i class="fa fa-key"></i> EntityId</label>
-    <input type="text" id="node-input-entityId">
-    <input type="hidden" id="node-input-entityId-type">
+    <input type="text" id="node-input-entityId" />
+    <input type="hidden" id="node-input-entityId-type" />
   </div>
 
   <div class="form-row" style="display:none" id="container-docEntry">
     <label for="node-input-type"><i class="fa fa-gears"></i> DocEntry</label>
-    <input type="text" id="node-input-docEntry">
-    <input type="hidden" id="node-input-docEntry-type">
+    <input type="text" id="node-input-docEntry" placeholder="DocEntry" />
+    <input type="hidden" id="node-input-docEntry-type" />
   </div>
 
   <div class="form-row" style="display:none" id="container-code">
     <label for="node-input-type"><i class="fa fa-gears"></i> Code</label>
-    <input type="text" id="node-input-code">
-    <input type="hidden" id="node-input-code-type">
+    <input type="text" id="node-input-code" />
+    <input type="hidden" id="node-input-code-type" />
   </div>
 
   <div class="form-row">
     <label for="node-input-type"><i class="fa fa-gears"></i> Headers</label>
-    <input type="text" id="node-input-headers">
-    <input type="hidden" id="node-input-headers-type">
+    <input type="text" id="node-input-headers" />
+    <input type="hidden" id="node-input-headers-type" />
   </div>
-  
+
   <div class="form-row">
     <label for="node-input-type"><i class="fa fa-gears"></i> BodyPatch</label>
-    <input type="text" id="node-input-bodyPatch">
-    <input type="hidden" id="node-input-bodyPatch-type">
+    <input type="text" id="node-input-bodyPatch" />
+    <input type="hidden" id="node-input-bodyPatch-type" />
   </div>
 </script>
-  
+
 <!-- Documentation -->
 <script type="text/html" data-help-name="patchSap">
   <p>Patch action</p>
-  
+
   <h3>Inputs</h3>
       <dl class="message-properties">
-          <dt>Name
-            <span class="property-type">string</span>
-          </dt>
-          <dd> the node's name </dd>
-          <dt>Entity
-            <span class="property-type">string</span>
-          </dt>
-          <dd> the entity name of SAP </dd>
-          <dt>entityId
-            <span class="property-type">number | string</span>
-          </dt>
-          <dd> the id of the entity of SAP </dd>
-          <dt>bodyPatch
-            <span class="property-type">object</span>
-          </dt>
-          <dd> data to update to the entity </dd>
+        <dt>payload <span class="property-type">string</span></dt>
+        <dd>the standard output of the command.</dd>
       </dl>
-  
-   <h3>Outputs</h3>
-       <ol class="node-ports">
-           <li>Standard output
-               <dl class="message-properties">
-                   <dt>payload <span class="property-type">string</span></dt>
-                   <dd>the standard output of the command.</dd>
-               </dl>
-           </li>
-       </ol>
-  
+    </li>
+  </ol>
+
   <h3>Details</h3>
-      <p>this node is used to update the entity of SAP.
-        See the examples to understand how to use it.
-      </p>
-      <!-- <p><code>msg.payload</code> is used as the payload of the published message.
+  <p>this node is used to update the entity of SAP. See the examples to understand how to use it.</p>
+  <!-- <p><code>msg.payload</code> is used as the payload of the published message.
       If it contains an Object it will be converted to a JSON string before being sent.
       If it contains a binary Buffer the message will be published as-is.</p>
       <p>The topic used can be configured in the node or, if left blank, can be set
       by <code>msg.topic</code>.</p>
       <p>Likewise the QoS and retain values can be configured in the node or, if left
       blank, set by <code>msg.qos</code> and <code>msg.retain</code> respectively.</p> -->
-  
+
   <h3>References</h3>
-      <ul>
-          <li><a href="https://sap-samples.github.io/smb-summit-hackathon/b1sl.html" target="_black">Service layer API docs</a> - for more details </li>
-          <li><a href="https://github.com/yousolution-cloud/node-red-contrib-you-sap-service-layer">@yousolution-cloud/node-red-contrib-you-sap-service-layer</a> - the nodes github repository</li>
-      </ul>
-</script>
+  <ul>
+    <li>
+      <a href="https://sap-samples.github.io/smb-summit-hackathon/b1sl.html" target="_black">Service layer API docs</a>
+      - for more details
+    </li>
+    <li>
+      <a href="https://github.com/yousolution-cloud/node-red-contrib-you-sap-service-layer"
+        >@yousolution-cloud/node-red-contrib-you-sap-service-layer</a
+      >
+      - the nodes github repository
+    </li>
+  </ul>
+</script>

package/nodes/patchSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 
 module.exports = function (RED) {
   function PatchSapNode(config) {
@@ -23,10 +24,12 @@ module.exports = function (RED) {
         const options = { method: 'PATCH', hasRawQuery: false, hasEntityId: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result.data;
+        msg.payload = VerifyErrorSL(node, msg, result.data, true);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(result.status <= 205) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/serviceSap.js

@@ -1,6 +1,7 @@
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = '0';
 const axios = require('axios');
 const Support = require('./support');
+const { VerifyErrorSL } = require('./manageErrors');
 const services = require('../resources/services.json');
 
 module.exports = function (RED) {
@@ -15,18 +16,15 @@ module.exports = function (RED) {
       node.status({});
       try {
         const data = msg[config.bodyPost];
-        // if (!data) {
-        //   node.status({ fill: 'red', shape: 'dot', text: 'bodyPost must have value' });
-        //   done(new Error('bodyPost must have value'));
-        //   return;
-        // }
         const options = { method: 'POST', hasRawQuery: false, isService: true, data: data };
         const login = Support.login;
         const result = await Support.sendRequest({ node, msg, config, axios, login, options });
-        msg.payload = result;
+        msg.payload = VerifyErrorSL(node, msg, result.data);//result.data;
         msg.statusCode = result.status;
-        node.status({ fill: 'green', shape: 'dot', text: 'success' });
-        node.send(msg);
+        if(msg.payload) {
+          node.status({ fill: 'green', shape: 'dot', text: 'success' });
+          node.send(msg);
+        }
       } catch (error) {
         node.status({ fill: 'red', shape: 'dot', text: 'Error' });
         done(error);

package/nodes/support.js

@@ -7,6 +7,7 @@ const thickIdApi = [
   'AssetClasses',
   'AssetDepreciationGroups',
   'AssetGroups',
+  'AlternateCatNum',
   'BankChargesAllocationCodes',
   'BusinessPartners',
   'CampaignResponseType',
@@ -83,12 +84,7 @@ async function login(node, idAuth) {
       'Content-Length': dataString.length,
     },
   };
-
-  // try {
   return await axiosLibrary(options);
-  // } catch (error) {
-  //   throw Error(`ERROR FUNCTION LOGIN: ${error}`);
-  // }
 }
 
 async function sendRequest({ node, msg, config, axios, login, options }) {
@@ -124,10 +120,13 @@ async function sendRequest({ node, msg, config, axios, login, options }) {
           msg.statusCode = error.response.status;
           msg.payload = error.response.data;
           msg.requestUrl = requestOptions.axiosOptions.url;
-          node.send(msg);
-          throw new Error(JSON.stringify(error.response.data));
+          //node.send(msg);
+          node.error(JSON.stringify(error.response.data), msg);
+          //throw new Error(JSON.stringify(error.response.data));
+        }
+        else {
+          throw error;
         }
-        throw error;
       }
       // }
     }
@@ -135,10 +134,14 @@ async function sendRequest({ node, msg, config, axios, login, options }) {
       msg.statusCode = error.response.status;
       msg.payload = error.response.data;
       msg.requestUrl = requestOptions.axiosOptions.url;
-      node.send(msg);
-      throw new Error(JSON.stringify(error.response.data));
+      //node.send(msg);
+      node.error(JSON.stringify(error.response.data), msg)
+     // throw new Error(JSON.stringify(error.response.data));
+    }
+    else {
+      throw error;
     }
-    throw error;
+
   }
 }
 
@@ -252,7 +255,13 @@ function generateRequest(node, msg, config, options) {
     }
 
     if (thickIdApi.includes(entity) || config.entity === 'UDT') {
-      url = `https://${host}:${port}/b1s/${version}/${entity}('${entityId}')`;
+      if(Number.isInteger(entityId)){
+        url = `https://${host}:${port}/b1s/${version}/${entity}(${entityId})`;
+      }
+      else {
+        url = `https://${host}:${port}/b1s/${version}/${entity}('${entityId}')`;
+      }
+      
     } else {
       url = `https://${host}:${port}/b1s/${version}/${entity}(${entityId})`;
     }

package/package.json

@@ -1,10 +1,13 @@
 {
   "name": "@yousolution/node-red-contrib-you-sap-service-layer",
-  "version": "0.1.1",
+  "version": "0.2.2",
   "description": "Unofficial module SAP Service Layer for NODE-RED",
   "license": "MIT",
   "scripts": {
-    "update": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
+    "update": "run-script-os",
+    "update:linux:darwin": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
+    "update:win32": "npm pack && copy yousolution-node-red-contrib-you-sap-service-layer-%npm_package_version%.tgz .\\data\\ && cd .\\data\\ && npm i yousolution-node-red-contrib-you-sap-service-layer-%npm_package_version%.tgz && docker-compose restart",
+    "update:default": "npm pack && mv yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz ./data && cd data && npm i yousolution-node-red-contrib-you-sap-service-layer-$npm_package_version.tgz && docker-compose restart",
     "test": "mocha 'test/**/*.spec.js'",
     "coverage": "nyc npm run test"
   },
@@ -37,8 +40,8 @@
     }
   },
   "dependencies": {
-    "axios": "^0.23.0",
-    "odata-query": "^6.7.1"
+    "axios": "^1.2.2",
+    "odata-query": "^7.0.4"
   },
   "repository": {
     "type": "git",
@@ -56,6 +59,7 @@
     "node-red": "^2.1.4",
     "node-red-node-test-helper": "^0.2.7",
     "nyc": "^15.1.0",
+    "run-script-os": "^1.1.6",
     "sinon": "^12.0.1"
   }
 }

package/resources/services.json

@@ -200,7 +200,7 @@
   "NFModelsService": ["NFModelsService_GetList"],
   "NFTaxCategoriesService": ["NFTaxCategoriesService_GetList"],
   "OccurrenceCodesService": ["OccurrenceCodesService_GetList"],
-  "OrdersService": ["OrdersService_GetApprovalTemplates", "OrdersService_HandleApprovalRequest"],
+  "OrdersService": ["OrdersService_GetApprovalTemplates", "OrdersService_Preview" ,"OrdersService_HandleApprovalRequest"],
   "PartnersSetupsService": ["PartnersSetupsService_GetList"],
   "PaymentBlocksService": ["PaymentBlocksService_GetPaymentBlockList"],
   "PaymentCalculationService": ["PaymentCalculationService_GetPaymentAmount"],