feat: adapt to divaservices-utils decorators

Author: pyphilia

src/js/constants/globals.js

@@ -1,42 +1,26 @@
-import xml2js from "xml2js";
-import { INPUTS_DATA_XML_FILEPATH } from "../../config";
 import { Decorators } from "divaservices-utils";
-import { dataTestDecorator } from "./dataTestDecorator";
 import { getServicesAPI } from "../api/requests";
 
 export let webservices;
 export let dataInputs;
 
-const createXml2jsPromise = xml => {
-  return new Promise((resolve, reject) => {
-    xml2js.parseString(xml, async (err, data) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(data);
-      }
-    });
-  });
-};
-
 const _initWebservices = async () => {
   const xml = await getServicesAPI();
-  const data = await createXml2jsPromise(xml);
-  webservices = Decorators.webservicesDecorator(data);
+  webservices = await Decorators.webservicesDecorator(xml);
 };
 
-const _initDataInputs = async () => {
-  const inputDataFilePath = INPUTS_DATA_XML_FILEPATH;
-  const inputDataXml = (await import(`!!raw-loader!../../${inputDataFilePath}`))
-    .default;
-  const dataTest = await createXml2jsPromise(inputDataXml);
-  dataInputs = dataTestDecorator(dataTest);
-};
+// const _initDataInputs = async () => {
+//   const inputDataFilePath = INPUTS_DATA_XML_FILEPATH;
+//   const inputDataXml = (await import(`!!raw-loader!../../${inputDataFilePath}`))
+//     .default;
+//   const dataTest = await createXml2jsPromise(inputDataXml);
+//   dataInputs = dataTestDecorator(dataTest);
+// };
 
 // init webservices from xml file
 export const initWebservices = async () => {
   await _initWebservices();
-  await _initDataInputs();
+  // await _initDataInputs();
 };
 
 export const getWebserviceByName = name => {

yarn.lock

@@ -2747,10 +2747,11 @@ diffie-hellman@^5.0.0:
 
 "divaservices-utils@https://github.com/pyphilia/divaservices-utils":
   version "1.0.0"
-  resolved "https://github.com/pyphilia/divaservices-utils#5569f81d673d4902431710e455ef60d673d022d7"
+  resolved "https://github.com/pyphilia/divaservices-utils#927c7c5d70d197fae055593466a4dd210990c6f3"
   dependencies:
     eslint "^6.6.0"
     prettier "^1.19.1"
+    xml2js "^0.4.22"
 
 dns-equal@^1.0.0:
   version "1.0.0"
@@ -8172,7 +8173,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
 
-util.promisify@^1.0.0:
+util.promisify@^1.0.0, util.promisify@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
   integrity sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==
@@ -8573,6 +8574,20 @@ xml2js@^0.4.19:
     sax ">=0.6.0"
     xmlbuilder "~9.0.1"
 
+xml2js@^0.4.22:
+  version "0.4.22"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.22.tgz#4fa2d846ec803237de86f30aa9b5f70b6600de02"
+  integrity sha512-MWTbxAQqclRSTnehWWe5nMKzI3VmJ8ltiJEco8akcC6j3miOhjjfzKum5sId+CWhfxdOs/1xauYr8/ZDBtQiRw==
+  dependencies:
+    sax ">=0.6.0"
+    util.promisify "~1.0.0"
+    xmlbuilder "~11.0.0"
+
+xmlbuilder@~11.0.0:
+  version "11.0.1"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3"
+  integrity sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==
+
 xmlbuilder@~9.0.1:
   version "9.0.7"
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"