Merge pull request Shopify#1668 from Shopify/templates-api-changes

Update template specification
chintalp0910 · Mar 28, 2023 · 6bbe61b · 6bbe61b
2 parents 7884d06 + 4df4ef4
commit 6bbe61b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/packages/app/src/cli/api/graphql/template_specifications.ts b/packages/app/src/cli/api/graphql/template_specifications.ts
@@ -8,8 +8,8 @@ export const RemoteTemplateSpecificationsQuery = gql`
       name
       group
       supportLinks
-      url
       types {
+        url
         type
         extensionPoints
         supportedFlavors {
@@ -26,14 +26,14 @@ export interface TemplateType {
   type: string
   extensionPoints: string[]
   supportedFlavors: ExtensionFlavor[]
+  url: string
 }
 
 export interface RemoteTemplateSpecification {
   identifier: string
   name: string
   group: string
   supportLinks: string[]
-  url: string
   types: TemplateType[]
 }
 

diff --git a/packages/app/src/cli/models/app/app.test-data.ts b/packages/app/src/cli/models/app/app.test-data.ts
@@ -240,10 +240,10 @@ export const testRemoteTemplateSpecifications: RemoteTemplateSpecification[] = [
     name: 'Function - Cart and Checkout Validation',
     group: 'Discounts and checkout',
     supportLinks: ['https://shopify.dev/docs/api/functions/reference/cart-checkout-validation'],
-    url: 'https://github.com/Shopify/function-examples',
     types: [
       {
-        type: 'cart_checkout_validation',
+        type: 'function',
+        url: 'https://github.com/Shopify/function-examples',
         extensionPoints: [],
         supportedFlavors: [
           {
@@ -260,10 +260,10 @@ export const testRemoteTemplateSpecifications: RemoteTemplateSpecification[] = [
     name: 'Function - Cart transformer',
     group: 'Discounts and checkout',
     supportLinks: [],
-    url: 'https://github.com/Shopify/function-examples',
     types: [
       {
-        type: 'cart_transform',
+        type: 'function',
+        url: 'https://github.com/Shopify/function-examples',
         extensionPoints: [],
         supportedFlavors: [
           {
@@ -285,10 +285,10 @@ export const testRemoteTemplateSpecifications: RemoteTemplateSpecification[] = [
     name: 'Function - Product discounts',
     group: 'Discounts and checkout',
     supportLinks: [],
-    url: 'https://github.com/Shopify/function-examples',
     types: [
       {
-        type: 'product_discounts',
+        type: 'function',
+        url: 'https://github.com/Shopify/function-examples',
         extensionPoints: [],
         supportedFlavors: [
           {
@@ -310,10 +310,10 @@ export const testRemoteTemplateSpecifications: RemoteTemplateSpecification[] = [
     name: 'Function - Order discounts',
     group: 'Discounts and checkout',
     supportLinks: [],
-    url: 'https://github.com/Shopify/function-examples',
     types: [
       {
-        type: 'order_discounts',
+        type: 'function',
+        url: 'https://github.com/Shopify/function-examples',
         extensionPoints: [],
         supportedFlavors: [
           {

diff --git a/packages/app/src/cli/services/generate/fetch-template-specifications.ts b/packages/app/src/cli/services/generate/fetch-template-specifications.ts
@@ -26,16 +26,16 @@ export function mapRemoteTemplateSpecification(
     supportLinks: remoteTemplateSpecification.supportLinks,
     types: remoteTemplateSpecification.types.map((extension) => {
       return {
-        identifier: extension.type,
-        externalIdentifier: extension.type,
-        externalName: extension.type,
+        identifier: remoteTemplateSpecification.identifier,
+        externalIdentifier: remoteTemplateSpecification.identifier,
+        externalName: remoteTemplateSpecification.identifier,
         gated: false,
         registrationLimit: blocks.functions.defaultRegistrationLimit,
         supportedFlavors: extension.supportedFlavors,
         group: remoteTemplateSpecification.group,
         category: () => 'function',
         configSchema: BaseFunctionConfigurationSchema,
-        templateURL: remoteTemplateSpecification.url,
+        templateURL: extension.url,
         helpURL: remoteTemplateSpecification.supportLinks[0]!,
         templatePath: (flavor: string) => {
           const supportedFlavor = extension.supportedFlavors.find((supportedFlavor) => supportedFlavor.value === flavor)