Merge pull request #126 from gadget-inc/pq-media

DevAOC · web-flow · commit 82636c197b1a · 2025-01-13T18:37:47.000-05:00
Product quiz, product media
diff --git a/shopify/product-quiz-template/accessControl/filters/shopify/shopifyFile.gelly b/shopify/product-quiz-template/accessControl/filters/shopify/shopifyFile.gelly
@@ -0,0 +1,3 @@
+filter ($session: Session) on ShopifyFile [
+  where shopId == $session.shopId
+]
diff --git a/shopify/product-quiz-template/accessControl/filters/shopify/shopifyProductMedia.gelly b/shopify/product-quiz-template/accessControl/filters/shopify/shopifyProductMedia.gelly
@@ -0,0 +1,3 @@
+filter ($session: Session) on ShopifyProductMedia [
+  where shopId == $session.shopId
+]
diff --git a/shopify/product-quiz-template/accessControl/filters/shopifyProductImage/shopifyProductImage.gelly b/shopify/product-quiz-template/accessControl/filters/shopifyProductImage/shopifyProductImage.gelly
diff --git a/shopify/product-quiz-template/accessControl/permissions.gadget.ts b/shopify/product-quiz-template/accessControl/permissions.gadget.ts
@@ -59,6 +59,11 @@ export const permissions: GadgetPermissions = {
               "accessControl/filters/shopifyAsset/shopifyAsset.gelly",
           },
         },
