case insensitive to tab view and lazy component (#115)

* case insensitive to tab view component * apply case insensitive to lazy component
ZupIT · Jun 9, 2020 · 41a5b24 · 41a5b24
1 parent 3a9aac0
commit 41a5b24
Show file tree

Hide file tree

Showing 5 changed files with 61 additions and 4 deletions.
diff --git a/__tests__/middlewares/beagleConvertToChildren.spec.ts b/__tests__/middlewares/beagleConvertToChildren.spec.ts
@@ -17,7 +17,7 @@
 import { 
   treeWithChild, treeWithChildAndChildren, treeTestChild,
   treeWithLazyComponent, treeWithLazyComponentParsed,
-  treeWithLazyComponentAndChild, treeWithLazyComponentAndChildParsed
+  treeWithLazyComponentAndChild, treeWithLazyComponentAndChildParsed, lazyComponentWithCaseInsensitive, parsedTabViewWithCaseInsensitive, parsedlazyComponentWithCaseInsensitive
 } from '../mocks'
 import beagleConvertToChildrenMiddleware from '../../src/middlewares/beagle-convert-to-children'
 
@@ -51,4 +51,9 @@ describe('ChildToChildren Middleware', () => {
     const parsedTree = beagleConvertToChildrenMiddleware(treeWithLazyComponentAndChild)
     expect(parsedTree).toEqual(treeWithLazyComponentAndChildParsed)
   })
+
+  it('should ignore case insensitive and parse', () => {
+    const parsedTree = beagleConvertToChildrenMiddleware(lazyComponentWithCaseInsensitive)
+    expect(parsedTree).toEqual(parsedlazyComponentWithCaseInsensitive)
+  })
 })
diff --git a/__tests__/middlewares/tabViewComponent.spec.ts b/__tests__/middlewares/tabViewComponent.spec.ts
@@ -18,7 +18,7 @@ import {
   simpleTab, simpleTabParsed,
   treeF,treeFParsed, treeA,
   treeG, treeGParsed,
-  treeH, treeHParsed,
+  treeH, treeHParsed, tabViewWithCaseInsensitive, parsedTabViewWithCaseInsensitive,
 } from '../mocks'
 import beagleTabViewMiddleware from '../../src/middlewares/tab-view-component'
 
@@ -54,4 +54,9 @@ describe('TabViewMiddleware', () => {
     expect(parsedTree).toEqual(treeA)
   })
 
+  it('should ignore case insensitive and parse', () => {
+    const parsedTree = beagleTabViewMiddleware(tabViewWithCaseInsensitive)
+    expect(parsedTree).toEqual(parsedTabViewWithCaseInsensitive)
+  })
+
 })
diff --git a/__tests__/mocks.ts b/__tests__/mocks.ts
@@ -858,6 +858,51 @@ export const treeWithLazyComponentAndChildParsed: IdentifiableBeagleUIElement =
   ]
 }
 
+export const tabViewWithCaseInsensitive: BeagleUIElement = {
+  _beagleComponent_: 'beagle:taBView',
+  tabItems: [
+    {
+      title: 'Container1',
+      child: {
+        _beagleComponent_: 'beagle:container'
+      }
+    },
+  ]
+}
+
+
+export const parsedTabViewWithCaseInsensitive: BeagleUIElement = {
+  _beagleComponent_: 'beagle:taBView',
+  children: [
+    {
+      _beagleComponent_: 'beagle:tabitem',
+      title: 'Container1',
+      children: [{
+        _beagleComponent_: 'beagle:container'
+      }]
+    },
+  ]
+}
+
+export const lazyComponentWithCaseInsensitive: IdentifiableBeagleUIElement = {
+  id: 'A',
+  _beagleComponent_: 'beagle:lazYComponent',
+  initialState: {
+    id: 'A.0',
+    _beagleComponent_: 'type-B',
+  },
+}
+
+export const parsedlazyComponentWithCaseInsensitive: IdentifiableBeagleUIElement = {
+  id: 'A',
+  _beagleComponent_: 'beagle:lazYComponent',
+  children: [{
+    id: 'A.0',
+    _beagleComponent_: 'type-B',
+  }],
+}
+
+
 export const configComponentsWrong: BeagleConfig<DefaultSchema>['components'] = {
   'beagle:button': 'Teste',
   'button': 'Teste'

diff --git a/src/middlewares/beagle-convert-to-children.ts b/src/middlewares/beagle-convert-to-children.ts
@@ -33,7 +33,8 @@ const convertChildToChildren = (uiTree: BeagleUIElement<any>) => {
 }
 
 const beagleLazyComponentMiddleware = (uiTree: BeagleUIElement<any>) => {
-  if (uiTree._beagleComponent_ === 'beagle:lazycomponent' && uiTree.initialState) {
+  const toLowerCaseName = uiTree._beagleComponent_.toString().toLowerCase()
+  if (toLowerCaseName === 'beagle:lazycomponent' && uiTree.initialState) {
       const initialState = uiTree.initialState
       if (typeof initialState !== 'object') return uiTree
 

diff --git a/src/middlewares/tab-view-component.ts b/src/middlewares/tab-view-component.ts
@@ -24,7 +24,8 @@ interface TabItem extends BeagleUIElement {
 }
 
 const beagleTabViewMiddleware = (uiTree: BeagleUIElement<any>) => {
-    if (uiTree._beagleComponent_ === 'beagle:tabview' && !uiTree.children) {
+    const toLowerCaseName = uiTree._beagleComponent_.toString().toLowerCase()
+    if (toLowerCaseName === 'beagle:tabview' && !uiTree.children) {
         uiTree.children = []
         const parsedItems = uiTree.tabItems.map((tab: TabItem) => {
             tab._beagleComponent_ = 'beagle:tabitem'