Refactor from ResultBlock to ResultsBlock, fix comments on pr

varianter · Nov 4, 2024 · 53349c1 · 53349c1
1 parent ae651b2
commit 53349c1
Show file tree

Hide file tree

Showing 10 changed files with 40 additions and 48 deletions.
diff --git a/src/components/customerCases/customerCase/sections/CustomerCaseSection.tsx b/src/components/customerCases/customerCase/sections/CustomerCaseSection.tsx
@@ -2,7 +2,7 @@ import { CustomerCaseSection as CustomerCaseSectionObject } from "studioShared/l
 
 import ImageSection from "./image/ImageSection";
 import QuoteBlock from "./quote/QuoteBlock";
-import ResultBlock from "./results/ResultBlock";
+import ResultsBlock from "./results/ResultsBlock";
 import RichTextSection from "./richText/RichTextSection";
 import SplitSection from "./splitSection/SplitSection";
 
@@ -20,7 +20,7 @@ export function CustomerCaseSection({
       return <QuoteBlock section={section} />;
     case "imageBlock":
       return <ImageSection section={section} />;
-    case "resultBlock":
-      return <ResultBlock section={section} />;
+    case "resultsBlock":
+      return <ResultsBlock section={section} />;
   }
 }
diff --git a/...omerCase/sections/results/ResultBlock.tsx → ...merCase/sections/results/ResultsBlock.tsx b/...omerCase/sections/results/ResultBlock.tsx → ...merCase/sections/results/ResultsBlock.tsx
@@ -1,29 +1,29 @@
 import Text from "src/components/text/Text";
-import { ResultBlock as ResultBlockObject } from "studioShared/lib/interfaces/resultBlock";
+import { ResultsBlock as ResultsBlockObject } from "studioShared/lib/interfaces/resultsBlock";
 
-import styles from "./resultBlock.module.css";
+import styles from "./resultsBlock.module.css";
 
