@eohjsc/react-native-smart-city 0.3.90 → 0.3.91

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.3.90",
+  "version": "0.3.91",
   "description": "TODO",
   "main": "index.js",
   "files": [

package/src/commons/ActionGroup/__test__/NumberUpDownTemplate.test.js

@@ -19,7 +19,7 @@ jest.mock('@react-navigation/native', () => {
   };
 });
 
-describe('Test NumberUpDownActionTemplate', () => {
+describe('Test NumberUpDownTemplate', () => {
   const action_data = {
     color: '#00979D',
     command_prefer_over_bluetooth: true,

package/src/commons/ActionTemplate/CurtainAction.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
 import Text from '../Text';
 import styles from './CurtainActionStyles';
@@ -57,4 +57,4 @@ const CurtainAction = ({ configuration, onPress, template }) => {
   );
 };
 
-export default memo(CurtainAction);
+export default CurtainAction;

package/src/commons/ActionTemplate/OnOffButtonAction.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
 import AccessibilityLabel from '../../configs/AccessibilityLabel';
 import Text from '../Text';
@@ -52,4 +52,4 @@ const OnOffButtonAction = ({ title, configuration, onPress, template }) => {
   );
 };
 
-export default memo(OnOffButtonAction);
+export default OnOffButtonAction;

package/src/commons/ActionTemplate/OnOffSimpleAction.js

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import Text from '../Text';
 import { useTranslations } from '../../hooks/Common/useTranslations';
@@ -49,4 +49,4 @@ const OnOffSimpleAction = ({ configuration, onPress, template }) => {
   );
 };
 
-export default memo(OnOffSimpleAction);
+export default OnOffSimpleAction;

package/src/commons/ActionTemplate/OnOffSmartLockAction.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
 import Text from '../Text';
 import styles from './OnOffSmartLockActionStyles';
@@ -45,4 +45,4 @@ const OnOffSmartLockAction = ({ configuration, onPress, template }) => {
   );
 };
 
-export default memo(OnOffSmartLockAction);
+export default OnOffSmartLockAction;

package/src/commons/ActionTemplate/OneButtonAction.js

@@ -1,4 +1,4 @@
-import React, { memo } from 'react';
+import React from 'react';
 import { TouchableOpacity } from 'react-native';
 import Text from '../Text';
 import styles from './OneButtonActionStyles';
@@ -24,4 +24,4 @@ const OneButtonAction = ({ configuration, onPress, template }) => {
     </>
   );
 };
-export default memo(OneButtonAction);
+export default OneButtonAction;

package/src/commons/ActionTemplate/ThreeButtonAction.js

@@ -1,4 +1,4 @@
-import React, { memo, useCallback } from 'react';
+import React, { useCallback } from 'react';
 import { TouchableOpacity } from 'react-native';
 import Text from '../Text';
 import styles from './ThreeButtonActionStyles';
@@ -55,4 +55,4 @@ const ThreeButtonAction = ({ configuration, onPress, template }) => {
   );
 };
 
-export default memo(ThreeButtonAction);
+export default ThreeButtonAction;

package/src/commons/ActionTemplate/__test__/CurtainAction.test.js

