Rename element_type into name

This attribute has been renamed by the alchemy-json_api gem and reflects what this attribute is called in Alchemy core.
AlchemyCMS · Nov 6, 2020 · 8b0572d · 8b0572d
1 parent 00f5c05
commit 8b0572d
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 14 deletions.
diff --git a/src/components/FallbackElement.vue b/src/components/FallbackElement.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="alchemy-fallback-element">
-    <h2>I am a dummy {{ element.element_type }} Alchemy element component</h2>
+    <h2>I am a dummy {{ element.name }} Alchemy element component</h2>
     <p>
       To replace me put a Vue component into
       <kbd>~/components/Alchemy/Elements/</kbd>

diff --git a/src/components/__tests__/fallback-element.spec.js b/src/components/__tests__/fallback-element.spec.js
@@ -5,15 +5,15 @@ function getComponent() {
   return shallowMount(FallbackElement, {
     propsData: {
       element: {
-        element_type: "main_header",
+        name: "main_header",
         essences: [
           {
             role: "headline",
           },
         ],
         nested_elements: [
           {
-            element_type: "header",
+            name: "header",
           },
         ],
       },

diff --git a/src/mixins/__tests__/element.spec.js b/src/mixins/__tests__/element.spec.js
@@ -9,7 +9,7 @@ const AlchemyElementComponent = {
 describe("Alchemy element mixin", () => {
   it("has access to the element", () => {
     const element = {
-      element_type: "content_page",
+      name: "content_page",
       essences: [],
     }
     const comp = shallowMount(AlchemyElementComponent, {
@@ -26,7 +26,7 @@ describe("Alchemy element mixin", () => {
         const comp = shallowMount(AlchemyElementComponent, {
           propsData: {
             element: {
-              element_type: "content_page",
+              name: "content_page",
               essences: [],
             },
           },
@@ -41,7 +41,7 @@ describe("Alchemy element mixin", () => {
         const comp = shallowMount(AlchemyElementComponent, {
           propsData: {
             element: {
-              element_type: "content_page",
+              name: "content_page",
               essences: [headline],
             },
           },
@@ -57,7 +57,7 @@ describe("Alchemy element mixin", () => {
         const comp = shallowMount(AlchemyElementComponent, {
           propsData: {
             element: {
-              element_type: "content_page",
+              name: "content_page",
               essences: [],
             },
           },
@@ -72,7 +72,7 @@ describe("Alchemy element mixin", () => {
         const comp = shallowMount(AlchemyElementComponent, {
           propsData: {
             element: {
-              element_type: "content_page",
+              name: "content_page",
               essences: [headline],
             },
           },

diff --git a/src/mixins/__tests__/page.spec.js b/src/mixins/__tests__/page.spec.js
@@ -40,7 +40,7 @@ describe("Alchemy page mixin", () => {
   describe("elementByName", () => {
     describe("if element exists", () =>{
       it("returns element", () => {
-        const element = { element_type: "header" }
+        const element = { name: "header" }
         const component = shallowMount(AlchemyPageComponent, {
           propsData: {
             page: {
@@ -70,7 +70,7 @@ describe("Alchemy page mixin", () => {
   describe("elementsByName", () => {
     describe("if element exists", () =>{
       it("returns element", () => {
-        const elements = [{ element_type: "header" }]
+        const elements = [{ name: "header" }]
         const component = shallowMount(AlchemyPageComponent, {
           propsData: {
             page: {
@@ -103,7 +103,7 @@ describe("Alchemy page mixin", () => {
         const component = shallowMount(AlchemyPageComponent, {
           propsData: {
             page: {
-              elements: [{ element_type: "element_component" }],
+              elements: [{ name: "element_component" }],
             },
           },
         })
@@ -118,7 +118,7 @@ describe("Alchemy page mixin", () => {
         const component = shallowMount(AlchemyPageComponent, {
           propsData: {
             page: {
-              elements: [{ element_type: "something" }],
+              elements: [{ name: "something" }],
             },
           },
         })

diff --git a/src/mixins/page.js b/src/mixins/page.js
@@ -10,7 +10,7 @@ export default {
   },
   methods: {
     elementType(element) {
-      const name = element.element_type
+      const name = element.name
       if (this.$options.components[name]) {
         return name
       }
@@ -20,7 +20,7 @@ export default {
       return this.elementsByName(name)[0]
     },
     elementsByName(name) {
-      return this.page.elements.filter((e) => e.element_type === name)
+      return this.page.elements.filter((e) => e.name === name)
     },
   },
 }