-export interface ResultBlockProps {
-  section: ResultBlockObject;
+export interface ResultsBlockProps {
+  section: ResultsBlockObject;
 }
 
-export default function QuoteBlock({ section }: ResultBlockProps) {
+export default function ResultsBlock({ section }: ResultsBlockProps) {
   return (
-    section.resultBlockTitle && (
+    section.resultsBlockTitle && (
       <div className={styles.wrapper}>
         <div className={styles.resultblock}>
           <Text type="h4" className={styles.blocktitle}>
-            {section.resultBlockTitle}
+            {section.resultsBlockTitle}
           </Text>
           <div className={styles.resultrow}>
-            {section.resultList?.map((result) => (
+            {section.resultsList?.map((result) => (
               <div className={styles.results} key={result._key}>
                 <Text type="h2" className={styles.mainresult}>
                   {result.result}
                 </Text>
                 <Text type="labelRegular">{result.description}</Text>
               </div>
-            ))}{" "}
+            ))}
           </div>
         </div>
       </div>

diff --git a/...e/sections/results/resultBlock.module.css → .../sections/results/resultsBlock.module.css b/...e/sections/results/resultBlock.module.css → .../sections/results/resultsBlock.module.css
diff --git a/src/components/text/text.module.css b/src/components/text/text.module.css
@@ -1,15 +1,7 @@
-:where(.desktopLink,
-.h1,
-.h2,
-.h3,
-.h4,
-.h5,
-.h6,
-.bodyXl) {
+:where(.desktopLink, .h1, .h2, .h3, .h4, .h5, .h6, .bodyXl) {
   font-family: var(--font-britti-sans);
 }
 
-
 .bodyBig,
 .bodyNormal,
 .labelSmall,

diff --git a/studioShared/lib/interfaces/customerCases.ts b/studioShared/lib/interfaces/customerCases.ts
@@ -2,7 +2,7 @@ import { IImage } from "studio/lib/interfaces/media";
 
 import { ImageBlock } from "./imageBlock";
 import { QuoteBlock } from "./quoteBlock";
-import { ResultBlock } from "./resultBlock";
+import { ResultsBlock } from "./resultsBlock";
 import { RichTextBlock } from "./richTextBlock";
 import { SplitSection } from "./splitSection";
 
@@ -34,7 +34,7 @@ export type BaseCustomerCaseSection = RichTextBlock | ImageBlock | QuoteBlock;
 export type CustomerCaseSection =
   | BaseCustomerCaseSection
   | SplitSection
-  | ResultBlock;
+  | ResultsBlock;
 
 export interface CustomerCase extends CustomerCaseBase {
   projectInfo: CustomerCaseProjectInfo;

diff --git a/studioShared/lib/interfaces/resultBlock.ts b/studioShared/lib/interfaces/resultBlock.ts
diff --git a/studioShared/lib/interfaces/resultsBlock.ts b/studioShared/lib/interfaces/resultsBlock.ts
@@ -0,0 +1,12 @@
+interface ResultsListItem {
+  result: string;
+  description: string;
+  _key: string;
+}
+
+export interface ResultsBlock {
+  _key: string;
+  _type: "resultsBlock";
+  resultsBlockTitle?: string;
+  resultsList?: ResultsListItem[];
+}
diff --git a/studioShared/lib/queries/customerCases.ts b/studioShared/lib/queries/customerCases.ts
@@ -74,9 +74,9 @@ export const CUSTOMER_CASE_QUERY = groq`
           ${BASE_SECTIONS_FRAGMENT}
         }
       },
-      _type == "resultBlock" => {
-        "resultBlockTitle": ${translatedFieldFragment("resultBlockTitle")},
-        "resultList": resultList[] {
+      _type == "resultsBlock" => {
+        "resultsBlockTitle": ${translatedFieldFragment("resultsBlockTitle")},
+        "resultsList": resultsList[] {
           _key,
           result,
           "description": ${translatedFieldFragment("description")},

diff --git a/studioShared/schemas/documents/customerCase.ts b/studioShared/schemas/documents/customerCase.ts
@@ -8,7 +8,7 @@ import { titleSlug } from "studio/schemas/schemaTypes/slug";
 import { buildDraftId, buildPublishedId } from "studio/utils/documentUtils";
 import { firstTranslation } from "studio/utils/i18n";
 import { customerCaseProjectInfo } from "studioShared/schemas/fields/customerCaseProjectInfo";
-import resultBlock from "studioShared/schemas/objects/resultBlock";
+import resultsBlock from "studioShared/schemas/objects/resultsBlock";
 import { baseCustomerCaseSections } from "studioShared/schemas/objects/sections";
 import splitSection from "studioShared/schemas/objects/splitSection";
 
@@ -17,7 +17,7 @@ export const customerCaseID = "customerCase";
 export const customerCaseSections = [
   ...baseCustomerCaseSections,
   splitSection,
-  resultBlock,
+  resultsBlock,
 ];
 
 const customerCase = defineType({

diff --git a/studioShared/schemas/objects/resultBlock.ts → studioShared/schemas/objects/resultsBlock.ts b/studioShared/schemas/objects/resultBlock.ts → studioShared/schemas/objects/resultsBlock.ts
@@ -3,21 +3,21 @@ import { defineField } from "sanity";
 import { isInternationalizedString } from "studio/lib/interfaces/global";
 import { firstTranslation } from "studio/utils/i18n";
 
-const resultBlock = defineField({
-  name: "resultBlock",
+const resultsBlock = defineField({
+  name: "resultsBlock",
   type: "object",
-  title: "Result Block",
+  title: "Results Block",
   description: "This block can be used to add some results from the project.",
   fields: [
     {
-      name: "resultBlockTitle",
-      title: "Result Block Title",
+      name: "resultsBlockTitle",
+      title: "Results Block Title",
       description:
         "Please provide a title for the result block, for example: 'These are the results from the project'",
       type: "internationalizedArrayString",
     },
     {
-      name: "resultList",
+      name: "resultsList",
       title: "List of results",
       description: "Add up to five results to be included in this list",
       type: "array",
@@ -67,7 +67,7 @@ const resultBlock = defineField({
   ],
   preview: {
     select: {
-      title: "resultBlockTitle",
+      title: "resultsBlockTitle",
     },
     prepare({ title }) {
       if (title !== undefined && !isInternationalizedString(title)) {
@@ -85,4 +85,4 @@ const resultBlock = defineField({
   },
 });
 
-export default resultBlock;
+export default resultsBlock;