From e3277a7a1a1cc4cdc444fd84214f9ab110148264 Mon Sep 17 00:00:00 2001 From: bCatanant Date: Thu, 13 May 2021 16:31:15 -0300 Subject: [PATCH] fix front end request Signed-off-by: bCatanant --- ui/src/core/providers/circle.ts | 13 +++++++++++++ .../Comparation/Item/MetricsGroups/AddAction.tsx | 8 ++++---- ui/src/modules/Circles/hooks.ts | 13 ++++++++++++- 3 files changed, 29 insertions(+), 5 deletions(-) diff --git a/ui/src/core/providers/circle.ts b/ui/src/core/providers/circle.ts index d6caef75b3..9cd872f04a 100644 --- a/ui/src/core/providers/circle.ts +++ b/ui/src/core/providers/circle.ts @@ -143,3 +143,16 @@ export const findAllCirclesWithoutActive = ( return baseRequest(`${endpoint}?${params}`); }; + +export const findAllCirclesSimple = ( + filter: CircleFilter = initialCircleFilter, + except: string +) => { + const params = new URLSearchParams({ + size: `${DEFAULT_PAGE_SIZE}`, + name: filter?.name, + except: except + }); + + return baseRequest(`${endpoint}/simple?${params}`); +}; diff --git a/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx b/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx index f6d0c17149..1d0e962b0c 100644 --- a/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx +++ b/ui/src/modules/Circles/Comparation/Item/MetricsGroups/AddAction.tsx @@ -23,7 +23,7 @@ import isUndefined from 'lodash/isUndefined'; import Styled from './styled'; import CustomOption from 'core/components/Form/Select/CustomOptions'; import debounce from 'debounce-promise'; -import { useCircle, useCirclesActive } from 'modules/Circles/hooks'; +import { useCircle, useCircleSimple } from 'modules/Circles/hooks'; import { normalizeSelectOptions } from 'core/utils/select'; import { createActionPayload, @@ -61,7 +61,7 @@ const AddAction = ({ onGoBack, metricsGroup, circleId, action }: Props) => { const [selectedAction, setSelectedAction] = useState(''); const [isSaving, setIsSaving] = useState(false); const [currentCircleOptions, setCurrentCircleOptions] = useState([]); - const { getCirclesData } = useCirclesActive(); + const { getCirclesSimple } = useCircleSimple(); const { getActionGroup, actionData, @@ -128,10 +128,10 @@ const AddAction = ({ onGoBack, metricsGroup, circleId, action }: Props) => { const loadCirclesByName = debounce( name => - getCirclesData({ name }).then(response => { + getCirclesSimple({ name }).then(response => { const options = normalizeSelectOptions(response.content); setCurrentCircleOptions(options); - return options; + return options; } ), 500 diff --git a/ui/src/modules/Circles/hooks.ts b/ui/src/modules/Circles/hooks.ts index 8d7de64e7c..1e280f9cbc 100644 --- a/ui/src/modules/Circles/hooks.ts +++ b/ui/src/modules/Circles/hooks.ts @@ -28,7 +28,8 @@ import { updateCircleManually, findAllCirclesWithoutActive, updateCirclePercentage, - createCirclePercentage + createCirclePercentage, + findAllCirclesSimple } from 'core/providers/circle'; import { undeploy } from 'core/providers/deployment'; import { useDispatch } from 'core/state/hooks'; @@ -182,6 +183,16 @@ export const useCirclesActive = () => { }; }; +export const useCircleSimple = () => { + const getCirclesSimple = useFetchData>( + findAllCirclesSimple + ); + + return { + getCirclesSimple + }; +}; + export const useCircles = ( type: CIRCLE_TYPES ): [boolean, Function, Function, CirclePagination] => {