@eohjsc/react-native-smart-city 0.6.1 → 0.6.2-rc2

package/android/build.gradle

@@ -10,18 +10,18 @@
 //   original location:
 //   - https://github.com/facebook/react-native/blob/0.58-stable/local-cli/templates/HelloWorld/android/app/build.gradle
 
-def DEFAULT_COMPILE_SDK_VERSION = 32
+apply plugin: 'com.android.library'
+apply plugin: 'maven-publish'
+
+def DEFAULT_COMPILE_SDK_VERSION = 34
 def DEFAULT_BUILD_TOOLS_VERSION = '28.0.3'
 def DEFAULT_MIN_SDK_VERSION = 24
-def DEFAULT_TARGET_SDK_VERSION = 32
+def DEFAULT_TARGET_SDK_VERSION = 34
 
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
 buildscript {
     // The Android Gradle plugin is only required when opening the android folder stand-alone.
     // This avoids unnecessary downloads and potential conflicts when the library is included as a
@@ -33,14 +33,11 @@ buildscript {
             jcenter()
         }
         dependencies {
-            classpath 'com.android.tools.build:gradle:3.4.1'
+            classpath 'com.android.tools.build:gradle:7.1.2'
         }
     }
 }
 
-apply plugin: 'com.android.library'
-apply plugin: 'maven'
-
 android {
     compileSdkVersion safeExtGet('compileSdkVersion', DEFAULT_COMPILE_SDK_VERSION)
     buildToolsVersion safeExtGet('buildToolsVersion', DEFAULT_BUILD_TOOLS_VERSION)

package/package.json

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

package/src/commons/Device/ItemDevice.js

@@ -18,20 +18,19 @@ import IconComponent from '../IconComponent';
 import ItemDeviceWrapper from './ItemDeviceWrapper';
 
 const ItemDevice = memo(
-  ({ svgMain, description, title, sensor, unit, station, wrapStyle }) => {
+  ({ description, title, sensor, unit, station, wrapStyle }) => {
     const t = useTranslations();
     const navigation = useNavigation();
+    const { is_managed_by_backend, device_type, icon_kit, icon } = sensor;
 
     const {
       isConnected: isEoHBackendConnected,
       isFetchingStatus: isFetchingStatusFromEoHBackend,
     } = useEoHBackendDeviceConnected(sensor);
-
     const {
       isConnected: isHomeAssistantConnected,
       isConnecting: isHomeAssistantConnecting,
     } = useHomeAssistantDeviceConnected(sensor);
-
     const { isConnected: isBluetoothConnected } =
       useBluetoothDeviceConnected(sensor);
 
@@ -45,64 +44,51 @@ const ItemDevice = memo(
     }, [navigation, sensor, station, title, unit]);
 
     const textConnected = useMemo(() => {
-      if (!!sensor && sensor?.is_managed_by_backend) {
-        if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-          return t('connected');
-        }
-        if (isBluetoothConnected) {
-          return t('connected');
-        }
-        if (isFetchingStatusFromEoHBackend) {
-          return '';
-        }
-        if (isEoHBackendConnected) {
-          return t('connected');
-        }
-        return t('disconnected');
-      }
-      // not managed by backend
-      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
-        if (isHomeAssistantConnecting) {
-          return t('connecting');
-        }
-        if (isHomeAssistantConnected) {
+      if (is_managed_by_backend) {
+        if (
+          device_type === DEVICE_TYPE.LG_THINQ ||
+          isBluetoothConnected ||
+          isEoHBackendConnected
+        ) {
           return t('connected');
         }
+        return isFetchingStatusFromEoHBackend ? '' : t('disconnected');
+      } else if (device_type === DEVICE_TYPE.GOOGLE_HOME) {
+        return isHomeAssistantConnecting
+          ? t('connecting')
+          : isHomeAssistantConnected
+          ? t('connected')
+          : t('disconnected');
       }
       return t('disconnected');
     }, [
+      device_type,
       isBluetoothConnected,
       isEoHBackendConnected,
       isFetchingStatusFromEoHBackend,
       isHomeAssistantConnected,
       isHomeAssistantConnecting,
-      sensor,
+      is_managed_by_backend,
       t,
     ]);
 
     const canRenderQuickAction = useMemo(() => {
-      if (!!sensor && sensor?.is_managed_by_backend) {
-        if (sensor?.device_type === DEVICE_TYPE.LG_THINQ) {
-          return true;
-        }
-        if (isBluetoothConnected) {
-          return true;
-        }
-        if (isFetchingStatusFromEoHBackend) {
-          return false;
-        }
-        return true;
-      }
-      // not managed by backend
-      if (sensor?.device_type === DEVICE_TYPE.GOOGLE_HOME) {
-        return isHomeAssistantConnected;
+      if (is_managed_by_backend) {
+        return (
+          device_type === DEVICE_TYPE.LG_THINQ ||
+          isBluetoothConnected ||
+          !isFetchingStatusFromEoHBackend
+        );
       }
-      return true;
+      return device_type === DEVICE_TYPE.GOOGLE_HOME
+        ? isHomeAssistantConnected
+        : true;
     }, [
+      device_type,
       isBluetoothConnected,
       isFetchingStatusFromEoHBackend,
       isHomeAssistantConnected,
-      sensor,
+      is_managed_by_backend,
     ]);
 
     return (
@@ -114,9 +100,9 @@ const ItemDevice = memo(
       >
         <View style={styles.boxIcon}>
           <TouchableOpacity onPress={goToSensorDisplay}>
-            <IconComponent icon={sensor?.icon_kit || sensor?.icon} />
+            <IconComponent icon={icon_kit || icon} />
           </TouchableOpacity>
-          {!!canRenderQuickAction && (
+          {canRenderQuickAction && (
             <ItemQuickAction
               sensor={sensor}
               unit={unit}
@@ -155,7 +141,6 @@ const ItemDevice = memo(
 );
 
 export default ItemDevice;
-
 const styles = StyleSheet.create({
   boxIcon: {
     flexDirection: 'row',
@@ -178,11 +163,6 @@ const styles = StyleSheet.create({
   lineHeight20: {
     lineHeight: 20,
   },
-  iconSensor: {
-    width: 40,
-    height: 40,
-    resizeMode: 'contain',
-  },
   quickAction: {
     width: 32,
     height: 32,

package/src/commons/SubUnit/Favorites/index.js

@@ -56,7 +56,6 @@ const SubUnitFavorites = ({
             <ItemDevice
               key={`device-${sensor.id}`}
               id={sensor.id}
-              svgMain={sensor.icon || 'sensor'}
               statusIcon={sensor.action && sensor.action.icon}
               statusColor={sensor.action && sensor.action.color}
               description={sensor.value}

package/src/commons/SubUnit/ShortDetail.js

@@ -154,7 +154,6 @@ const ShortDetailSubUnit = ({ unit, station, isOwner }) => {
             <ItemDevice
               key={`sensor-${device.id}`}
               id={device.id}
-              svgMain={device.icon || 'sensor'}
               statusIcon={device.action && device.action.icon}
               statusColor={device.action && device.action.color}
               description={device.value}

package/src/commons/Widgets/IFrame/IFrame.js

@@ -4,51 +4,44 @@ import { styles } from './IFrameStyles';
 import IconComponent from '../../IconComponent';
 import WebView from 'react-native-webview';
 import { TouchableOpacity, View } from 'react-native';
+import { SCConfig } from '../../../configs';
 
-const IFrame = memo(
-  ({ item = {}, widgetStyle, isWidgetBox, isSetting, isEditing }) => {
-    const ref = useRef();
-    const [urlWithEnv, setUrlWithEnv] = useState();
+const IFrame = memo(({ item = {} }) => {
+  const ref = useRef();
+  const [urlWithEnv, setUrlWithEnv] = useState();
 
-    const { configuration } = item;
-    const { url } = configuration || {};
+  const { configuration, id, title } = item;
+  const { url } = configuration || {};
 
-    const reload = useCallback(() => {
-      ref.current.reload();
-    }, []);
+  const reload = useCallback(() => {
+    ref.current.reload();
+  }, []);
 
-    useEffect(() => {
-      if (!url) {
-        return;
-      }
-      if (!url.includes('?')) {
-        setUrlWithEnv(
-          `${url}?eraOrigin=${window.location.origin}&eraWidget=${item?.id}`
-        );
-      } else {
-        setUrlWithEnv(
-          `${url}&eraOrigin=${window.location.origin}&eraWidget=${item?.id}`
-        );
-      }
-    }, [item?.id, url]);
+  useEffect(() => {
+    if (!url) {
+      return;
+    }
+    if (!url.includes('?')) {
+      setUrlWithEnv(`${url}?eraOrigin=${SCConfig.apiRoot}&eraWidget=${id}`);
+    } else {
+      setUrlWithEnv(`${url}&eraOrigin=${SCConfig.apiRoot}&eraWidget=${id}`);
+    }
+  }, [id, url]);
 
-    return (
-      <View>
-        <TouchableOpacity
-          style={isEditing ? styles.reloadButtonEditing : styles.reloadButton}
-          onClick={reload}
-        >
-          <IconComponent icon="ReloadOutlined" />
-        </TouchableOpacity>
-        <WebView
-          source={{ uri: urlWithEnv }}
-          style={styles.iframe}
-          ref={ref}
-          title={item?.title}
-        />
-      </View>
-    );
-  }
-);
+  return (
+    <View>
+      <TouchableOpacity style={styles.reloadButton} onClick={reload}>
+        <IconComponent size={20} icon="ReloadOutlined" />
+      </TouchableOpacity>
+      <WebView
+        source={{ uri: urlWithEnv }}
+        style={styles.iframe}
+        ref={ref}
+        title={title}
+        javaScriptEnabled
+      />
+    </View>
+  );
+});
 
 export default IFrame;

package/src/commons/Widgets/IFrame/IFrameStyles.js

@@ -12,8 +12,6 @@ export const styles = StyleSheet.create({
     position: 'absolute',
     right: 16,
     top: 5,
-    border: '1px solid #E6E6E6',
-    backgroundColor: Colors.White,
   },
   reloadButtonEditing: {
     position: 'absolute',

package/src/commons/Widgets/IFrame/__tests__/IFrame.test.js

@@ -5,6 +5,7 @@ import IFrame from '../IFrame';
 import WebView from 'react-native-webview';
 import { TouchableOpacity } from 'react-native';
 import { render } from '../../../../../jest/render';
+import { SCConfig } from '../../../../configs';
 
 describe('Test IFrame', () => {
   let item;
@@ -24,7 +25,7 @@ describe('Test IFrame', () => {
     expect(iframes).toHaveLength(1);
 
     expect(iframes[0].props.source?.uri).toEqual(
-      'http://localhost:3000/?eraOrigin=http://localhost&eraWidget=1'
+      `http://localhost:3000/?eraOrigin=${SCConfig.apiRoot}&eraWidget=1`
     );
   });
 
@@ -36,7 +37,7 @@ describe('Test IFrame', () => {
     expect(iframes).toHaveLength(1);
 
     expect(iframes[0].props.source?.uri).toEqual(
-      'http://localhost:3000/?test=1&eraOrigin=http://localhost&eraWidget=1'
+      `http://localhost:3000/?test=1&eraOrigin=${SCConfig.apiRoot}&eraWidget=1`
     );
   });
 

package/src/configs/Constants.js

@@ -281,9 +281,9 @@ export const BUTTON_TYPE = {
 export const CHART_TIME = {
   hour: 1,
   day: 24,
-  week: 168,
-  month: 672,
-  year: 12 * 672,
+  week: 24 * 7,
+  month: 24 * 30,
+  year: 24 * 365,
 };
 
 export const WIDGET_TYPE = {

package/src/screens/Automate/AddNewAction/SetupConfigCondition.js

@@ -19,11 +19,13 @@ import { ToastBottomHelper } from '../../../utils/Utils';
 
 const valueEvaluationToOptions = (valueEvaluation) => {
   if (valueEvaluation.template === 'range') {
-    return valueEvaluation.configuration.ranges.map((range, index) => ({
-      title: range.evaluate?.text,
-      condition: 'value_evaluation',
-      value: [valueEvaluation.id, index],
-    }));
+    return (
+      valueEvaluation.configuration?.ranges?.map((range, index) => ({
+        title: range.evaluate?.text,
+        condition: 'value_evaluation',
+        value: [valueEvaluation.id, index],
+      })) || []
+    );
   }
   if (valueEvaluation.template === 'boolean') {
     return [

package/src/screens/Automate/ScriptDetail/utils.js

@@ -47,7 +47,7 @@ const generateAutomationConditionValueEvaluation = (
   if (valueEvaluation) {
     if (valueEvaluation.template === 'range') {
       return `${config_name} ${t('is')} ${
-        valueEvaluation.configuration.ranges[index]?.evaluate.text
+        valueEvaluation.configuration.ranges[index]?.evaluate?.text
       }`;
     }
     if (valueEvaluation.template === 'boolean') {

package/src/screens/SubUnit/Detail.js

@@ -116,7 +116,6 @@ const SubUnitDetail = ({ route }) => {
                   <ItemDevice
                     key={`sensor-${item.id}`}
                     id={item.id}
-                    svgMain={item.icon || 'door'}
                     statusIcon={item.action && item.action.icon}
                     statusColor={item.action && item.action.color}
                     title={item.name}

package/src/screens/UnitSummary/components/RunningDevices/index.js

@@ -15,7 +15,6 @@ const RunningDevices = memo(({ unit, summaryDetail }) => {
       <ItemDevice
         key={`sensor-${item.id}`}
         id={item.id}
-        svgMain={item.icon || 'door'}
         statusIcon={item.action && item.action.icon}
         statusColor={item.action && item.action.color}
         description={item.value}