fix validation for Location_Collection and Service_Collection schemas

kryptonum-dev · Jan 7, 2025 · f685cdb · f685cdb
1 parent daec0fc
commit f685cdb
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 37 deletions.
diff --git a/apps/sanity/schema/collectionTypes/Location_Collection.ts b/apps/sanity/schema/collectionTypes/Location_Collection.ts
@@ -30,25 +30,29 @@ export default defineType({
         const language = (context.parent as { language: string })?.language ?? 'pl';
         return `/${language}/${slugify(slug)}`
       },
-      validate: Rule => Rule.custom(async (value, context) => {
-        const servicePageRef = (context.parent as { servicePage: { _ref: string } })?.servicePage?._ref;
-        if (!servicePageRef) {
-          return 'The service page is required for Location Page.';
-        }
-
-        const client = context.getClient({ apiVersion: '2024-11-12' })
-        const servicePageSlug = await client.fetch(`*[_id == $ref][0].slug.current`, { ref: servicePageRef })
-        if (!value?.current?.startsWith(servicePageSlug)) {
-          return 'Slug should start with the slug of the service page.';
-        }
+      validate: Rule => [
+        Rule.custom(async (value, context) => {
+          const servicePageRef = (context.parent as { servicePage: { _ref: string } })?.servicePage?._ref;
+          if (!servicePageRef) {
+            return 'The service page is required for Location Page.';
+          }
 
-        const name = (context.parent as { name: string })?.name;
-        if (!value?.current?.includes(slugify(name))) {
-          return 'That slug doesn\'t match the name. Verify if it\'s correct.';
-        }
+          const client = context.getClient({ apiVersion: '2024-11-12' })
+          const servicePageSlug = await client.fetch(`*[_id == $ref][0].slug.current`, { ref: servicePageRef })
+          if (!value?.current?.startsWith(servicePageSlug)) {
+            return 'Slug should start with the slug of the service page.';
+          }
 
-        return true;
-      }).required()
+          return true;
+        }).required(),
+        Rule.custom((value, context) => {
+          const name = (context.parent as { name: string })?.name;
+          if (!value?.current?.includes(slugify(name))) {
+            return 'That slug doesn\'t match the name. Verify if it\'s correct.';
+          }
+          return true;
+        }).warning()
+      ],
     }),
     defineField({
       name: 'servicePage',

diff --git a/apps/sanity/schema/collectionTypes/Service_Collection.tsx b/apps/sanity/schema/collectionTypes/Service_Collection.tsx
@@ -32,28 +32,31 @@ export default defineType({
         }
         return `/${language}/${slugify(slug)}`
       },
-      validate: Rule => Rule.custom(async (value, context) => {
-        const language = (context.parent as { language: string })?.language ?? 'pl';
-        const hasMainPage = (context.parent as { hasMainPage: boolean })?.hasMainPage;
-        const mainPageRef = (context.parent as { mainPage: { _ref: string } })?.mainPage?._ref;
+      validate: Rule => [
+        Rule.custom(async (value, context) => {
+          const language = (context.parent as { language: string })?.language ?? 'pl';
+          const hasMainPage = (context.parent as { hasMainPage: boolean })?.hasMainPage;
+          const mainPageRef = (context.parent as { mainPage: { _ref: string } })?.mainPage?._ref;
 
-        if (hasMainPage && mainPageRef) {
-          const client = context.getClient({ apiVersion: '2024-11-12' })
-          const mainPageSlug = await client.fetch(`*[_id == $ref][0].slug.current`, { ref: mainPageRef })
-          if (!value?.current?.startsWith(mainPageSlug)) {
-            return 'Slug should start with the slug of the main page.';
+          if (hasMainPage && mainPageRef) {
+            const client = context.getClient({ apiVersion: '2024-11-12' })
+            const mainPageSlug = await client.fetch(`*[_id == $ref][0].slug.current`, { ref: mainPageRef })
+            if (!value?.current?.startsWith(mainPageSlug)) {
+              return 'Slug should start with the slug of the main page.';
+            }
+          } else if (!value?.current?.startsWith(`/${language}/`)) {
+            return `The slug should start with /${language}/`;
           }
-        } else if (!value?.current?.startsWith(`/${language}/`)) {
-          return `The slug should start with /${language}/`;
-        }
-
-        const name = (context.parent as { name: string })?.name;
-        if (!value?.current?.includes(slugify(name))) {
-          return 'That slug doesn\'t match the name. Verify if it\'s correct.';
-        }
-
-        return true;
-      }).required()
+          return true;
+        }).required(),
+        Rule.custom((value, context) => {
+          const name = (context.parent as { name: string })?.name;
+          if (!value?.current?.includes(slugify(name))) {
+            return 'That slug doesn\'t match the name. Verify if it\'s correct.';
+          }
+          return true;
+        }).warning(),
+      ]
     }),
     defineField({
       name: 'hasMainPage',