fix: adjust graphql updates

sanity-io · Jun 2, 2023 · 03e7756 · 03e7756
1 parent 5607405
commit 03e7756
Show file tree

Hide file tree

Showing 35 changed files with 356 additions and 382 deletions.
diff --git a/components/inputs/PlaceholderString.tsx b/components/inputs/PlaceholderString.tsx
@@ -13,7 +13,7 @@ const PlaceholderStringInput = (props: Props) => {
 
   return props.renderDefault({
     ...props,
-    elementProps: {placeholder: proxyValue, ...props.elementProps},
+    elementProps: {...props.elementProps, placeholder: proxyValue},
   })
 }
 

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-is": "^18.2.0",
-    "sanity": "^3.9.1",
+    "sanity": "^3.11.5",
     "sanity-plugin-hotspot-array": "^1.0.1",
     "sanity-plugin-media": "^2.0.5",
     "slug": "^8.2.2",

diff --git a/schemas/index.ts b/schemas/index.ts
@@ -21,14 +21,10 @@ import productVariant from './documents/productVariant'
 const documents = [collection, colorTheme, page, product, productVariant]
 
 // Singleton document types
-import footer from './singletons/footer'
 import home from './singletons/home'
-import links from './singletons/links'
-import menu from './singletons/menu'
-import seo from './singletons/seo'
 import settings from './singletons/settings'
 
-const singletons = [footer, home, links, menu, seo, settings]
+const singletons = [home, settings]
 
 // Block content
 import body from './blocks/body'
@@ -37,16 +33,16 @@ const blocks = [body]
 
 // Object types
 import customProductOptionColor from './objects/customProductOption/color'
-import customProductOptionHeight from './objects/customProductOption/height'
+import customProductOptionColorObject from './objects/customProductOption/colorObject'
 import customProductOptionSize from './objects/customProductOption/size'
 import customProductOptionSizeObject from './objects/customProductOption/sizeObject'
-import customProductOptionTitle from './objects/customProductOption/title'
-import customProductOptionWidth from './objects/customProductOption/width'
-import imageWithProductHotspots from './objects/imageWithProductHotspots'
-import inventory from './objects/inventory'
-import linkExternal from './objects/linkExternal'
-import linkInternal from './objects/linkInternal'
-import notFoundPage from './objects/notFoundPage'
+import footer from './objects/global/footer'
+import imageWithProductHotspots from './objects/hotspot/imageWithProductHotspots'
+import inventory from './objects/shopify/inventory'
+import linkExternal from './objects/global/linkExternal'
+import linkInternal from './objects/global/linkInternal'
+import links from './objects/global/links'
+import notFoundPage from './objects/global/notFoundPage'
 import heroCollection from './objects/hero/collection'
 import heroHome from './objects/hero/home'
 import heroPage from './objects/hero/page'
@@ -59,41 +55,43 @@ import moduleCallToAction from './objects/module/callToAction'
 import moduleCollection from './objects/module/collection'
 import moduleGrid from './objects/module/grid'
 import gridItems from './objects/module/gridItems'
+import menu from './objects/global/menu'
 import moduleImage from './objects/module/image'
 import moduleImageAction from './objects/module/imageCallToAction'
 import moduleImages from './objects/module/images'
 import moduleInstagram from './objects/module/instagram'
 import moduleProduct from './objects/module/product'
 import moduleProducts from './objects/module/products'
-import placeholderString from './objects/placeholderString'
-import priceRange from './objects/priceRange'
-import spot from './objects/spot'
-import productHotspots from './objects/productHotspots'
-import productOption from './objects/productOption'
-import productWithVariant from './objects/productWithVariant'
-import proxyString from './objects/proxyString'
+import placeholderString from './objects/shopify/placeholderString'
+import priceRange from './objects/shopify/priceRange'
+import spot from './objects/hotspot/spot'
+import productHotspots from './objects/hotspot/productHotspots'
+import option from './objects/shopify/option'
+import productWithVariant from './objects/shopify/productWithVariant'
+import proxyString from './objects/shopify/proxyString'
+import seo from './objects/seo/seo'
 import seoHome from './objects/seo/home'
 import seoPage from './objects/seo/page'
 import seoDescription from './objects/seo/description'
 import seoShopify from './objects/seo/shopify'
