chore(slb-306): resolving issues after merging conflicts

AmazeeLabs · May 10, 2024 · b1dcdbc · b1dcdbc
1 parent 89e7248
commit b1dcdbc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 53 deletions.
diff --git a/packages/schema/src/fragments/PageContent/BlockInfoGrid.gql b/packages/schema/src/fragments/PageContent/BlockInfoGrid.gql
@@ -1,5 +1,5 @@
 fragment BlockInfoGrid on BlockInfoGrid {
-  items {
+  gridItems  {
     ...BlockInfoGridItem
   }
 }

diff --git a/packages/schema/src/schema.graphql b/packages/schema/src/schema.graphql
@@ -313,7 +313,7 @@ type BlockHorizontalSeparator @type(id: "custom/horizontal-separator") {
 }
 
 type BlockInfoGrid @type(id: "custom/info-grid") {
-  items: [BlockInfoGridItem]! @resolveEditorBlockChildren
+  gridItems: [BlockInfoGridItem]! @resolveEditorBlockChildren
 }
 
 type BlockInfoGridItem @default @value {

diff --git a/packages/ui/src/components/Organisms/PageDisplay.tsx b/packages/ui/src/components/Organisms/PageDisplay.tsx
@@ -72,7 +72,7 @@ export function PageDisplay(page: PageFragment) {
                       <br />
                       ---
                       <br />
-                      {block.items.map((item, index) => {
+                      {block.gridItems.map((item, index) => {
                         return (
                           <>
                             <div key={index}>

diff --git a/tests/schema/specs/blocks.spec.ts b/tests/schema/specs/blocks.spec.ts
@@ -107,7 +107,7 @@ test('Blocks', async () => {
           }
         }
         ... on BlockInfoGrid {
-          items {
+          gridItems: items {
             icon
             textContent {
               markup
@@ -156,9 +156,6 @@ test('Blocks', async () => {
     <p>A standalone paragraph with <strong><em>markup</em></strong> and <a href="/en/architecture" data-type="Content: Basic page" data-id="[numeric]" data-entity-type="node">link</a></p>
     ",
             },
-            {
-              "__typename": "BlockHorizontalSeparator",
-            },
             {
               "__typename": "BlockMedia",
               "caption": "Media image",
@@ -177,27 +174,6 @@ test('Blocks', async () => {
               "__typename": "BlockForm",
               "url": "http://127.0.0.1:8000/en/form/contact",
             },
-            {
-              "__typename": "BlockImageWithText",
-              "image": {
-                "__typename": "MediaImage",
-              },
-              "imagePosition": "right",
-              "textContent": {
-                "__typename": "BlockMarkup",
-                "markup": "
-    <p>All kinds of allowed blocks</p>
-
-    <ul><li>bla</li></ul>
-
-    <h2 class="wp-block-custom-heading">Heading</h2>
-
-    <blockquote class="wp-block-quote"><p>Quote</p><cite>Citation</cite></blockquote>
-
-    <p></p>
-    ",
-              },
-            },
             {
               "__typename": "BlockMarkup",
               "markup": "
@@ -270,7 +246,7 @@ test('Blocks', async () => {
             },
             {
               "__typename": "BlockInfoGrid",
-              "items": [
+              "gridItems": [
                 {
                   "cta": {
                     "icon": "ARROW",
@@ -306,32 +282,8 @@ test('Blocks', async () => {
     <p>Call us to speak to a member of our team. We are always happy to help.</p>
 
     <p><a href="tel:+16467865060">+1 (646) 786-5060</a></p>
-              "__typename": "BlockAccordion",
-              "items": [
-                {
-                  "__typename": "BlockAccordionItemText",
-                  "icon": "",
-                  "textContent": {
-                    "markup": "
-    <p>Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.</p>
-    ",
-                  },
-                  "title": "With a single paragraph and no icon",
-                },
-                {
-                  "__typename": "BlockAccordionItemText",
-                  "icon": "arrow",
-                  "textContent": {
-                    "markup": "
-    <ul><li>Moitié-moitié</li><li>Fribourgeoise</li></ul>
-    
-    <p>Incididunt laborum velit non proident nostrud velit. Minim excepteur ut aliqua nisi. Culpa laboris consectetur proident. Tempor esse ullamco et dolor proident id officia laborum voluptate nostrud elit dolore qui amet. Ex Lorem irure eu anim ipsum officia.</p>
     ",
                   },
-                  "title": "With a list and a paragraph and arrow icon",
-                },
-              ],
-                  },
                 },
                 {
                   "cta": {