[COM-28756]: update scarcity (#45)

* [COM-28756]: Update scarcity formatter * [COM-28756] Fix scarcity test cases --------- Co-authored-by: Patrick Hensley <[email protected]>
Squarespace · Jul 31, 2023 · 458f5bd · 458f5bd
1 parent 5689a36
commit 458f5bd
Show file tree

Hide file tree

Showing 6 changed files with 71 additions and 15 deletions.
diff --git a/core/src/main/resources/com/squarespace/template/plugins/platform/product-scarcity.html b/core/src/main/resources/com/squarespace/template/plugins/platform/product-scarcity.html
@@ -1,5 +1,11 @@
 {.repeated section scarcityTemplateViews}
-  <div class="product-scarcity"{.if scarcityShownByDefault}{.or} data-variant-attributes="{attributes|json|htmltag}" hidden{.end}>
-    {scarcityText|message qtyInStock:qtyInStock|htmltag}
-  </div>
-{.end}
+  {.equal? @index 1}
+    <div class="product-scarcity"{.if scarcityShownByDefault}{.or} data-variant-attributes="{attributes|json|htmltag}" hidden{.end}>
+      {scarcityText|message qtyInStock:qtyInStock|htmltag}
+    </div>
+  {.or}
+    <div class="product-scarcity"{.if attributes} data-variant-attributes="{attributes|json|htmltag}" hidden{.end}>
+      {scarcityText|message qtyInStock:qtyInStock|htmltag}
+    </div>
+  {.end}
+{.end}
diff --git a/core/src/test/java/com/squarespace/template/plugins/platform/CommerceFormattersTest.java b/core/src/test/java/com/squarespace/template/plugins/platform/CommerceFormattersTest.java
@@ -230,7 +230,8 @@ public void testProductScarcity() {
         "f-scarcity-not-enabled.html",
         "f-scarcity-default-shown.html",
         "f-scarcity-default-hidden.html",
-        "f-scarcity-default-shown-escape-html.html"
+        "f-scarcity-default-shown-escape-html.html",
+        "f-scarcity-default-shown-and-variants.html"
     );
   }
 

diff --git a/...c/test/resources/com/squarespace/template/plugins/platform/f-scarcity-default-hidden.html b/...c/test/resources/com/squarespace/template/plugins/platform/f-scarcity-default-hidden.html
@@ -27,10 +27,13 @@
 {item|product-scarcity}
 
 :OUTPUT
-<div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Red&quot;}" hidden>
-    Only 3 left!
-  </div>
+    <div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Red&quot;}" hidden>
+      Only 3 left!
+    </div>
+
+
+
+    <div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Blue&quot;}" hidden>
+      Only 7 left!
+    </div>
 
-  <div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Blue&quot;}" hidden>
-    Only 7 left!
-  </div>
diff --git a/...rces/com/squarespace/template/plugins/platform/f-scarcity-default-shown-and-variants.html b/...rces/com/squarespace/template/plugins/platform/f-scarcity-default-shown-and-variants.html
@@ -0,0 +1,46 @@
+:JSON
+{
+  "item": {
+    "id": "560c37c1a7c8465c4a71d99a"
+  },
+  "productMerchandisingContext": {
+    "560c37c1a7c8465c4a71d99a": {
+      "scarcityEnabled": true,
+      "scarcityTemplateViews": [{
+        "qtyInStock": 3
+      }, {
+        "qtyInStock": 10,
+        "attributes": {
+          "Color": "Blue"
+        }
+      }, {
+        "qtyInStock": 2,
+        "attributes": {
+          "Color": "Green"
+        }
+      }],
+      "scarcityText": "Only {qtyInStock} left!",
+      "scarcityShownByDefault": true
+    }
+  }
+}
+
+:TEMPLATE
+{item|product-scarcity}
+
+:OUTPUT
+    <div class="product-scarcity">
+      Only 3 left!
+    </div>
+
+
+
+    <div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Blue&quot;}" hidden>
+      Only 10 left!
+    </div>
+
+
+
+    <div class="product-scarcity" data-variant-attributes="{&quot;Color&quot;:&quot;Green&quot;}" hidden>
+      Only 2 left!
+    </div>
diff --git a/...urces/com/squarespace/template/plugins/platform/f-scarcity-default-shown-escape-html.html b/...urces/com/squarespace/template/plugins/platform/f-scarcity-default-shown-escape-html.html
@@ -23,5 +23,5 @@
 
 :OUTPUT
 <div class="product-scarcity">
-    Only 3 left! &lt;img src=x&gt;
-  </div>
+      Only 3 left! &lt;img src=x&gt;
+    </div>
diff --git a/...rc/test/resources/com/squarespace/template/plugins/platform/f-scarcity-default-shown.html b/...rc/test/resources/com/squarespace/template/plugins/platform/f-scarcity-default-shown.html
@@ -23,5 +23,5 @@
 
 :OUTPUT
 <div class="product-scarcity">
-    Only 3 left!
-  </div>
+      Only 3 left!
+    </div>