Removed simple data / loading from useMethod and added useSimpleMetho…

…d hook
masa-finance · May 13, 2022 · ead5cd4 · ead5cd4
1 parent 9f65b38
commit ead5cd4
Show file tree

Hide file tree

Showing 5 changed files with 76 additions and 28 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@masa-finance/tools",
-  "version": "0.1.17",
+  "version": "0.1.20",
   "license": "MIT",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",

diff --git a/src/common/helpers/rest-calls/index.ts b/src/common/helpers/rest-calls/index.ts
@@ -39,11 +39,34 @@ export const useRestCall = ({
     data: body,
   });
 
-  const {
-    data: simpleData,
-    error: simpleError,
-    loading: simpleLoading,
-  } = useAxios({
+  return {
+    data,
+    error,
+    loading: loading || isLoading,
+    getData,
+  };
+};
+
+export const useSimpleRestCall = ({
+  pathParameters,
+  metadata,
+  headers,
+  body,
+}: RestCallProps) => {
+  const fullPath = useMemo(() => {
+    let newPath = metadata.name;
+    if (pathParameters) {
+      Object.keys(pathParameters).forEach((key) => {
+        //@ts-ignore
+        newPath = newPath.replace(':' + key, [pathParameters[key]]);
+      });
+    }
+    return newPath;
+  }, [pathParameters]);
+
+  const { token, isLoading } = useToken();
+
+  const axiosData = useAxios({
     url: token ? `${URL}${fullPath}` : undefined,
     headers: {
       ...headers,
@@ -52,13 +75,6 @@ export const useRestCall = ({
     method: metadata.method,
     data: body,
   });
-  return {
-    data,
-    error,
-    loading: loading || isLoading,
-    getData,
-    simpleData,
-    simpleLoading,
-    simpleError,
-  };
+
+  return { ...axiosData, loading: axiosData.loading || isLoading};
 };
diff --git a/src/common/rest/plaid/list-plaid-accounts/index.ts b/src/common/rest/plaid/list-plaid-accounts/index.ts
@@ -1,18 +1,29 @@
 import { MethodMetadata, Parameter } from '../..';
-import { useRestCall } from '../../../helpers/rest-calls';
+import { useRestCall, useSimpleRestCall } from '../../../helpers/rest-calls';
 import { Headers } from '../../../helpers/axios';
 
 const path = 'plaid-accounts/:userId';
 
 export function useMethod({ pathParameters, body }: any) {
-  const { data, error, loading, getData, simpleData, simpleLoading } =
-    useRestCall({
-      pathParameters,
-      headers: Headers,
-      body,
-      metadata,
-    });
-  return { data, error, loading, getData, simpleData, simpleLoading };
+  const { data, error, loading, getData } = useRestCall({
+    pathParameters,
+    headers: Headers,
+    body,
+    metadata,
+  });
+
+  return { data, error, loading, getData };
+}
+
+export function useSimpleMethod({ pathParameters, body }: any) {
+  const simpleCall = useSimpleRestCall({
+    pathParameters,
+    headers: Headers,
+    body,
+    metadata,
+  });
+
+  return simpleCall;
 }
 
 const parameters: Parameter[] = [

diff --git a/src/common/rest/plaid/list-plaid-transactions/index.ts b/src/common/rest/plaid/list-plaid-transactions/index.ts
@@ -1,18 +1,29 @@
 import { MethodMetadata, Parameter } from '../..';
-import { useRestCall } from '../../../helpers/rest-calls';
+import { useRestCall, useSimpleRestCall } from '../../../helpers/rest-calls';
 import { Headers } from '../../../helpers/axios';
 
 const path =
   'plaid-transactions/:accountId/?pageNbr=:pageNbr&pageSize=:pageSize';
 
 export function useMethod({ pathParameters, body }: any) {
-  const { data, error, loading, getData, simpleData, simpleLoading } = useRestCall({
+  const { data, error, loading, getData } = useRestCall({
     pathParameters,
     headers: Headers,
     body,
     metadata,
   });
-  return { data, error, loading, getData, simpleLoading, simpleData };
+  return { data, error, loading, getData };
+}
+
+export function useSimpleMethod({ pathParameters, body }: any) {
+  const simpleCall = useSimpleRestCall({
+    pathParameters,
+    headers: Headers,
+    body,
+    metadata,
+  });
+
+  return simpleCall;
 }
 
 const parameters: Parameter[] = [

diff --git a/src/common/rest/vezgo/list-accounts/index.ts b/src/common/rest/vezgo/list-accounts/index.ts
@@ -1,6 +1,6 @@
 import { MethodMetadata, Parameter } from '../..';
 import { Headers } from '../../../helpers/axios';
-import { useRestCall } from '../../../helpers/rest-calls';
+import { useRestCall, useSimpleRestCall } from '../../../helpers/rest-calls';
 
 const path = 'vezgo-accounts/:userId';
 
@@ -14,6 +14,16 @@ export function useMethod({ pathParameters, body }: any) {
   return { data, error, loading, getData };
 }
 
+export function useSimpleMethod({ pathParameters, body }: any) {
+  const simpleCall = useSimpleRestCall({
+    pathParameters,
+    headers: Headers,
+    body,
+    metadata,
+  });
+
+  return simpleCall;
+}
 const parameters: Parameter[] = [
   {
     key: 1,