Merge branch 'circle-list' of https://github.com/ZupIT/charlescd into…

… circle-list
ZupIT · May 13, 2021 · 762146c · 762146c
2 parents 9b420f5 + e3277a7
commit 762146c
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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<Pagination<Circle>>(
+    findAllCirclesSimple
+  );
+
+  return {
+    getCirclesSimple
+  };
+};
+
 export const useCircles = (
   type: CIRCLE_TYPES
 ): [boolean, Function, Function, CirclePagination] => {