♻️ Refactor - Added Abstraction of Common Object Field (#1092)

* Added abstraction of benefits field * Schema changes * Removed abstraction of booking, as there are differences * Undid abstractions for benefits, made only common fields
SSWConsulting · Jul 21, 2023 · 94d88bf · 94d88bf
1 parent f81f010
commit 94d88bf
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 63 deletions.
diff --git a/.tina/__generated__/_schema.json b/.tina/__generated__/_schema.json
diff --git a/.tina/collections/consulting.tsx b/.tina/collections/consulting.tsx
@@ -3,6 +3,7 @@ import { seoSchema } from "../../components/util/seo";
 
 import type { Collection } from "tinacms";
 import { testimonialRowSchema } from "../../components/testimonials/TestimonialRow";
+import { benefitsFields } from "./shared-fields";
 
 export const consultingIndexSchema: Collection = {
   label: "Consulting - Index",
@@ -273,37 +274,7 @@ export const consultingSchema: Collection = {
               return { label: item?.title };
             },
           },
-          fields: [
-            {
-              type: "image",
-              label: "Image URL",
-              name: "image",
-              // @ts-ignore
-              uploadDir: () => "/benefits",
-            },
-            {
-              type: "string",
-              label: "Title",
-              name: "title",
-            },
-            {
-              type: "rich-text",
-              label: "Description",
-              name: "description",
-            },
-            {
-              type: "string",
-              required: false,
-              label: "linkName",
-              name: "linkName",
-            },
-            {
-              type: "string",
-              required: false,
-              label: "linkURL",
-              name: "linkURL",
-            },
-          ],
+          fields: benefitsFields,
         },
         {
           type: "object",

diff --git a/.tina/collections/employment.tsx b/.tina/collections/employment.tsx
@@ -1,6 +1,7 @@
 import { Collection } from "tinacms";
 import * as Schemas from "../../components/blocks";
 import { seoSchema } from "../../components/util/seo";
+import { benefitsFields } from "./shared-fields";
 
 export const employmentSchema: Collection = {
   label: "Employment Pages",
@@ -67,37 +68,7 @@ export const employmentSchema: Collection = {
               return { label: item?.title };
             },
           },
-          fields: [
-            {
-              type: "image",
-              label: "Image URL",
-              name: "image",
-              // @ts-ignore
-              uploadDir: () => "/benefits",
-            },
-            {
-              type: "string",
-              label: "Title",
-              name: "title",
-            },
-            {
-              type: "rich-text",
-              label: "Description",
-              name: "description",
-            },
-            {
-              type: "string",
-              required: false,
-              label: "linkName",
-              name: "linkName",
-            },
-            {
-              type: "string",
-              required: false,
-              label: "linkURL",
-              name: "linkURL",
-            },
-          ],
+          fields: benefitsFields,
         },
       ],
     },

diff --git a/.tina/collections/shared-fields.tsx b/.tina/collections/shared-fields.tsx
@@ -0,0 +1,33 @@
+import { TinaField } from "tinacms";
+
+export const benefitsFields: TinaField[] = [
+  {
+    type: "image",
+    label: "Image URL",
+    name: "image",
+    // @ts-ignore
+    uploadDir: () => "/benefits",
+  },
+  {
+    type: "string",
+    label: "Title",
+    name: "title",
+  },
+  {
+    type: "rich-text",
+    label: "Description",
+    name: "description",
+  },
+  {
+    type: "string",
+    required: false,
+    label: "linkName",
+    name: "linkName",
+  },
+  {
+    type: "string",
+    required: false,
+    label: "linkURL",
+    name: "linkURL",
+  },
+];