@eohjsc/react-native-smart-city 0.2.47 → 0.2.48

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@eohjsc/react-native-smart-city",
   "title": "React Native Smart Home",
-  "version": "0.2.47",
+  "version": "0.2.48",
   "description": "TODO",
   "main": "index.js",
   "files": [
@@ -39,12 +39,16 @@
     "reset-cache": "react-native start --reset-cache",
     "merge_conflict": "yarn jest && yarn update_coverage_result && yarn check_coverage_config",
     "jest": "jest --detectOpenHandles",
-    "postinstall": "patch-package",
+    "postinstall": "patch-package && npx husky install",
     "example": "yarn --cwd example",
     "pods": "cd example && pod-install --quiet",
     "bootstrap": "yarn example && yarn && yarn pods",
     "build": "sync-files ./src ../EohMobile/node_modules/@eohjsc/react-native-smart-city/src",
-    "watch": "sync-files --watch ./src ../EohMobile/node_modules/@eohjsc/react-native-smart-city/src"
+    "watch": "sync-files --watch ./src ../EohMobile/node_modules/@eohjsc/react-native-smart-city/src",
+    "test:code-formatter": "prettier src/**/**/*.js --write",
+    "test:code-formatter-step-1": "prettier --check src/**/*.js",
+    "test:code-formatter-step-2": "prettier --check src/**/**/*.js",
+    "test:code-formatter-step-3": "prettier --check src/**/**/**/*.js"
   },
   "repository": {
     "type": "git",
@@ -159,6 +163,7 @@
     "react-native-gesture-handler": "^1.7.0",
     "react-native-get-location": "^2.0.0",
     "react-native-image-picker": "^3.1.4",
+    "react-native-image-resizer": "^1.4.5",
     "react-native-input-credit-card": "^0.5.5",
     "react-native-iphone-x-helper": "^1.2.1",
     "react-native-keyboard-aware-scroll-view": "^0.9.2",
@@ -201,6 +206,21 @@
     "validator": "^13.1.1",
     "victory-native": "^35.0.1"
   },
+  "husky": {
+    "hooks": {
+      "pre-commit": "lint-staged",
+      "pre-push": "yarn jest"
+    }
+  },
+  "lint-staged": {
+    "*.{js, ts}": [
+      "yarn lint",
+      "yarn test:code-formatter",
+      "yarn test:code-formatter-step-1",
+      "yarn test:code-formatter-step-2",
+      "yarn test:code-formatter-step-3"
+    ]
+  },
   "bugs": {
     "url": "https://github.com/github_account/react-native-smart-city/issues"
   },

package/src/commons/Dashboard/MyPinnedSharedUnit/styles.js

@@ -1,5 +1,5 @@
 import { Dimensions, StyleSheet } from 'react-native';
-import { Colors } from 'configs';
+import { Colors } from '../../../configs';
 
 const { width: widthScreen } = Dimensions.get('window');
 

package/src/screens/ActivityLog/__test__/ItemLog.test.js

@@ -19,26 +19,6 @@ jest.mock('react', () => {
   };
 });
 
