ti2-tourplan 1.0.19 → 1.0.21

package/index.js

@@ -33,9 +33,9 @@ const getHeaders = ({ length }) => ({
   'Content-Length': length,
 });
 const wildcardMatch = (wildcard, str) => {
-  const w = wildcard.replace(/[.+^${}()|[\]\\]/g, '\\$&'); // regexp escape
-  const re = new RegExp(`^${w.replace(/\*/g, '.*').replace(/\?/g, '.')}$`, 'i');
-  return re.test(str); // remove last 'i' above to have case sensitive
+  const w = wildcard.replace(/\s/g, '').replace(/[.+^${}()|[\]\\]/g, '\\$&'); // regexp escape
+  const re = new RegExp(`${w.replace(/\*/g, '.*').replace(/\?/g, '.')}`, 'i');
+  return re.test(str.replace(/\s/g, ''));
 };
 class Plugin {
   constructor(params = {}) { // we get the env variables from here
@@ -85,23 +85,24 @@ class Plugin {
       data = data.replace(xmlOptions.dtd.name, `Request SYSTEM "${xmlOptions.dtd.name}"`);
       let replyObj;
       let errorStr;
-      if (this.xmlProxyUrl) {
-        // use pyfilematch xmlproxy
-        try {
-          replyObj = R.path(['data'], await axios({
-            method: 'post',
-            url: `${this.xmlProxyUrl}/xmlproxy`,
-            data: {
-              url: endpoint,
-              data,
-              headers: getHeaders({ length: `${data.length}` }),
-            },
-          }));
-        } catch (err) {
-          console.log('error in calling pyfilematch xmlproxy', err);
-          errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
-        }
-      }
+      // can't use proxy because of the static IP thing, darn
+      // if (this.xmlProxyUrl) {
+      //   // use pyfilematch xmlproxy
+      //   try {
+      //     replyObj = R.path(['data'], await axios({
+      //       method: 'post',
+      //       url: `${this.xmlProxyUrl}/xmlproxy`,
+      //       data: {
+      //         url: endpoint,
+      //         data,
+      //         headers: getHeaders({ length: `${data.length}` }),
+      //       },
+      //     }));
+      //   } catch (err) {
+      //     console.log('error in calling pyfilematch xmlproxy', err);
+      //     errorStr = `error in calling pyfilematch xmlproxy: ${err}`;
+      //   }
+      // }
       if (!replyObj) {
         // in case of error /xmlproxy, fallback to call tourplan directly
         // and then use pyfilematch xml2json to parse the xml
@@ -313,8 +314,9 @@ class Plugin {
       hostConnectEndpoint,
       hostConnectAgentID,
       hostConnectAgentPassword,
+      configuration,
     },
-    payload: { optionId, productName },
+    payload: { optionId, productName, skipFilter },
   }) {
     const model = {
       OptionInfoRequest: {
@@ -343,6 +345,12 @@ class Plugin {
     if (replyObj === 'useFixture') {
       products = require('./__fixtures__/fullacoptionlist.json');
     } else {
+      const shouldFilter = Boolean(
+        productName
+        || (!skipFilter
+          && configuration
+          && configuration.productFilters),
+      );
       products = R.call(R.compose(
         R.map(optionsGroupedBySupplierId => {
           const supplierData = {
@@ -358,7 +366,7 @@ class Plugin {
         }),
         R.values,
         R.groupBy(R.path(['OptGeneral', 'SupplierId'])),
-        productName ? R.filter(o => {
+        shouldFilter ? R.filter(o => {
           const str = `${
             R.path(['OptGeneral', 'Description'], o)
           } ${
@@ -368,7 +376,13 @@ class Plugin {
           } ${
             R.path(['OptGeneral', 'SupplierName'], o)
           }`;
-          return wildcardMatch(productName, str);
+          if (productName) {
+            return wildcardMatch(productName, str);
+          }
+          if (configuration && configuration.productFilters) {
+            return configuration.productFilters.some(filter => wildcardMatch(filter, str));
+          }
+          return true;
         }) : R.identity,
         root => {
           const options = R.pathOr([], ['OptionInfoReply', 'Option'], root);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ti2-tourplan",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "Tourplan's TI2 Plugin",
   "main": "index.js",
   "scripts": {