@adobe/acc-js-sdk 1.1.30 → 1.1.32

package/docs/changeLog.html

@@ -3,6 +3,21 @@ layout: page
 title: Change Log
 ---
 
+<section class="changelog"><h1>Version 1.1.32</h1>
+  <h2>2023/06/22</h2>
+  <li>
+    Support the fact that "translatedDefault" can be an element in a schema (and not just an attribute)
+  </li>
+</section>
+
+<section class="changelog"><h1>Version 1.1.31</h1>
+  <h2>2023/06/19</h2>
+  <li>
+    Fixed a caching issue: xtk:session method can be missing from the cache. This is a temporary fix. A better fix is needed to
+    properly handle consistency of the entity and method caches.
+  </li>
+</section>
+
 <section class="changelog"><h1>Version 1.1.30</h1>
   <h2>2023/06/19</h2>
   <li>

package/package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.30",
+  "version": "1.1.32",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@adobe/acc-js-sdk",
-      "version": "1.1.30",
+      "version": "1.1.32",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.2.1",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.30",
+  "version": "1.1.32",
   "description": "ACC Javascript SDK",
   "main": "src/index.js",
   "homepage": "https://github.com/adobe/acc-js-sdk#readme",

package/src/application.js

@@ -652,14 +652,22 @@ class XtkSchemaNode {
                 this.expr = EntityAccessor.getAttributeAsString(child, "expr");
                 this.isCalculated = false;
             }
-            if (child.tagName === "default") {
+            if (child.tagName === "default" || child.tagName === "translatedDefault") {
                 if(this.unbound) {
                     // Default value for a collection of elements
                     const xml = DomUtil.parse(`<xml>${child.textContent}</xml>`);
                     const json = DomUtil.toJSON(xml);
-                    this.default = XtkCaster.asArray(json[this.name]);
+                    if(child.tagName === "translatedDefault") {
+                        this.translatedDefault = XtkCaster.asArray(json[this.name]);
+                    } else {
+                        this.default = XtkCaster.asArray(json[this.name]);
+                    }
                 } else {
-                    this.default = child.textContent;
+                    if(child.tagName === "translatedDefault") {
+                        this.translatedDefault = child.textContent;
+                    } else {
+                        this.default = child.textContent;
+                    }
                 }
             }
         }

package/src/client.js

