@eohjsc/react-native-smart-city 0.4.98 → 0.5.0

package/src/screens/Device/detail.js

@@ -500,29 +500,34 @@ const DeviceDetail = ({ route }) => {
   useFocusEffect(
     useCallback(() => {
       let params = new URLSearchParams();
-      let configIds = [];
-      // todo Bang refactor widgets like dashboard
-      display.items.map((item) => {
-        if (!item.configuration) {
+      let configIdsSet = new Set();
+
+      display.items.forEach((item) => {
+        const { configuration } = item;
+
+        if (!configuration) {
           return;
         }
-        item.configuration.configs?.map((config) => {
-          if (!configIds.includes(config.id)) {
-            configIds.push(config.id);
-          }
-        });
-        item.configuration.options?.map((option) => {
-          if (!configIds.includes(option.config)) {
-            configIds.push(option.config);
-          }
-        });
-        if (item.configuration.config) {
-          const config = item.configuration.config;
-          const configId = config?.id ? config?.id : config;
-          !configIds.includes(configId) && configIds.push(configId);
+
+        const { configs, options, config, from_config, to_config } =
+          configuration;
+
+        configs?.forEach((config) => configIdsSet.add(config.id));
+        options?.forEach((option) => configIdsSet.add(option.config));
+
+        if (config) {
+          const configId = config.id || config;
+          configIdsSet.add(configId);
+        }
+        if (from_config) {
+          configIdsSet.add(from_config.id);
+        }
+        if (to_config) {
+          configIdsSet.add(to_config.id);
         }
       });
 
+      let configIds = Array.from(configIdsSet);
       configIds = configIds.filter(Boolean);
       configIdsTemp.current = configIds;
 
@@ -610,7 +615,7 @@ const DeviceDetail = ({ route }) => {
     }, [display.items, isNetworkConnected, sensor, mqttConfigs])
   );
 
-  useWatchConfigs(configIdsTemp.current);
+  useWatchConfigs(chipFiltered.length ? [] : configIdsTemp.current);
 
   const isShowEmergencyResolve =
     display.items.filter(
@@ -746,6 +751,7 @@ const DeviceDetail = ({ route }) => {
               }
               showWindDirection={showWindDirection}
               isDeviceHasBle={isDeviceHasBle}
+              key={`sensor${sensor.id}`}
             >
               {display.items.map((item, index) => {
                 return (

package/src/screens/Device/hooks/useDeviceWatchConfigControl.js

@@ -8,12 +8,11 @@ export const useDeviceWatchConfigControl = (
   display,
   mqttConfigs = {}
 ) => {
+  const { is_managed_by_backend, device_type } = device;
   const configsNeedWatching = useMemo(() => {
     if (
-      !device?.is_managed_by_backend ||
-      [DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(
-        device?.device_type
-      )
+      !is_managed_by_backend ||
+      [DEVICE_TYPE.GOOGLE_HOME, DEVICE_TYPE.LG_THINQ].includes(device_type)
     ) {
       return [];
     }
@@ -24,11 +23,6 @@ export const useDeviceWatchConfigControl = (
       );
     }
     return configsControl;
-  }, [
-    mqttConfigs,
-    device?.device_type,
-    device?.is_managed_by_backend,
-    display,
-  ]);
+  }, [is_managed_by_backend, device_type, display, mqttConfigs]);
   useWatchConfigs(configsNeedWatching);
 };

package/src/utils/I18n/translations/en.js

@@ -1467,7 +1467,7 @@ export default {
   'customize...': 'Customize...',
   uri_invalid: 'URI invalid',
   when_value_is: 'When value is',
-  template_not_supported: '"{template}" not yet supported',
+  template_not_supported: 'Widget "{template}" not yet supported',
   invited_user: 'Invited user {user}',
   enter_value: 'Enter value',
   enter_parameters: 'Enter parameters',

package/src/utils/I18n/translations/vi.js

@@ -1477,7 +1477,7 @@ export default {
   'customize...': 'Tùy chỉnh...',
   uri_invalid: 'URI không hợp lệ',
   when_value_is: 'Khi giá trị là',
-  template_not_supported: '"{template}" chưa được hỗ trợ',
+  template_not_supported: 'Tiện ích "{template}" chưa được hỗ trợ',
   invited_user: 'Đã mời người dùng {user}',
   enter_value: 'Nhập giá trị',
   enter_parameters: 'Nhập thông số',