@eohjsc/react-native-smart-city 0.3.59 → 0.3.60

package/package.json

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

package/src/configs/API.js

@@ -209,11 +209,10 @@ const API = {
   // NOTE: DEV MODE
   DEV_MODE: {
     DASHBOARD: {
-      DETAIL: (id) =>
-        `/property_manager/iot_dashboard/dev_mode/templates/${id}/`,
-      GET_TEMPLATES: '/property_manager/iot_dashboard/dev_mode/templates/',
+      DETAIL: (id) => `/property_manager/iot_dashboard/dev_mode/units/${id}/`,
+      GET_TEMPLATES: '/property_manager/iot_dashboard/dev_mode/units/',
       GET_WIDGETS: (templateId) =>
-        `/property_manager/iot_dashboard/dev_mode/templates/${templateId}/widgets/`,
+        `/property_manager/iot_dashboard/dev_mode/units/${templateId}/widgets/`,
     },
     GATEWAY: {
       LIST: () => '/chip_manager/developer_mode_chips/',

package/src/screens/Device/components/SensorDisplayItem.js

@@ -62,7 +62,7 @@ export const SensorDisplayItem = ({
   if (type === 'compass') {
     setShowWindDirection && setShowWindDirection(true);
   }
-  switch (item.type) {
+  switch (item.template) {
     case 'camera':
       return (
         <CardDevMode title={t('camera')} id={idTemplate} isWrap>

package/src/screens/Template/__test__/EditTemplate.test.js

@@ -41,7 +41,7 @@ describe('Test EditTemplate', () => {
   const data = [
     {
       id: 1,
-      type: 'camera',
+      template: 'camera',
       configuration: {
         uri: 'http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4',
       },

package/src/screens/Template/__test__/index.test.js

@@ -3,6 +3,7 @@ import React from 'react';
 import { FlatList, TouchableOpacity } from 'react-native';
 import { act, create } from 'react-test-renderer';
 import Template from '..';
+import { Search } from '../../../commons/DevMode';
 import { API } from '../../../configs';
 import api from '../../../utils/Apis/axios';
 
@@ -39,4 +40,47 @@ describe('Test Template screen', () => {
     await TouchableOpacities[0].props.onPress();
     expect(mockNavigate).toBeCalled();
   });
+
+  it('Test onSearch', async () => {
+    mock.onGet(API.DEV_MODE.DASHBOARD.GET_TEMPLATES).reply(200, [
+      {
+        id: 1,
+        name: 'Template1',
+        description: 'test',
+      },
+      {
+        id: 1,
+        name: 'Template2',
+        description: 'test2',
+      },
+    ]);
+    await act(async () => {
+      tree = await create(<Template />);
+    });
+    const instance = tree.root;
+    const search = instance.findByType(Search);
+    await act(async () => {
+      await search.props.onSearch('Template1');
+    });
+    const flatList = instance.findByType(FlatList);
+    expect(flatList.props.data).toEqual([
+      { description: 'test', id: 1, name: 'Template1' },
+    ]);
+
+    await act(async () => {
+      await search.props.onSearch('');
+    });
+    expect(flatList.props.data).toEqual([
+      {
+        id: 1,
+        name: 'Template1',
+        description: 'test',
+      },
+      {
+        id: 1,
+        name: 'Template2',
+        description: 'test2',
+      },
+    ]);
+  });
 });

package/src/screens/Template/detail.js

@@ -184,7 +184,7 @@ const TemplateDetail = () => {
         return;
       }
 
-      const _data = _item?.configuration?.configs.map((config) => {
+      const _data = (_item?.configuration?.configs || []).map((config) => {
         const configValue = configValues[config.id]?.value;
         if ([null, undefined, NaN].includes(configValue)) {
           return;

package/src/screens/Template/index.js

@@ -22,6 +22,7 @@ const Template = () => {
   const [data, setData] = useState([]);
   const { navigate } = useNavigation();
   const isFocused = useIsFocused();
+  const [isRefreshing, setIsRefreshing] = useState(false);
 
   const onSearch = useCallback((value) => {
     if (value === '') {
@@ -42,6 +43,7 @@ const Template = () => {
   );
 
   const getTemplates = useCallback(async () => {
+    setIsRefreshing(true);
     const { success, data: dataDashboard } = await axiosGet(
       API.DEV_MODE.DASHBOARD.GET_TEMPLATES
     );
@@ -49,6 +51,7 @@ const Template = () => {
       setData(dataDashboard || []);
       arrTemplates = dataDashboard;
     }
+    setIsRefreshing(false);
   }, []);
 
   const renderListEmptyComponent = useMemo(() => {
@@ -84,6 +87,9 @@ const Template = () => {
           extraData={data}
           ListEmptyComponent={renderListEmptyComponent}
           numColumns={2}
+          showsVerticalScrollIndicator={false}
+          refreshing={isRefreshing}
+          onRefresh={getTemplates}
         />
       </View>
     </TouchableWithoutFeedback>

package/src/utils/Apis/axios.js

@@ -75,7 +75,6 @@ const parseErrorResponse = async (error) => {
     if (message?.message) {
       message = message.message;
     }
-    message = `${firstKey}: ${message}`;
   } else {
     message = error.data || error.problem;
   }