@@ -1787,8 +1787,11 @@ class Client {
                   if (entity) {
                       const impls = DomUtil.getAttributeAsString(entity, "implements");
                       if (impls === "xtk:persist" && schemaId !== "xtk:session" && schemaId !== "xtk:persist") {
-                        // Ensure xtk:persist is present by loading the xtk:session schema
-                        await this.getSchema("xtk:session", "xml", true);
+                          // Ensure xtk:persist is present by loading the xtk:session schema
+                          const xtkSession = await this.getSchema("xtk:session", "xml", true);
+                          // it is possible that methodCache content has not be loaded in memory
+                          // so we re-put the methods 
+                          await this._methodCache.put(xtkSession);
                       }
                       await this._entityCache.put("xtk:schema", schemaId, entity);
                       await this._methodCache.put(entity);

package/test/application.test.js

@@ -2096,7 +2096,23 @@ describe('Application', () => {
                 expect(node).toMatchObject({ name:"period", childrenCount:0, default: "\"m_abDay='7' m_abDay[0]='0' m_abDay[1]='0'\"" });
             });
 
-            it("Should extract translatedDefault", async () => {
+            it("Should extract translated default values of a memo", async () => {
+                var xml = DomUtil.parse(`<schema namespace='xtk' name='workflow'>
+                    <element name='workflow' label='Workflow'>
+                        <element name="directorywatcher" label="File collector">
+                            <element name="period" type="memo" label="Schedule">
+                                <translatedDefault>"m_abDay='7' m_abDay[0]='0' m_abDay[1]='0'"</translatedDefault>
+                            </element>
+                        </element>
+                    </element>
+                </schema>`);
+                var schema = newSchema(xml);
+
+                var node = await schema.root.findNode("directorywatcher/period");
+                expect(node).toMatchObject({ name:"period", childrenCount:0, translatedDefault: "\"m_abDay='7' m_abDay[0]='0' m_abDay[1]='0'\"" });
+            });
+
+            it("Should extract translatedDefault attribute", async () => {
                 var xml = DomUtil.parse(`<schema namespace='xtk' name='workflow'>
                     <element name='workflow' label='Workflow'>
                         <element name="delivery" label="Delivery">
@@ -2114,6 +2130,37 @@ describe('Application', () => {
                 expect(node).toMatchObject({ name:"@label", childrenCount:0, translatedDefault: "'Ok'" });
             });
 
+            it("Should extract translatedDefault element", async () => {
+                var xml = DomUtil.parse(`<schema namespace='xtk' name='workflow'>
+                    <element name='workflow' label='Workflow'>
+                        <element name="extract" label="Split">
+                            <element label="Transitions" name="transitions" xml="true">
+                                <element name="extractOutput" ordered="true" template="nms:workflow:extractOutput" unbound="true">
+                                     <translatedDefault>&lt;extractOutput enabled="true" label="Segment" name="subSet" &gt;
+                                     &lt;limiter type="percent" percent="10" random="true"/&gt;
+                                     &lt;filter enabled="true"/&gt;
+                                     &lt;/extractOutput&gt;</translatedDefault>
+                                </element>
+                            </element>
+                        </element>
+                    </element>
+                </schema>`);
+                var schema = newSchema(xml);
+
+                var node = await schema.root.findNode("extract/transitions/extractOutput");
+                expect(node).toMatchObject(
+                    { translatedDefault: [
+                        {
+                            enabled: "true", name:"subSet", 
+                            limiter: { 
+                                type: 'percent',
+                                percent: '10',
+                                random: 'true'
+                            }
+                        }] 
+                    });
+            });
+
         });
 
         describe("toString", () => {

package/test/client.test.js

@@ -965,6 +965,49 @@ describe('ACC Client', function () {
             await client.NLWS.xtkSession.logoff();
         });
 
+        it("Should always put in cache methods of schema to avoid a method is not found", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_USER_INFO_RESPONSE);
+            // call a method of xtk:session to have the schema xt:session in memory and in entityCache
+            await client.NLWS.xtkSession.getUserInfo();
+            
+            // simulate expiration of methodCache only (entityCache not expired)
+            client._methodCache.clear();
+
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_IMPL_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+            await client.NLWS.xtkImpl.Duplicate();
+
+            client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
+            await client.NLWS.xtkSession.logoff();
+        });
+
+        it("Should always put in memory methods of schema to avoid a method is not found", async () => {
+            const client = await Mock.makeClient();
+            client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);
+            await client.NLWS.xtkSession.logon();
+
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_USER_INFO_RESPONSE);
+            // call a method of xtk:session to have the schema xt:session in memory and in entityCache
+            await client.NLWS.xtkSession.getUserInfo();
+
+            // simulate empty cache method in memory
+            client._methodCache._cache = {};
+
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_IMPL_SCHEMA_RESPONSE);
+            client._transport.mockReturnValueOnce(Mock.GET_XTK_SESSION_SCHEMA_RESPONSE);
+            await client.NLWS.xtkImpl.Duplicate();
+
+            client._transport.mockReturnValueOnce(Mock.LOGOFF_RESPONSE);
+            await client.NLWS.xtkSession.logoff();
+        });
+
+
         it("Should fail if method parameter inout attribute is not correct", async () => {
             const client = await Mock.makeClient();
             client._transport.mockReturnValueOnce(Mock.LOGON_RESPONSE);

package/test/mock.js

@@ -219,6 +219,8 @@ const GET_XTK_SESSION_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
                 <interface name="persist">
                     <method name="NewInstance">
                     </method>
+                    <method name="Duplicate" static="true">
+                    </method>
                     <method name="Write" static="true">
                         <parameters>
                             <param name="doc" type="DOMDocument"/>
@@ -565,6 +567,19 @@ const GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?
     </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>`);
 
+const GET_XTK_IMPL_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
+    <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:wpp:default' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
+    <SOAP-ENV:Body>
+        <GetEntityIfMoreRecentResponse xmlns='urn:wpp:default' SOAP-ENV:encodingStyle='http://schemas.xmlsoap.org/soap/encoding/'>
+            <pdomDoc xsi:type='ns:Element' SOAP-ENV:encodingStyle='http://xml.apache.org/xml-soap/literalxml'>
+                <schema name="impl" namespace="xtk" xtkschema="xtk:schema" implements="xtk:persist">
+                    <element name="one"></element>
+                </schema>
+            </pdomDoc>
+        </GetEntityIfMoreRecentResponse>
+    </SOAP-ENV:Body>
+    </SOAP-ENV:Envelope>`);
+
 const GET_XTK_ALL_SCHEMA_RESPONSE = Promise.resolve(`<?xml version='1.0'?>
     <SOAP-ENV:Envelope xmlns:xsd='http://www.w3.org/2001/XMLSchema' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns:ns='urn:wpp:default' xmlns:SOAP-ENV='http://schemas.xmlsoap.org/soap/envelope/'>
     <SOAP-ENV:Body>
@@ -999,6 +1014,7 @@ exports.Mock = {
   GET_TSTCNX_RESPONSE: GET_TSTCNX_RESPONSE,
   GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE: GET_NMS_EXTACCOUNT_SCHEMA_RESPONSE,
   GET_XTK_ALL_SCHEMA_RESPONSE: GET_XTK_ALL_SCHEMA_RESPONSE,
+  GET_XTK_IMPL_SCHEMA_RESPONSE: GET_XTK_IMPL_SCHEMA_RESPONSE,
   GET_XTK_ALL_TYPES_RESPONSE: GET_XTK_ALL_TYPES_RESPONSE,
   GET_XTK_TYPE_UNSUPPORTED_TYPE_RESPONSE: GET_XTK_TYPE_UNSUPPORTED_TYPE_RESPONSE,
   GET_USER_INFO_RESPONSE: GET_USER_INFO_RESPONSE,