-import shopifyCollection from './objects/shopifyCollection'
-import shopifyCollectionRule from './objects/shopifyCollectionRule'
-import shopifyProduct from './objects/shopifyProduct'
-import shopifyProductVariant from './objects/shopifyProductVariant'
+import shopifyCollection from './objects/shopify/shopifyCollection'
+import shopifyCollectionRule from './objects/shopify/shopifyCollectionRule'
+import shopifyProduct from './objects/shopify/shopifyProduct'
+import shopifyProductVariant from './objects/shopify/shopifyProductVariant'
 
 // Collections
 import collectionGroup from './objects/collection/group'
 import collectionLinks from './objects/collection/links'
 
 const objects = [
   customProductOptionColor,
-  customProductOptionHeight,
+  customProductOptionColorObject,
   customProductOptionSize,
   customProductOptionSizeObject,
-  customProductOptionTitle,
-  customProductOptionWidth,
+  footer,
   imageWithProductHotspots,
   inventory,
+  links,
   linkExternal,
   linkInternal,
   notFoundPage,
@@ -104,6 +102,7 @@ const objects = [
   accordionBody,
   accordionGroup,
   accordionObject,
+  menu,
   moduleCallout,
   moduleCallToAction,
   moduleCollection,
@@ -119,9 +118,10 @@ const objects = [
   priceRange,
   spot,
   productHotspots,
-  productOption,
+  option,
   productWithVariant,
   proxyString,
+  seo,
   seoHome,
   seoPage,
   seoDescription,

diff --git a/schemas/objects/customProductOption/color.tsx b/schemas/objects/customProductOption/color.tsx
@@ -1,25 +1,10 @@
-import React from 'react'
 import pluralize from 'pluralize-esm'
 import {defineField} from 'sanity'
 
 interface ColorOption {
   title: string
 }
 
-const ColorPreview = ({color}: {color: string}) => {
-  return (
-    <div
-      style={{
-        backgroundColor: color,
-        borderRadius: 'inherit',
-        display: 'flex',
-        height: '100%',
-        width: '100%',
-      }}
-    />
-  )
-}
-
 export default defineField({
   name: 'customProductOption.color',
   title: 'Color',
@@ -41,39 +26,7 @@ export default defineField({
       type: 'array',
       of: [
         {
-          name: 'color',
-          title: 'Color',
-          type: 'object',
-          fields: [
-            defineField({
-              name: 'title',
-              title: 'Title',
-              type: 'string',
-              description: 'Shopify product option value (case sensitive)',
-              validation: (Rule) => Rule.required(),
-            }),
-            defineField({
-              name: 'color',
-              title: 'Color',
-              type: 'color',
-              options: {disableAlpha: true},
-              validation: (Rule) => Rule.required(),
-            }),
-          ],
-          preview: {
-            select: {
-              color: 'color.hex',
-              title: 'title',
-            },
-            prepare(selection) {
-              const {color, title} = selection
-              return {
-                media: <ColorPreview color={color} />,
-                subtitle: color,
-                title,
-              }
-            },
-          },
+          type: 'customProductOption.colorObject',
         },
       ],
       validation: (Rule) =>

diff --git a/schemas/objects/customProductOption/colorObject.tsx b/schemas/objects/customProductOption/colorObject.tsx
@@ -0,0 +1,52 @@
+import React from 'react'
+import {defineField} from 'sanity'
+
+const ColorPreview = ({color}: {color: string}) => {
+  return (
+    <div
+      style={{
+        backgroundColor: color,
+        borderRadius: 'inherit',
+        display: 'flex',
+        height: '100%',
+        width: '100%',
+      }}
+    />
+  )
+}
+
+export default defineField({
+  name: 'customProductOption.colorObject',
+  title: 'Color',
+  type: 'object',
+  fields: [
+    defineField({
+      name: 'title',
+      title: 'Title',
+      type: 'string',
+      description: 'Shopify product option value (case sensitive)',
+      validation: (Rule) => Rule.required(),
+    }),
+    defineField({
+      name: 'color',
+      title: 'Color',
+      type: 'color',
+      options: {disableAlpha: true},
+      validation: (Rule) => Rule.required(),
+    }),
+  ],
+  preview: {
+    select: {
+      color: 'color.hex',
+      title: 'title',
+    },
+    prepare(selection) {
+      const {color, title} = selection
+      return {
+        media: <ColorPreview color={color} />,
+        subtitle: color,
+        title,
+      }
+    },
+  },
+})
diff --git a/schemas/objects/customProductOption/height.ts b/schemas/objects/customProductOption/height.ts
diff --git a/schemas/objects/customProductOption/sizeObject.ts b/schemas/objects/customProductOption/sizeObject.ts
@@ -8,17 +8,23 @@ export default defineField({
     defineField({
       name: 'title',
       title: 'Title',
-      type: 'customProductOption.title',
+      type: 'string',
+      description: 'Shopify product option value (case sensitive)',
+      validation: (Rule) => Rule.required(),
     }),
     defineField({
       name: 'width',
       title: 'Width',
-      type: 'customProductOption.width',
+      type: 'number',
+      description: 'In mm',
+      validation: (Rule) => Rule.required().precision(2),
     }),
     defineField({
       name: 'height',
       title: 'Height',
-      type: 'customProductOption.height',
+      type: 'number',
+      description: 'In mm',
+      validation: (Rule) => Rule.required().precision(2),
     }),
   ],
   preview: {

diff --git a/schemas/objects/customProductOption/title.ts b/schemas/objects/customProductOption/title.ts
diff --git a/schemas/objects/customProductOption/width.ts b/schemas/objects/customProductOption/width.ts
diff --git a/schemas/singletons/footer.ts → schemas/objects/global/footer.ts b/schemas/singletons/footer.ts → schemas/objects/global/footer.ts
@@ -4,7 +4,6 @@ export default defineField({
   name: 'footerSettings',
   title: 'Footer',
   type: 'object',
-  group: 'navigation',
   options: {
     collapsed: false,
     collapsible: true,

diff --git a/schemas/objects/linkExternal.ts → schemas/objects/global/linkExternal.ts b/schemas/objects/linkExternal.ts → schemas/objects/global/linkExternal.ts
diff --git a/schemas/objects/linkInternal.ts → schemas/objects/global/linkInternal.ts b/schemas/objects/linkInternal.ts → schemas/objects/global/linkInternal.ts
@@ -1,8 +1,8 @@
 import {LinkIcon} from '@sanity/icons'
 import {defineField} from 'sanity'
 
-import {PAGE_REFERENCES} from '../../constants'
-import {getPriceRange} from '../../utils/getPriceRange'
+import {PAGE_REFERENCES} from '../../../constants'
+import {getPriceRange} from '../../../utils/getPriceRange'
 
 export default defineField({
   title: 'Internal Link',

diff --git a/schemas/singletons/links.ts → schemas/objects/global/links.ts b/schemas/singletons/links.ts → schemas/objects/global/links.ts
diff --git a/schemas/singletons/menu.ts → schemas/objects/global/menu.ts b/schemas/singletons/menu.ts → schemas/objects/global/menu.ts
@@ -4,7 +4,6 @@ export default defineField({
   name: 'menuSettings',
   title: 'Menu',
   type: 'object',
-  group: 'navigation',
   options: {
     collapsed: false,
     collapsible: true,

diff --git a/schemas/objects/notFoundPage.ts → schemas/objects/global/notFoundPage.ts b/schemas/objects/notFoundPage.ts → schemas/objects/global/notFoundPage.ts
diff --git a/schemas/objects/imageWithProductHotspots.ts → ...jects/hotspot/imageWithProductHotspots.ts b/schemas/objects/imageWithProductHotspots.ts → ...jects/hotspot/imageWithProductHotspots.ts
diff --git a/schemas/objects/productHotspots.tsx → schemas/objects/hotspot/productHotspots.tsx b/schemas/objects/productHotspots.tsx → schemas/objects/hotspot/productHotspots.tsx
@@ -1,6 +1,6 @@
 import {defineField} from 'sanity'
 
-import ProductTooltip from '../../components/hotspots/ProductTooltip'
+import ProductTooltip from '../../../components/hotspots/ProductTooltip'
 
 export default defineField({
   name: 'productHotspots',

diff --git a/schemas/objects/spot.tsx → schemas/objects/hotspot/spot.tsx b/schemas/objects/spot.tsx → schemas/objects/hotspot/spot.tsx
@@ -1,10 +1,11 @@
 import React from 'react'
 import {defineField} from 'sanity'
 
-import ShopifyDocumentStatus from '../../components/media/ShopifyDocumentStatus'
+import ShopifyDocumentStatus from '../../../components/media/ShopifyDocumentStatus'
 
 export default defineField({
   name: 'spot',
+  title: 'Spot',
   type: 'object',
   fieldsets: [{name: 'position', options: {columns: 2}}],
   fields: [

diff --git a/schemas/objects/module/accordion.ts b/schemas/objects/module/accordion.ts
@@ -12,19 +12,23 @@ export default defineField({
     defineField({
       name: 'groups',
       title: 'Groups',
-      type: 'accordionBody',
+      type: 'array',
+      of: [
+        {
+          type: 'accordionObject',
+        },
+      ],
     }),
   ],
   preview: {
     select: {
       groups: 'groups',
-      url: 'url',
     },
     prepare(selection) {
       const {groups} = selection
       return {
         subtitle: 'Accordion',
-        title: groups.length > 0 ? pluralize('group', groups.length, true) : 'No groups',
+        title: groups?.length > 0 ? pluralize('group', groups.length, true) : 'No groups',
       }
     },
   },

diff --git a/schemas/objects/module/accordionObject.ts b/schemas/objects/module/accordionObject.ts
@@ -4,6 +4,7 @@ import blocksToText from '../../../utils/blocksToText'
 
 export default defineField({
   name: 'accordionObject',
+  title: 'Object',
   type: 'object',
   icon: false,
   fields: [