react-native-in-app-debugger 2.0.3 → 2.0.5

package/Api/index.jsx

@@ -182,7 +182,7 @@ export default (props) => {
             : 0;
           const isExpand = expands[item.id];
           const bookmarkColor = props.bookmarks[item.id];
-          const color = item.isMocked
+          const color = !!item.mockid
             ? "blue"
             : hasResponse
             ? item.response.error
@@ -279,7 +279,11 @@ export default (props) => {
                 </TouchableOpacity>
                 {item.interface === "axios" && (
                   <TouchableOpacity
-                    onPress={() => props.goToMock(item)}
+                    onPress={() => {
+                      props.goToMock(
+                        item.mockid ? { ...item, id: item.mockid } : item
+                      );
+                    }}
                     style={styles.actionButton}
                   >
                     <Text style={{ color: "black", fontSize: 10 }}>Mock</Text>

package/Api/useApiInterceptor.js

@@ -49,12 +49,12 @@ export default ({ maxNumOfApiToStore, blacklists, blacklistRef, mocks }) => {
       timestamp: performance.now(),
       datetime: new Date().toLocaleString(),
       time: `${hour}:${minute}:${second}`,
-      isMocked: undefined,
+      mockid: undefined,
       interface: undefined
     };
     setApis((v) => {
       const newData = [
-        { request, id: Date.now().toString(36) + Math.random().toString(36), isMocked: !!data.isMocked, interface: data.interface },
+        { request, id: Date.now().toString(36) + Math.random().toString(36), mockid: data.mockid, interface: data.interface },
         ...(maxNumOfApiToStore ? v.slice(0, maxNumOfApiToStore - 1) : v),
       ];
       return newData;
@@ -201,7 +201,7 @@ export default ({ maxNumOfApiToStore, blacklists, blacklistRef, mocks }) => {
             headers,
             method,
             data,
-            isMocked: !!mock,
+            mockid: mock?.id,
             interface: 'axios',
           });
         }

package/Mock/MockDetails.jsx

@@ -1,5 +1,5 @@
-import React, { use, useEffect, useState } from 'react';
-import { FlatList, View, StyleSheet, TextInput, TouchableHighlight, TouchableOpacity, Alert } from 'react-native';
+import { useEffect, useState } from 'react';
+import { Alert, StyleSheet, TextInput, TouchableOpacity, View } from 'react-native';
 import Text from '../Text';
 import X from '../X';
 
@@ -54,14 +54,21 @@ export default (p) => {
       cb?.();
     }
   };
+  const hasResponse = !!p.mockDetails.response
+
   const reset = () => {
     if (!p.mockDetails) return;
     setTmpMockDetails(JSON.stringify(p.mockDetails, removeId, 4));
-    setTmpResBody(JSON.stringify(p.mockDetails.response.data, removeId, 4));
-    setTmpResStatus(p.mockDetails.response.status + '' || '');
+    if (hasResponse) {
+      setTmpResBody(JSON.stringify(p.mockDetails.response.data, removeId, 4));
+      setTmpResStatus(p.mockDetails.response.status + '' || '');
+    } else {
+      setTmpResBody('');
+      setTmpResStatus('');
+    }
   };
   useEffect(reset, [p.mockDetails]);
-  const [canReset, setCanReset] = useState(false);
+  // const [canReset, setCanReset] = useState(false);
 
   const parse = (data) => {
     try {
@@ -72,16 +79,26 @@ export default (p) => {
     }
   };
 
-  useEffect(() => {
-    try {
-      setCanReset(JSON.stringify(p.mockDetails, removeId) != tmpMockDetails);
-    } catch (e) {
-      setCanReset(true);
-    }
-  }, [p.mockDetails, tmpMockDetails]);
+  // console.log('xxxxx mock details', JSON.stringify(p.mockDetails, removeId)?.replace(/\s+/g, ""))
+  // console.log('xxxxx tmpMockDetails', tmpMockDetails?.replace?.(/\s+/g, ""))
+
+  // useEffect(() => {
+  //   try {
+  //     setCanReset(JSON.stringify(p.mockDetails, removeId)?.replace(/\s+/g, "") != tmpMockDetails?.replace?.(/\s+/g, ""));
+  //   } catch (e) {
+  //     setCanReset(true);
+  //   }
+  // }, [p.mockDetails, tmpMockDetails]);
   if (!p.mockDetails) return null;
+  // const canReset = JSON.stringify(p.mockDetails, removeId)?.replace(/\s+/g, '') !== tmpMockDetails?.replace?.(/\s+/g, '');
+  const canReset = !hasResponse ||
+    tmpResStatus != p.mockDetails.response.status ||
+    JSON.stringify(p.mockDetails.response.data)?.replace(/\s+/g, '') !== tmpResBody?.replace?.(/\s+/g, '');
   const isnew = !p.mocks.some((m) => m.id === p.mockDetails.id);
 
+  // console.log('xxxxx response', JSON.stringify(p.mockDetails.response.data)?.replace(/\s+/g, ''));
+  // console.log('xxxxx tmpResBody', tmpResBody?.replace?.(/\s+/g, ''));
+
   return (
     <View
       style={{

package/index.jsx

@@ -126,7 +126,7 @@ export default ({
 
   const numErrorApiCalls = apis.filter((a) => a.response?.error).length;
   const numPendingApiCalls = apis.filter((a) => !a.response).length;
-  const numMockedApiCalls = apis.filter((a) => a.isMocked).length;
+  const numMockedApiCalls = apis.filter((a) => !!a.mockid).length;
   let badgeHeight = fontSize * 3;
 
   const displayLabels = [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-in-app-debugger",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "This library's main usage is to be used by Non-Technical testers during UAT, SIT or any testing phase.",
   "main": "index.jsx",
   "scripts": {

package/parentDependencies.js

@@ -0,0 +1 @@
+export default {}