@adobe/acc-js-sdk 1.1.31 → 1.1.33

package/docs/changeLog.html

@@ -3,6 +3,20 @@ layout: page
 title: Change Log
 ---
 
+<section class="changelog"><h1>Version 1.1.33</h1>
+  <h2>2023/07/08</h2>
+  <li>
+    Because of a server-side bug, there could be shemas with multiple copies of an enumeration. Make sure the SDK will not fail loading such schemas (only the first copy of the enumeration will be considered)
+  </li>
+</section>
+
+<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>

package/package-lock.json

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@adobe/acc-js-sdk",
-  "version": "1.1.31",
+  "version": "1.1.33",
   "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;
+                    }
                 }
             }
         }
@@ -1216,7 +1224,9 @@ class XtkSchema extends XtkSchemaNode {
          this.enumerations = new ArrayMap();
          for (var child of EntityAccessor.getChildElements(xml, "enumeration")) {
              const e = new XtkEnumeration(this.id, child);
-             this.enumerations._push(e.shortName, e);
+             if (this.enumerations.get(e.shortName) === undefined) {
+                 this.enumerations._push(e.shortName, e);
+             }
          }
      }
 

package/test/application.test.js

@@ -345,6 +345,19 @@ describe('Application', () => {
                 expect(enumerations[1].label).toBe("Status code");
             });
 
+            it("Should support duplicate  enumerations", () => {
+                var xml = DomUtil.parse(`<schema namespace='nms' name='recipient'>
+                                            <enumeration name="duplicated" basetype="byte"/>
+                                            <enumeration name="duplicated" basetype="byte"/>
+                                            <element name='recipient' label='Recipients'></element>
+                                        </schema>`);
+                var schema = newSchema(xml);
+                var enumerations = schema.enumerations;
+                expect(enumerations.duplicated.dummy).toBeFalsy();
+                expect(enumerations[0].label).toBe("Duplicated");
+                expect(enumerations[1]).toBeUndefined();
+            });
+
             it("Should test images", () => {
                 var xml = DomUtil.parse(`<schema namespace='nms' name='recipient'>
                                             <enumeration name="gender" basetype="byte">
@@ -2096,7 +2109,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 +2143,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", () => {