+        shopifyFile: {
+          read: {
+            filter: "accessControl/filters/shopify/shopifyFile.gelly",
+          },
+        },
         shopifyGdprRequest: {
           read: {
             filter:
@@ -75,10 +80,10 @@ export const permissions: GadgetPermissions = {
               "accessControl/filters/shopifyProduct/shopifyProduct.gelly",
           },
         },
-        shopifyProductImage: {
+        shopifyProductMedia: {
           read: {
             filter:
-              "accessControl/filters/shopifyProductImage/shopifyProductImage.gelly",
+              "accessControl/filters/shopify/shopifyProductMedia.gelly",
           },
         },
         shopifyShop: {
@@ -135,9 +140,6 @@ export const permissions: GadgetPermissions = {
         shopifyProduct: {
           read: true,
         },
-        shopifyProductImage: {
-          read: true,
-        },
         shopperSuggestion: {
           actions: {
             create: true,
diff --git a/shopify/product-quiz-template/api/models/shopifyFile/actions/create.ts b/shopify/product-quiz-template/api/models/shopifyFile/actions/create.ts
@@ -0,0 +1,14 @@
+import { applyParams, save, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  applyParams(params, record);
+  await preventCrossShopDataAccess(params, record);
+  await save(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "create" };
diff --git a/shopify/product-quiz-template/api/models/shopifyFile/actions/delete.ts b/shopify/product-quiz-template/api/models/shopifyFile/actions/delete.ts
@@ -0,0 +1,13 @@
+import { deleteRecord, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  await preventCrossShopDataAccess(params, record);
+  await deleteRecord(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "delete" };
diff --git a/shopify/product-quiz-template/api/models/shopifyFile/actions/update.ts b/shopify/product-quiz-template/api/models/shopifyFile/actions/update.ts
@@ -0,0 +1,14 @@
+import { applyParams, save, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  applyParams(params, record);
+  await preventCrossShopDataAccess(params, record);
+  await save(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "update" };
diff --git a/shopify/product-quiz-template/api/models/shopifyFile/schema.gadget.ts b/shopify/product-quiz-template/api/models/shopifyFile/schema.gadget.ts
@@ -0,0 +1,39 @@
+import type { GadgetModel } from "gadget-server";
+
+// This file describes the schema for the "shopifyFile" model, go to https://product-quiz-template.gadget.app/edit to view/edit your model in Gadget
+// For more information on how to update this file http://docs.gadget.dev
+
+export const schema: GadgetModel = {
+  type: "gadget/model-schema/v1",
+  storageKey: "DataModel-Shopify-File",
+  fields: {},
+  shopify: {
+    fields: [
+      "alt",
+      "boundingBox",
+      "duration",
+      "embedUrl",
+      "fileErrors",
+      "fileStatus",
+      "filename",
+      "host",
+      "image",
+      "mediaContentType",
+      "mediaErrors",
+      "mediaWarnings",
+      "mimetype",
+      "originUrl",
+      "originalFileSize",
+      "originalSource",
+      "preview",
+      "product",
+      "shop",
+      "shopifyCreatedAt",
+      "shopifyUpdatedAt",
+      "sources",
+      "status",
+      "type",
+      "url",
+    ],
+  },
+};
diff --git a/shopify/product-quiz-template/api/models/shopifyProduct/schema.gadget.ts b/shopify/product-quiz-template/api/models/shopifyProduct/schema.gadget.ts
@@ -7,6 +7,11 @@ export const schema: GadgetModel = {
   type: "gadget/model-schema/v1",
   storageKey: "DataModel-Shopify-Product",
   fields: {
+    category: {
+      type: "json",
+      storageKey:
+        "ModelField-DataModel-Shopify-Product-__gadget_graphql_category::FieldStorageEpoch-DataModel-Shopify-Product-__gadget_graphql_category-initial",
+    },
     publishedScope: {
       type: "string",
       storageKey:
@@ -39,10 +44,9 @@ export const schema: GadgetModel = {
   shopify: {
     fields: [
       "body",
-      "category",
       "compareAtPriceRange",
       "handle",
-      "images",
+      "media",
       "productCategory",
       "productType",
       "publishedAt",
diff --git a/shopify/product-quiz-template/api/models/shopifyProductImage/actions/create.ts b/shopify/product-quiz-template/api/models/shopifyProductImage/actions/create.ts
diff --git a/shopify/product-quiz-template/api/models/shopifyProductImage/actions/delete.ts b/shopify/product-quiz-template/api/models/shopifyProductImage/actions/delete.ts
diff --git a/shopify/product-quiz-template/api/models/shopifyProductImage/actions/update.ts b/shopify/product-quiz-template/api/models/shopifyProductImage/actions/update.ts
diff --git a/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/create.ts b/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/create.ts
@@ -0,0 +1,14 @@
+import { applyParams, save, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  applyParams(params, record);
+  await preventCrossShopDataAccess(params, record);
+  await save(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "create" };
diff --git a/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/delete.ts b/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/delete.ts
@@ -0,0 +1,13 @@
+import { deleteRecord, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  await preventCrossShopDataAccess(params, record);
+  await deleteRecord(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "delete" };
diff --git a/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/update.ts b/shopify/product-quiz-template/api/models/shopifyProductMedia/actions/update.ts
@@ -0,0 +1,14 @@
+import { applyParams, save, ActionOptions } from "gadget-server";
+import { preventCrossShopDataAccess } from "gadget-server/shopify";
+
+export const run: ActionRun = async ({ params, record, logger, api, connections }) => {
+  applyParams(params, record);
+  await preventCrossShopDataAccess(params, record);
+  await save(record);
+};
+
+export const onSuccess: ActionOnSuccess = async ({ params, record, logger, api, connections }) => {
+  // Your logic goes here
+};
+
+export const options: ActionOptions = { actionType: "update" };
diff --git a/shopify/product-quiz-template/api/models/shopifyProductMedia/schema.gadget.ts b/shopify/product-quiz-template/api/models/shopifyProductMedia/schema.gadget.ts
@@ -1,23 +1,19 @@
 import type { GadgetModel } from "gadget-server";
 
-// This file describes the schema for the "shopifyProductImage" model, go to https://product-quiz-template.gadget.app/edit to view/edit your model in Gadget
+// This file describes the schema for the "shopifyProductMedia" model, go to https://product-quiz-template.gadget.app/edit to view/edit your model in Gadget
 // For more information on how to update this file http://docs.gadget.dev
 
 export const schema: GadgetModel = {
   type: "gadget/model-schema/v1",
-  storageKey: "DataModel-Shopify-ProductImage",
+  storageKey: "DataModel-Shopify-ProductMedia",
   fields: {},
   shopify: {
     fields: [
-      "alt",
-      "height",
+      "featuredMediaForProduct",
+      "file",
       "position",
       "product",
       "shop",
-      "shopifyCreatedAt",
-      "shopifyUpdatedAt",
-      "source",
-      "width",
     ],
   },
 };
diff --git a/shopify/product-quiz-template/api/models/shopifyShop/schema.gadget.ts b/shopify/product-quiz-template/api/models/shopifyShop/schema.gadget.ts
@@ -64,6 +64,7 @@ export const schema: GadgetModel = {
       "eligibleForPayments",
       "email",
       "enabledPresentmentCurrencies",
+      "files",
       "finances",
       "forceSsl",
       "gdprRequests",
@@ -89,7 +90,7 @@ export const schema: GadgetModel = {
       "planName",
       "preLaunchEnabled",
       "primaryLocale",
-      "productImages",
+      "productMedia",
       "products",
       "province",
       "provinceCode",
diff --git a/shopify/product-quiz-template/api/models/shopifySync/actions/abort.ts b/shopify/product-quiz-template/api/models/shopifySync/actions/abort.ts
@@ -36,4 +36,5 @@ export const onSuccess: ActionOnSuccess = async ({
 
 export const options: ActionOptions = {
   actionType: "update",
+  triggers: { api: true },
 };
diff --git a/shopify/product-quiz-template/package.json b/shopify/product-quiz-template/package.json
@@ -7,7 +7,7 @@
   "dependencies": {
     "@fastify/request-context": "^3.0.0",
     "@gadget-client/product-quiz-template": "link:.gadget/client",
-    "@gadgetinc/react": "^0.18.4",
+    "@gadgetinc/react": "^0.18.5",
     "@gadgetinc/react-shopify-app-bridge": "^0.16.6",
     "@shopify/app-bridge-react": "^4.1.1",
     "@shopify/polaris": "^13.9.0",
@@ -30,10 +30,10 @@
   },
   "devDependencies": {
     "@types/node": "^20.12.8",
-    "@types/react": "^18.2.64", 
+    "@types/react": "^18.2.64",
     "@types/react-dom": "^18.0.11",
     "@vitejs/plugin-react-swc": "3.2.0",
     "typescript": "^5.4.5",
     "vite": "^5.3.5"
   }
-}
+}
diff --git a/shopify/product-quiz-template/settings.gadget.ts b/shopify/product-quiz-template/settings.gadget.ts
@@ -9,8 +9,9 @@ export const settings: GadgetSettings = {
         apiVersion: "2024-10",
         enabledModels: [
           "shopifyAsset",
+          "shopifyFile",
           "shopifyProduct",
-          "shopifyProductImage",
+          "shopifyProductMedia",
           "shopifyTheme",
         ],
         type: "partner",
diff --git a/shopify/product-quiz-template/web/components/Answers.tsx b/shopify/product-quiz-template/web/components/Answers.tsx
diff --git a/shopify/product-quiz-template/web/components/QuizForm.tsx b/shopify/product-quiz-template/web/components/QuizForm.tsx
diff --git a/shopify/product-quiz-template/yarn.lock b/shopify/product-quiz-template/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+filter ($session: Session) on ShopifyFile [`
	`2`	`+ where shopId == $session.shopId`
	`3`	`+]`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+filter ($session: Session) on ShopifyProductMedia [`
	`2`	`+ where shopId == $session.shopId`
	`3`	`+]`