-test('test ItemLog action', () => {
-  let tree;
-  let props = {
-    item: {
-      action_name: 'action',
-      name: 'name',
-      created_at: '2021-07-02T15:48:24.917932Z',
-    },
-    type: 'action',
-    length: 1,
-    index: 0,
-  };
-  act(() => {
-    tree = create(wrapComponent(props));
-  });
-  const instance = tree.root;
-  const texts = instance.findAllByType(Text);
-  expect(texts[2].props.children).toBe(props.item.name);
-});
-
 test('test ItemLog smart assistant', () => {
   let tree;
   let props = {

package/src/screens/ScriptDetail/index.js

@@ -363,7 +363,6 @@ const ScriptDetail = ({ route }) => {
       time_repeat,
       weekday_repeat,
     } = automate;
-
     if (type === AUTOMATE_TYPE.VALUE_CHANGE) {
       let textCondition;
       if (condition === '>') {
@@ -381,13 +380,13 @@ const ScriptDetail = ({ route }) => {
           : time_repeat;
       const date = date_repeat.split('-').reverse().join('/');
       const weekday = {
-        0: t('mon'),
-        1: t('tue'),
-        2: t('wed'),
-        3: t('thu'),
-        4: t('fri'),
-        5: t('sat'),
-        6: t('sun'),
+        1: t('mon'),
+        2: t('tue'),
+        3: t('wed'),
+        4: t('thu'),
+        5: t('fri'),
+        6: t('sat'),
+        0: t('sun'),
       };
 
       if (repeat === REPEAT_OPTIONS.ONCE) {
@@ -395,7 +394,17 @@ const ScriptDetail = ({ route }) => {
       } else if (repeat === REPEAT_OPTIONS.EVERYDAY) {
         return `${t('every_day_at', { time })}`;
       } else if (repeat === REPEAT_OPTIONS.EVERYWEEK) {
-        const sortWeekday = weekday_repeat.sort((a, b) => a - b);
+        //sort 0 is last number, exp: [1,3,5,0]
+        const newWeekdayRepeat = weekday_repeat.map((item) => parseInt(item));
+        const sortWeekday = newWeekdayRepeat.sort((a, b) => {
+          if (a !== 0 && b === 0) {
+            return -1;
+          }
+          if (a === 0 && b !== 0) {
+            return 1;
+          }
+          return a - b;
+        });
         const textWeekday = sortWeekday.map((item) => weekday[item]).join(', ');
         return `${textWeekday} ${t('at')} ${time}`;
       }

package/src/screens/SetSchedule/components/SelectWeekday.js

@@ -5,7 +5,15 @@ import { Colors } from '../../../configs';
 import styles from '../styles/SelectWeekdayStyles';
 import { useTranslations } from '../../../hooks/Common/useTranslations';
 
-const WEEKDAY_ITEMS = ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'];
+const WEEKDAY_ITEMS = [
+  { day: 'Mon', value: 1 },
+  { day: 'Tue', value: 2 },
+  { day: 'Wed', value: 3 },
+  { day: 'Thu', value: 4 },
+  { day: 'Fri', value: 5 },
+  { day: 'Sat', value: 6 },
+  { day: 'Sun', value: 0 },
+];
 
 const SelectWeekday = ({ weekday, setWeekday }) => {
   const t = useTranslations();
@@ -23,11 +31,10 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
   );
 
   const WeekdayItem = useCallback(
-    ({ item, index, isSelected }) => {
+    ({ item, isSelected }) => {
       return (
         <TouchableOpacity
-          key={index}
-          onPress={() => onSetWeekday(`${index}`)}
+          onPress={() => onSetWeekday(`${item?.value}`)}
           style={[styles.item, isSelected && styles.selected]}
         >
           <Text
@@ -36,7 +43,7 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
             style={styles.text}
             semibold
           >
-            {item}
+            {item?.day}
           </Text>
         </TouchableOpacity>
       );
@@ -54,8 +61,7 @@ const SelectWeekday = ({ weekday, setWeekday }) => {
           <WeekdayItem
             key={index}
             item={item}
-            index={index}
-            isSelected={weekday.includes(`${index}`)}
+            isSelected={weekday.includes(`${item?.value}`)}
           />
         ))}
       </View>

package/src/screens/SubUnit/AddSubUnit.js

@@ -34,9 +34,9 @@ const prepareImageToUpload = async (image) => {
     70
   );
   return {
-    fileName: result.name,
+    fileName: result?.name,
     type: 'image/jpeg',
-    uri: result.uri,
+    uri: result?.uri,
   };
 };
 

package/src/screens/SubUnit/__test__/AddSubUnit.test.js

@@ -24,6 +24,7 @@ const mockedGoBack = jest.fn();
 
 jest.mock('axios');
 jest.mock('react-native-toast-message');
+jest.mock('react-native-image-resizer');
 
 jest.mock('react-redux', () => {
   return {

package/src/screens/Unit/SmartAccount.js

@@ -20,7 +20,7 @@ import { useTranslations } from '../../hooks/Common/useTranslations';
 import { useStateAlertRemove } from '../Unit/hook/useStateAlertRemove';
 
 const ListSmartAccount = ({ route }) => {
-  const { unitId } = route.params;
+  const { unitId } = route?.params || {};
   const t = useTranslations();
   const [data, setData] = useState([]);
   const smartAccountRef = useRef(null);