Merge pull request #151 from Shopify/ah.liquid-expansion-payment-delivery

andrewhassan · web-flow · commit 477a5ba7bbda · 2023-01-20T14:11:38.000-05:00
Add Liquid templating for payment and delivery apps
diff --git a/sample-apps/delivery-customizations/extensions/delivery-customization/input.graphql.liquid b/sample-apps/delivery-customizations/extensions/delivery-customization/input.graphql.liquid
@@ -12,7 +12,7 @@ query Input {
   }
   deliveryCustomization {
     metafield(
-      namespace: "delivery-customization"
+      namespace: "{{ app_name | replace: " ", "-" | downcase }}"
       key: "function-configuration"
     ) {
       value
diff --git a/sample-apps/delivery-customizations/web/index.js b/sample-apps/delivery-customizations/web/index.js
@@ -8,6 +8,7 @@ import shopify from "./shopify.js";
 import productCreator from "./product-creator.js";
 import GDPRWebhookHandlers from "./gdpr.js";
 import { GraphqlQueryError } from "@shopify/shopify-api";
+import metafields from "./metafields.js";
 
 const PORT = parseInt(process.env.BACKEND_PORT || process.env.PORT, 10);
 
@@ -58,7 +59,7 @@ app.get("/api/deliveryCustomization/:id", async (req, res) => {
         query: `query DeliveryCustomization($id: ID!) {
           deliveryCustomization(id: $id) {
             id
-            metafield(namespace: "delivery-customization", key: "function-configuration") {
+            metafield(namespace: "${metafields.namespace}", key: "${metafields.key}") {
               value
             }
           }
@@ -134,8 +135,8 @@ app.put("/api/deliveryCustomization/update", async (req, res) => {
           metafieldsSet(metafields: [
             {
               ownerId: $customizationId
-              namespace: "delivery-customization"
-              key: "function-configuration"
+              namespace: "${metafields.namespace}"
+              key: "${metafields.key}"
               value: $configurationValue
               type: "json"
             }
@@ -215,8 +216,8 @@ app.post("/api/deliveryCustomization/create", async (req, res) => {
           metafieldsSet(metafields: [
             {
               ownerId: $customizationId
-              namespace: "delivery-customization"
-              key: "function-configuration"
+              namespace: "${metafields.namespace}"
+              key: "${metafields.key}"
               value: $configurationValue
               type: "json"
             }
diff --git a/sample-apps/delivery-customizations/web/metafields.js.liquid b/sample-apps/delivery-customizations/web/metafields.js.liquid
@@ -0,0 +1,4 @@
+export default {
+  namespace: '{{ app_name | replace: " ", "-" | downcase }}',
+  key: "function-configuration",
+};
diff --git a/sample-apps/payment-customizations/extensions/payment-customization/input.graphql.liquid b/sample-apps/payment-customizations/extensions/payment-customization/input.graphql.liquid
@@ -12,7 +12,7 @@ query Input {
   }
   paymentCustomization {
     metafield(
-      namespace: "payment-customization"
+      namespace: "{{ app_name | replace: " ", "-" | downcase }}"
       key: "function-configuration"
     ) {
       value
diff --git a/sample-apps/payment-customizations/web/index.js b/sample-apps/payment-customizations/web/index.js
@@ -8,6 +8,7 @@ import shopify from "./shopify.js";
 import productCreator from "./product-creator.js";
 import GDPRWebhookHandlers from "./gdpr.js";
 import { GraphqlQueryError } from "@shopify/shopify-api";
+import metafields from "./metafields.js";
 
 const PORT = parseInt(process.env.BACKEND_PORT || process.env.PORT, 10);
 
@@ -58,7 +59,7 @@ app.get("/api/paymentCustomization/:id", async (req, res) => {
         query: `query PaymentCustomization($id: ID!) {
           paymentCustomization(id: $id) {
             id
-            metafield(namespace: "payment-customization", key: "function-configuration") {
+            metafield(namespace: "${metafields.namespace}", key: "${metafields.key}") {
               value
             }
           }
@@ -134,8 +135,8 @@ app.put("/api/paymentCustomization/update", async (req, res) => {
           metafieldsSet(metafields: [
             {
               ownerId: $customizationId
-              namespace: "payment-customization"
-              key: "function-configuration"
+              namespace: "${metafields.namespace}"
+              key: "${metafields.key}"
               value: $configurationValue
               type: "json"
             }
@@ -215,8 +216,8 @@ app.post("/api/paymentCustomization/create", async (req, res) => {
           metafieldsSet(metafields: [
             {
               ownerId: $customizationId
-              namespace: "payment-customization"
-              key: "function-configuration"
+              namespace: "${metafields.namespace}"
+              key: "${metafields.key}"
               value: $configurationValue
               type: "json"
             }
diff --git a/sample-apps/payment-customizations/web/metafields.js.liquid b/sample-apps/payment-customizations/web/metafields.js.liquid
@@ -0,0 +1,4 @@
+export default {
+  namespace: '{{ app_name | replace: " ", "-" | downcase }}',
+  key: "function-configuration",
+};

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ query Input {`
`12`	`12`	`}`
`13`	`13`	`deliveryCustomization {`
`14`	`14`	`metafield(`
`15`		`- namespace: "delivery-customization"`
	`15`	`+ namespace: "{{ app_name \| replace: " ", "-" \| downcase }}"`
`16`	`16`	`key: "function-configuration"`
`17`	`17`	`) {`
`18`	`18`	`value`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@ import shopify from "./shopify.js";`
`8`	`8`	`import productCreator from "./product-creator.js";`
`9`	`9`	`import GDPRWebhookHandlers from "./gdpr.js";`
`10`	`10`	`import { GraphqlQueryError } from "@shopify/shopify-api";`
	`11`	`+import metafields from "./metafields.js";`
`11`	`12`
`12`	`13`	`const PORT = parseInt(process.env.BACKEND_PORT \|\| process.env.PORT, 10);`
`13`	`14`
`@@ -58,7 +59,7 @@ app.get("/api/deliveryCustomization/:id", async (req, res) => {`
`58`	`59`	query: `query DeliveryCustomization($id: ID!) {
`59`	`60`	`deliveryCustomization(id: $id) {`
`60`	`61`	`id`
`61`		`- metafield(namespace: "delivery-customization", key: "function-configuration") {`
	`62`	`+ metafield(namespace: "${metafields.namespace}", key: "${metafields.key}") {`
`62`	`63`	`value`
`63`	`64`	`}`
`64`	`65`	`}`
`@@ -134,8 +135,8 @@ app.put("/api/deliveryCustomization/update", async (req, res) => {`
`134`	`135`	`metafieldsSet(metafields: [`
`135`	`136`	`{`
`136`	`137`	`ownerId: $customizationId`
`137`		`- namespace: "delivery-customization"`
`138`		`- key: "function-configuration"`
	`138`	`+ namespace: "${metafields.namespace}"`
	`139`	`+ key: "${metafields.key}"`
`139`	`140`	`value: $configurationValue`
`140`	`141`	`type: "json"`
`141`	`142`	`}`
`@@ -215,8 +216,8 @@ app.post("/api/deliveryCustomization/create", async (req, res) => {`
`215`	`216`	`metafieldsSet(metafields: [`
`216`	`217`	`{`
`217`	`218`	`ownerId: $customizationId`
`218`		`- namespace: "delivery-customization"`
`219`		`- key: "function-configuration"`
	`219`	`+ namespace: "${metafields.namespace}"`
	`220`	`+ key: "${metafields.key}"`
`220`	`221`	`value: $configurationValue`
`221`	`222`	`type: "json"`
`222`	`223`	`}`