fix: request passed from url

open-rpc · Mar 6, 2020 · 93848bb · 93848bb
1 parent fe93536
commit 93848bb
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 9 deletions.
diff --git a/src/containers/Inspector.tsx b/src/containers/Inspector.tsx
@@ -92,7 +92,15 @@ const Inspector: React.FC<IProps> = (props) => {
     setTabUrl,
     handleLabelChange,
     setTabResults,
-  } = useTabs();
+  } = useTabs(
+    [
+      {
+        name: "New Tab",
+        content: props.request || { ...emptyJSONRPC },
+        url: props.url || "",
+      }
+    ]
+  );
   const [id, incrementId] = useCounter(0);
   const [openrpcDocument, setOpenRpcDocument] = useState();
   const [json, setJson] = useState(props.request || {
@@ -105,7 +113,7 @@ const Inspector: React.FC<IProps> = (props) => {
   const [results, setResults] = useState();
   const [url, setUrl] = useState(props.url || "");
   const [debouncedUrl] = useDebounce(url, 1000);
-  const [client, error] = useClient(url);
+  const [client, error] = useClient(debouncedUrl);
   useEffect(() => {
     if (props.openrpcMethodObject) {
       setJson({
@@ -189,11 +197,15 @@ const Inspector: React.FC<IProps> = (props) => {
       }
     }
   };
+  useEffect(() => {
+    refreshOpenRpcDocument();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [client]);
 
   useEffect(() => {
     refreshOpenRpcDocument();
     // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [debouncedUrl]);
+  }, [debouncedUrl, tabIndex]);
 
   useEffect(() => {
     if (tabs[tabIndex]) {
@@ -249,7 +261,15 @@ const Inspector: React.FC<IProps> = (props) => {
             }></Tab>
           ))}
           <Tab disableRipple style={{ minWidth: "50px" }} label={
-            <IconButton onClick={() => setTabs([...tabs, { name: "New Tab", content: { ...emptyJSONRPC }, url: "" }])}>
+            <IconButton onClick={() => setTabs([
+              ...tabs,
+              {
+                name: "New Tab",
+                content: { ...emptyJSONRPC },
+                url: "",
+              },
+            ],
+            )}>
               <PlusIcon scale={0.5} />
             </IconButton>
           }>

diff --git a/src/hooks/useQueryParams.ts b/src/hooks/useQueryParams.ts
@@ -7,9 +7,12 @@ const useQueryParams = (depth?: number) => {
       ignoreQueryPrefix: true,
       depth: depth || 100,
       decoder(str) {
-        if (/^(\d+|\d*\.\d+)$/.test(str)) {
-          return parseFloat(str);
-      }
+        if (/^([+-]?[0-9]\d*|0)$/.test(str)) {
+          return parseInt(str, 10);
+        }
+        // if (/^(\d+|\d*\.\d+)$/.test(str)) {
+        //   return parseFloat(str);
+        // }
         if (str === "false") {
           return false;
         }

diff --git a/src/hooks/useTabs.ts b/src/hooks/useTabs.ts
@@ -17,9 +17,11 @@ const emptyJSONRPC = {
   id: "0",
 };
 
-const useTabs = () => {
+const useTabs = (defaultTabs?: ITab[]) => {
   const [tabIndex, setTabIndex] = useState(0);
-  const [tabs, setTabs]: [ITab[], Dispatch<any>] = useState([{name: "New Tab", content: emptyJSONRPC, url: undefined}]);
+  const [tabs, setTabs]: [ITab[], Dispatch<any>] = useState(
+    defaultTabs || [{ name: "New Tab", content: emptyJSONRPC, url: undefined }],
+  );
 
   const handleClose = (event: React.MouseEvent<{}>, index: number) => {
     if (tabs.length === 1) {