@@ -26,7 +26,7 @@ describe('Test CurtainAction', () => {
     };
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/OnOffButtonAction.test.js

@@ -31,7 +31,7 @@ describe('Test OnOffButtonAction', () => {
     };
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/OnOffSimpleAction.test.js

@@ -19,7 +19,7 @@ describe('Test OnOffSimpleAction', () => {
     const configuration = {};
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/OnOffSmartLockAction.test.js

@@ -24,7 +24,7 @@ describe('Test OnOffSmartLockAction', () => {
     };
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/OneButtonAction.test.js

@@ -19,7 +19,7 @@ describe('Test OneButtonAction', () => {
     const configuration = {};
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/ThreeButtonAction.test.js

@@ -19,7 +19,7 @@ describe('Test ThreeButtonAction', () => {
     const configuration = {};
     const mockFuntion = jest.fn();
     await act(async () => {
-      tree = renderer.create(wrapComponent(configuration, mockFuntion));
+      tree = await renderer.create(wrapComponent(configuration, mockFuntion));
     });
     const instance = tree.root;
     const touchOpacity = instance.findAllByType(TouchableOpacity);

package/src/commons/ActionTemplate/__test__/index.test.js

@@ -10,84 +10,35 @@ import ThreeButtonAction from '../ThreeButtonAction';
 
 const mockOnSelectAction = jest.fn();
 
-const wrapComponent = (data) => (
+const wrapComponent = (item) => (
   <SCProvider initState={mockSCStore({})}>
-    <ActionTemplate data={data} onSelectAction={mockOnSelectAction} />
+    <ActionTemplate item={item} onSelectAction={mockOnSelectAction} />
   </SCProvider>
 );
 
 describe('Test ActionTemplate', () => {
   let tree;
-  let data = [
-    {
-      title: '',
-      template: 'three_button_action_template',
-      configuration: {
-        action1: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        action2: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        action3: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        icon1: 'up',
-        icon2: 'stop',
-        icon3: 'down',
-        text1: 'OPEN',
-        text2: 'STOP',
-        text3: 'CLOSE',
-        text_lock: 'Door lock',
-        is_display_lock: true,
-      },
-    },
-    {
-      title: '',
-      template: 'on_off_button_action_template',
-      configuration: {
-        action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        action_off: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        text_on: 'On',
-        text_off: 'Off',
-      },
-    },
-    {
-      title: '',
-      template: 'one_button_action_template',
-      configuration: {
-        action: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        text: 'One',
-      },
+  let item = {
+    title: '',
+    template: 'three_button_action_template',
+    configuration: {
+      action1: '94ae262d-46e3-42ff-9d10-516831ecc830',
+      action2: '94ae262d-46e3-42ff-9d10-516831ecc830',
+      action3: '94ae262d-46e3-42ff-9d10-516831ecc830',
+      icon1: 'up',
+      icon2: 'stop',
+      icon3: 'down',
+      text1: 'OPEN',
+      text2: 'STOP',
+      text3: 'CLOSE',
+      text_lock: 'Door lock',
+      is_display_lock: true,
     },
-    {
-      title: '',
-      template: 'OnOffSimpleActionTemplate',
-      configuration: {
-        action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        action_off: '94ae262d-46e3-42ff-9d10-516831ecc830',
-      },
-    },
-    {
-      title: '',
-      template: 'curtain_action_template',
-      configuration: {
-        open_action: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        close_action: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        stop_action: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        text1: 'One',
-        text2: 'Two',
-        text3: 'Three',
-      },
-    },
-    {
-      title: '',
-      template: 'OnOffSmartLockActionTemplate',
-      configuration: {
-        action_on: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        action_off: '94ae262d-46e3-42ff-9d10-516831ecc830',
-        text_on: 'on',
-        text_off: 'off',
-      },
-    },
-  ];
+  };
+
   it('test onPress SelectActionCard', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent(data));
+      tree = await renderer.create(wrapComponent(item));
     });
     const instance = tree.root;
     const selectActionCard = instance.findByType(SelectActionCard);
@@ -100,7 +51,7 @@ describe('Test ActionTemplate', () => {
 
   it('test onPressSelectAction', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent(data));
+      tree = await renderer.create(wrapComponent(item));
     });
     const instance = tree.root;
 

package/src/commons/ActionTemplate/index.js

@@ -13,7 +13,7 @@ import CurtainAction from './CurtainAction';
 import OnOffSmartLockAction from './OnOffSmartLockAction';
 import { DEVICE_TYPE } from '../../configs/Constants';
 
-const ActionTemplate = memo(({ device, data, onSelectAction }) => {
+const ActionTemplate = memo(({ device, item, onSelectAction }) => {
   const t = useTranslations();
   const [visible, setVisible] = useState(false);
   const onClose = () => setVisible(false);
@@ -47,66 +47,30 @@ const ActionTemplate = memo(({ device, data, onSelectAction }) => {
   );
 
   const renderAction = useMemo(() => {
-    return data.map((item, index) => {
-      switch (item.template) {
-        case 'on_off_button_action_template':
-          return (
-            <OnOffButtonAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-        case 'one_button_action_template':
-          return (
-            <OneButtonAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-        case 'three_button_action_template':
-          return (
-            <ThreeButtonAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-        case 'OnOffSimpleActionTemplate':
-          return (
-            <OnOffSimpleAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-        case 'curtain_action_template':
-          return (
-            <CurtainAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-        case 'OnOffSmartLockActionTemplate':
-          return (
-            <OnOffSmartLockAction
-              {...item}
-              onPress={onPressSelectAction}
-              key={index}
-            />
-          );
-      }
-    });
-  }, [data, onPressSelectAction]);
+    switch (item.template) {
+      case 'on_off_button_action_template':
+        return <OnOffButtonAction {...item} onPress={onPressSelectAction} />;
+      case 'one_button_action_template':
+        return <OneButtonAction {...item} onPress={onPressSelectAction} />;
+      case 'three_button_action_template':
+        return <ThreeButtonAction {...item} onPress={onPressSelectAction} />;
+      case 'OnOffSimpleActionTemplate':
+        return <OnOffSimpleAction {...item} onPress={onPressSelectAction} />;
+      case 'curtain_action_template':
+        return <CurtainAction {...item} onPress={onPressSelectAction} />;
+      case 'OnOffSmartLockActionTemplate':
+        return <OnOffSmartLockAction {...item} onPress={onPressSelectAction} />;
+      default:
+        return null;
+    }
+  }, [item, onPressSelectAction]);
 
   return (
     <>
       <SelectActionCard
         onPress={onPress}
         action={actionName}
-        title={t(data[0]?.title === 'Power' ? 'power' : 'action')}
+        title={t(item?.title === 'Power' ? 'power' : 'action')}
       />
 
       <ModalCustom

package/src/commons/Alert/__test__/Alert.test.js

@@ -7,7 +7,7 @@ describe('Test Alert', () => {
   let tree;
   it('create Alert', async () => {
     await act(async () => {
-      tree = renderer.create(<Alert />);
+      tree = await renderer.create(<Alert />);
     });
     const instance = tree.root;
     const Modals = instance.findAllByType(Modal);

package/src/commons/Auth/__test__/OtpInputList.test.js

@@ -12,7 +12,9 @@ describe('Test OtpInputList', () => {
   for (const code of list_code) {
     test(`create OtpInputList ${code} onfinishInputCode is func`, async () => {
       await act(async () => {
-        tree = renderer.create(<OtpInputList onfinishInputCode={mockFunc} />);
+        tree = await renderer.create(
+          <OtpInputList onfinishInputCode={mockFunc} />
+        );
       });
 
       const instance = tree.root;
@@ -31,7 +33,7 @@ describe('Test OtpInputList', () => {
 
   it('create OtpInputList not parameter', async () => {
     await act(async () => {
-      tree = renderer.create(<OtpInputList />);
+      tree = await renderer.create(<OtpInputList />);
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(TextInput);

package/src/commons/Auth/__test__/SocialButton.test.js

@@ -11,7 +11,7 @@ describe('Test OtpInputList', () => {
 
   it('create SocialButton', async () => {
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <SocialButton icon={'apple'} onPress={mockFunc} />
       );
     });
@@ -29,7 +29,9 @@ describe('Test OtpInputList', () => {
 
   it('create SocialButton icon null', async () => {
     await act(async () => {
-      tree = renderer.create(<SocialButton icon={''} onPress={mockFunc} />);
+      tree = await renderer.create(
+        <SocialButton icon={''} onPress={mockFunc} />
+      );
     });
 
     const instance = tree.root;

package/src/commons/BackDefault/__test__/BackDefault.test.js

@@ -10,7 +10,7 @@ describe('Test BackDefault', () => {
     let color = { color: 'fff' };
     let fixedHeight = { Height: 50 };
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <BackDefault goBack={goBack} color={color} fixedHeight={fixedHeight} />
       );
     });

package/src/commons/Button/__test__/Button.test.js

@@ -10,7 +10,7 @@ describe('Test button component', () => {
   it('create button auth a', async () => {
     const mockFunc = jest.fn();
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <Button
           type="info"
           title={'directions'}

package/src/commons/ButtonPopup/__test__/ButtonPopup.test.js

@@ -8,7 +8,7 @@ describe('Test button popup', () => {
 
   it('create button popup', async () => {
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <ButtonPopup
           mainTitle="Main title"
           secondaryTitle="Second title"

package/src/commons/Calendar/__test__/Calendar.test.js

@@ -22,7 +22,7 @@ describe('Test Calendar component', () => {
 
   it('create Calendar', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent({ isVisible: true }));
+      tree = await renderer.create(wrapComponent({ isVisible: true }));
     });
     const instance = tree.root;
     const calendar = instance.findAllByType(Calendar);

package/src/commons/ChartLoading/__test__/ChartLoading.test.js

@@ -16,7 +16,7 @@ describe('Test chart loading', () => {
 
   it('create chart  message null', async () => {
     await act(async () => {
-      tree = renderer.create(wrapComponent());
+      tree = await renderer.create(wrapComponent());
     });
     const instance = tree.root;
     const textInputs = instance.findAllByType(Text);

package/src/commons/CircleButton/__test__/CircleButton.test.js

@@ -7,7 +7,7 @@ describe('Test circle button', () => {
   let tree;
   it('create circle button', async () => {
     await act(async () => {
-      tree = renderer.create(<CircleButton size={5} />);
+      tree = await renderer.create(<CircleButton size={5} />);
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);

package/src/commons/CircleView/__test__/CircleView.test.js

@@ -7,7 +7,7 @@ describe('Test circle view', () => {
   let tree;
   it('create circle view', async () => {
     await act(async () => {
-      tree = renderer.create(<CircleView size={5} />);
+      tree = await renderer.create(<CircleView size={5} />);
     });
     const instance = tree.root;
     const Views = instance.findAllByType(View);

package/src/commons/DateTimeRangeChange/__test__/DateTimeButton.test.js

@@ -10,7 +10,7 @@ describe('Test DateTimeButton', () => {
 
   it('render DateTimeButton formatType = "date"', async () => {
     await act(async () => {
-      tree = renderer.create(
+      tree = await renderer.create(
         <DateTimeButton onPress={() => {}} time={time} formatType="date" />
       );
     });
@@ -21,7 +21,9 @@ describe('Test DateTimeButton', () => {
 
   it('render DateTimeButton formatType is undefined', async () => {
     await act(async () => {
-      tree = renderer.create(<DateTimeButton onPress={() => {}} time={time} />);
+      tree = await renderer.create(
+        <DateTimeButton onPress={() => {}} time={time} />
+      );
     });
     const instance = tree.root;
     const TouchableOpacities = instance.findAllByType(TouchableOpacity);