feat: update the groups dropdown filters data source to enterprise gr…

…oups
openedx · Feb 18, 2025 · 867f608 · 867f608
1 parent 32858b5
commit 867f608
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/components/Admin/AdminSearchForm.jsx b/src/components/Admin/AdminSearchForm.jsx
@@ -122,10 +122,10 @@ class AdminSearchForm extends React.Component {
                     </option>
                     {groups.map(group => (
                       <option
-                        value={group.enterprise_group_uuid}
-                        key={group.enterprise_group_uuid}
+                        value={group.uuid}
+                        key={group.uuid}
                       >
-                        {group.enterprise_group_name}
+                        {group.name}
                       </option>
                     ))}
                   </Form.Control>

diff --git a/src/components/learner-credit-management/data/hooks/useAllFlexEnterpriseGroups.js b/src/components/learner-credit-management/data/hooks/useAllFlexEnterpriseGroups.js
@@ -10,7 +10,7 @@ import { fetchPaginatedData } from '../../../../data/services/apiServiceUtils';
  * @param {*} queryKey The queryKey from the associated `useQuery` call.
  * @returns The enterprise group object
  */
-const getAllFlexEnterpriseGroups = async ({ enterpriseId }) => {
+export const getAllFlexEnterpriseGroups = async ({ enterpriseId }) => {
   const { results } = await fetchPaginatedData(`${LmsApiService.enterpriseGroupListUrl}?enterprise_uuids=${enterpriseId}`);
   const flexGroups = results.filter(result => result.groupType === 'flex');
   return flexGroups;

diff --git a/src/data/actions/enterpriseGroups.js b/src/data/actions/enterpriseGroups.js
@@ -5,7 +5,7 @@ import {
   FETCH_ENTERPRISE_GROUPS_FAILURE,
   CLEAR_ENTERPRISE_GROUPS,
 } from '../constants/enterpriseGroups';
-import EnterpriseDataApiService from '../services/EnterpriseDataApiService';
+import { getAllFlexEnterpriseGroups } from '../../components/learner-credit-management/data/hooks/useAllFlexEnterpriseGroups';
 
 const fetchEnterpriseGroupsRequest = () => ({ type: FETCH_ENTERPRISE_GROUPS_REQUEST });
 const fetchEnterpriseGroupsSuccess = data => ({
@@ -20,9 +20,9 @@ const fetchEnterpriseGroupsFailure = error => ({
 const fetchEnterpriseGroups = enterpriseId => (
   (dispatch) => {
     dispatch(fetchEnterpriseGroupsRequest());
-    return EnterpriseDataApiService.fetchEnterpriseGroups(enterpriseId)
+    return getAllFlexEnterpriseGroups({ enterpriseId })
       .then((response) => {
-        dispatch(fetchEnterpriseGroupsSuccess(response.data));
+        dispatch(fetchEnterpriseGroupsSuccess(response));
       })
       .catch((error) => {
         logError(error);