From ba9d3afc8826ba7b93f2818ceb570214a6acab04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C4=B1dvan=20Akca?= Date: Thu, 14 Mar 2024 12:25:26 +0300 Subject: [PATCH 1/2] refactor: remove unused payloads from RQ --- packages/web/src/hooks/useActionSubsteps.js | 2 +- packages/web/src/hooks/useActions.js | 2 +- packages/web/src/hooks/useAdminAppAuthClient.ee.js | 2 +- packages/web/src/hooks/useApp.js | 2 +- packages/web/src/hooks/useAppAuth.js | 2 +- packages/web/src/hooks/useAppConfig.ee.js | 2 +- packages/web/src/hooks/useApps.js | 2 +- packages/web/src/hooks/useTriggerSubsteps.js | 2 +- packages/web/src/hooks/useTriggers.js | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/web/src/hooks/useActionSubsteps.js b/packages/web/src/hooks/useActionSubsteps.js index bcc527b3..f54fb38e 100644 --- a/packages/web/src/hooks/useActionSubsteps.js +++ b/packages/web/src/hooks/useActionSubsteps.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useActionSubsteps(appKey, actionKey) { const query = useQuery({ queryKey: ['actionSubsteps', appKey, actionKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get( `/v1/apps/${appKey}/actions/${actionKey}/substeps`, { diff --git a/packages/web/src/hooks/useActions.js b/packages/web/src/hooks/useActions.js index 41295ee9..7d6d2c75 100644 --- a/packages/web/src/hooks/useActions.js +++ b/packages/web/src/hooks/useActions.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useActions(appKey) { const query = useQuery({ queryKey: ['actions', appKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/apps/${appKey}/actions`, { signal, }); diff --git a/packages/web/src/hooks/useAdminAppAuthClient.ee.js b/packages/web/src/hooks/useAdminAppAuthClient.ee.js index 32b31f27..b979d302 100644 --- a/packages/web/src/hooks/useAdminAppAuthClient.ee.js +++ b/packages/web/src/hooks/useAdminAppAuthClient.ee.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useAdminAppAuthClient(id) { const query = useQuery({ queryKey: ['adminAppAuthClient', id], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/admin/app-auth-clients/${id}`, { signal, }); diff --git a/packages/web/src/hooks/useApp.js b/packages/web/src/hooks/useApp.js index bc4edf2b..d662b812 100644 --- a/packages/web/src/hooks/useApp.js +++ b/packages/web/src/hooks/useApp.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useApp(appKey) { const query = useQuery({ queryKey: ['app', appKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/apps/${appKey}`, { signal, }); diff --git a/packages/web/src/hooks/useAppAuth.js b/packages/web/src/hooks/useAppAuth.js index d66f556a..f7ada050 100644 --- a/packages/web/src/hooks/useAppAuth.js +++ b/packages/web/src/hooks/useAppAuth.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useAppAuth(appKey) { const query = useQuery({ queryKey: ['appAuth', appKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/apps/${appKey}/auth`, { signal, }); diff --git a/packages/web/src/hooks/useAppConfig.ee.js b/packages/web/src/hooks/useAppConfig.ee.js index 078ea8e0..4f5fcc09 100644 --- a/packages/web/src/hooks/useAppConfig.ee.js +++ b/packages/web/src/hooks/useAppConfig.ee.js @@ -4,7 +4,7 @@ import api from 'helpers/api'; export default function useAppConfig(appKey) { const query = useQuery({ queryKey: ['appConfig', appKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/app-configs/${appKey}`, { signal, }); diff --git a/packages/web/src/hooks/useApps.js b/packages/web/src/hooks/useApps.js index 568a33c8..871d856d 100644 --- a/packages/web/src/hooks/useApps.js +++ b/packages/web/src/hooks/useApps.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useApps(variables) { const query = useQuery({ queryKey: ['apps', variables], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get('/v1/apps', { params: variables, signal, diff --git a/packages/web/src/hooks/useTriggerSubsteps.js b/packages/web/src/hooks/useTriggerSubsteps.js index d697ba5e..725a7f6a 100644 --- a/packages/web/src/hooks/useTriggerSubsteps.js +++ b/packages/web/src/hooks/useTriggerSubsteps.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useTriggerSubsteps(appKey, triggerKey) { const query = useQuery({ queryKey: ['triggerSubsteps', appKey, triggerKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get( `/v1/apps/${appKey}/triggers/${triggerKey}/substeps`, { diff --git a/packages/web/src/hooks/useTriggers.js b/packages/web/src/hooks/useTriggers.js index c0caa287..75d36665 100644 --- a/packages/web/src/hooks/useTriggers.js +++ b/packages/web/src/hooks/useTriggers.js @@ -5,7 +5,7 @@ import api from 'helpers/api'; export default function useTriggers(appKey) { const query = useQuery({ queryKey: ['triggers', appKey], - queryFn: async ({ payload, signal }) => { + queryFn: async ({ signal }) => { const { data } = await api.get(`/v1/apps/${appKey}/triggers`, { signal, }); From 75df7d64135444ecd5dff9c9d36dced23f2aebf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C4=B1dvan=20Akca?= Date: Thu, 14 Mar 2024 13:54:51 +0300 Subject: [PATCH 2/2] refactor: rewrite parameters of RQ hooks --- .../src/components/AddNewAppConnection/index.jsx | 12 +++++++----- packages/web/src/components/FlowStep/index.jsx | 16 ++++++++-------- packages/web/src/hooks/useActionSubsteps.js | 2 +- packages/web/src/hooks/useApps.js | 8 ++++++-- packages/web/src/hooks/useLazyApps.js | 4 ++-- packages/web/src/hooks/useTriggerSubsteps.js | 2 +- 6 files changed, 25 insertions(+), 19 deletions(-) diff --git a/packages/web/src/components/AddNewAppConnection/index.jsx b/packages/web/src/components/AddNewAppConnection/index.jsx index 0ba62b66..4ed2146f 100644 --- a/packages/web/src/components/AddNewAppConnection/index.jsx +++ b/packages/web/src/components/AddNewAppConnection/index.jsx @@ -40,12 +40,14 @@ function AddNewAppConnection(props) { const [appName, setAppName] = React.useState(''); const [isLoading, setIsLoading] = React.useState(false); - const { data: apps, mutate } = useLazyApps({ - appName, - onSuccess: () => { - setIsLoading(false); + const { data: apps, mutate } = useLazyApps( + { appName }, + { + onSuccess: () => { + setIsLoading(false); + }, }, - }); + ); const fetchData = React.useMemo(() => debounce(mutate, 300), [mutate]); diff --git a/packages/web/src/components/FlowStep/index.jsx b/packages/web/src/components/FlowStep/index.jsx index b999ec4f..b7c8f222 100644 --- a/packages/web/src/components/FlowStep/index.jsx +++ b/packages/web/src/components/FlowStep/index.jsx @@ -161,17 +161,17 @@ function FlowStep(props) { ({ key }) => key === step.key, ); - const { data: triggerSubsteps } = useTriggerSubsteps( - app?.key, - actionOrTrigger?.key, - ); + const { data: triggerSubsteps } = useTriggerSubsteps({ + appKey: app?.key, + triggerKey: actionOrTrigger?.key, + }); const triggerSubstepsData = triggerSubsteps?.data || []; - const { data: actionSubsteps } = useActionSubsteps( - app?.key, - actionOrTrigger?.key, - ); + const { data: actionSubsteps } = useActionSubsteps({ + appKey: app?.key, + actionKey: actionOrTrigger?.key, + }); const actionSubstepsData = actionSubsteps?.data || []; diff --git a/packages/web/src/hooks/useActionSubsteps.js b/packages/web/src/hooks/useActionSubsteps.js index f54fb38e..267c872a 100644 --- a/packages/web/src/hooks/useActionSubsteps.js +++ b/packages/web/src/hooks/useActionSubsteps.js @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import api from 'helpers/api'; -export default function useActionSubsteps(appKey, actionKey) { +export default function useActionSubsteps({ appKey, actionKey }) { const query = useQuery({ queryKey: ['actionSubsteps', appKey, actionKey], queryFn: async ({ signal }) => { diff --git a/packages/web/src/hooks/useApps.js b/packages/web/src/hooks/useApps.js index 871d856d..9ea31a77 100644 --- a/packages/web/src/hooks/useApps.js +++ b/packages/web/src/hooks/useApps.js @@ -3,11 +3,15 @@ import { useQuery } from '@tanstack/react-query'; import api from 'helpers/api'; export default function useApps(variables) { + const trueOnlyVariables = Object.fromEntries( + Object.entries(variables).filter(([_, value]) => value === true), + ); + const query = useQuery({ - queryKey: ['apps', variables], + queryKey: ['apps', trueOnlyVariables], queryFn: async ({ signal }) => { const { data } = await api.get('/v1/apps', { - params: variables, + params: trueOnlyVariables, signal, }); diff --git a/packages/web/src/hooks/useLazyApps.js b/packages/web/src/hooks/useLazyApps.js index 291ffcc2..33fab2c1 100644 --- a/packages/web/src/hooks/useLazyApps.js +++ b/packages/web/src/hooks/useLazyApps.js @@ -3,7 +3,7 @@ import { useMutation } from '@tanstack/react-query'; import api from 'helpers/api'; import React from 'react'; -export default function useLazyApps({ appName, onSuccess }) { +export default function useLazyApps({ appName } = {}, { onSuccess }) { const abortControllerRef = React.useRef(new AbortController()); React.useEffect(() => { @@ -15,7 +15,7 @@ export default function useLazyApps({ appName, onSuccess }) { }, [appName]); const query = useMutation({ - mutationFn: async ({ payload }) => { + mutationFn: async () => { const { data } = await api.get('/v1/apps', { params: { name: appName }, signal: abortControllerRef.current.signal, diff --git a/packages/web/src/hooks/useTriggerSubsteps.js b/packages/web/src/hooks/useTriggerSubsteps.js index 725a7f6a..6af75e01 100644 --- a/packages/web/src/hooks/useTriggerSubsteps.js +++ b/packages/web/src/hooks/useTriggerSubsteps.js @@ -2,7 +2,7 @@ import { useQuery } from '@tanstack/react-query'; import api from 'helpers/api'; -export default function useTriggerSubsteps(appKey, triggerKey) { +export default function useTriggerSubsteps({ appKey, triggerKey }) { const query = useQuery({ queryKey: ['triggerSubsteps', appKey, triggerKey], queryFn: async ({ signal }) => {