Commit 4913a80e authored by Guillermo Sanz López's avatar Guillermo Sanz López
Browse files

refactor endpoints

parent 98166848
Loading
Loading
Loading
Loading
+12 −12
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ export const getInvokers = async () => {
// GET invokers with pagination and date order
export const getInvokersPagesOrder = async ({ page, pageSize, order }) => {
  try {
    const response = await axiosInstance.get(`/invokers`, {
    const response = await axiosInstance.get(`/invokers/`, {
      params: {
        page: page,
        pageSize: pageSize,
@@ -45,7 +45,7 @@ export const deleteInvoker = async invokerId => {
export const deleteInvokers = async invokerIds => {
  try {
    
    const response = await axiosInstance.delete('/invokers', {
    const response = await axiosInstance.delete('/invokers/', {
      headers: {
        'Content-Type': 'application/json'
      },
@@ -71,7 +71,7 @@ export const getProviders = async () => {

export const getProvidersPagesOrder = async ({ page, pageSize, order }) => {
  try {
    const response = await axiosInstance.get(`/providers`, {
    const response = await axiosInstance.get(`/providers/`, {
      params: {
        page: page,
        pageSize: pageSize,
@@ -102,7 +102,7 @@ export const deleteProviders = async providerIds => {
    
    console.log('providerIds', providerIds)
    
    const response = await axiosInstance.delete('/', {
    const response = await axiosInstance.delete('/providers/', {
      headers: {
        'Content-Type': 'application/json'
      },
@@ -136,7 +136,7 @@ export const getNumApis = async () => {
// GEt apis with pagination and date order
export const getApisPagesOrder = async ({ page, pageSize, order }) => {
  try {
    const response = await axiosInstance.get(`/apis`, {
    const response = await axiosInstance.get(`/apis/`, {
      params: {
        page: page,
        pageSize: pageSize,
@@ -158,7 +158,7 @@ export const deleteProvidersServices = async apis => {
      api: apis.map(({ apf_id, api_id }) => ({ apf_id, api_id }))
    };

    const response = await axiosInstance.delete('/', {
    const response = await axiosInstance.delete('/apis/', {
      headers: {
        'Content-Type': 'application/json'
      },
@@ -178,12 +178,12 @@ export const deleteProvidersServices = async apis => {

// USERS
export const getUsers = async id => {
  return axiosInstance.get(`/users`)
  return axiosInstance.get(`/users/users`)
}

export const getUsersPagesOrder = async ({ page, pageSize, order }) => {
  try {
    const response = await axiosInstance.get(`/resources/usersPagesOrder`, {
    const response = await axiosInstance.get(`/users/`, {
      params: {
        page: page,
        pageSize: pageSize,
@@ -198,15 +198,15 @@ export const getUsersPagesOrder = async ({ page, pageSize, order }) => {
}

export const getUser = async name => {
  return axiosInstance.get(`/resources/users/${name}`)
  return axiosInstance.get(`/users/${name}`)
}

export const getNumUsers1 = async () => {
  return axiosInstance.get(`/resources/numUsers`)
  return axiosInstance.get(`/users/numUsers`)
}

export const deleteUser = async (username, password) => {
  return axiosInstance.delete(`/user/${username}/${password}`)
  return axiosInstance.delete(`/${username}/${password}`)
}

export const deleteUsers = async (users) => {
@@ -215,7 +215,7 @@ export const deleteUsers = async (users) => {
      users: users.map(({ username, password }) => ({ username, password }))
    };

    const response = await axiosInstance.delete('/users10', {
    const response = await axiosInstance.delete('/users/', {
      headers: {
        'Content-Type': 'application/json'
      },
+1 −3
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ const Apis = () => {
  
      const currentPageBeforeDelete = currentPage; // Guarda la página actual antes de la eliminación
  
      //const { apf_id, api_id } = selectedApi
      //await deleteProviderService(apf_id, api_id)
      await deleteProvidersServices(selectedApis);
  
      // Carga el mensaje de éxito
@@ -141,7 +139,7 @@ const Apis = () => {
  
      // Refresca los datos después de la eliminación manteniendo la página actual
      // Si la página actual quedó vacía después de la eliminación, cambia a la página anterior
      const response = await getApisPages({ page: currentPage, pageSize });
      const response = await getApisPagesOrder({ page: currentPage, pageSize, order: sortOrder });
      setApis(response.data);
      setTotalApis(response.total);
      const newTotalPages = Math.ceil(response.total / pageSize);
+1 −15
Original line number Diff line number Diff line
@@ -21,20 +21,6 @@ const LinkStyled = styled(Link)(({ theme }) => ({

const Homedash = () => {

  // const queryKey = ['invokersDataAndNum']
  // // Utilizar useQuery para obtener los datos
  // const { data, isLoadingInvokers, isErrorInvokers } = useQuery({
  //   queryKey,
  //   queryFn: async () => {
  //     const [invokersNumResult, invokersDataResult] = await Promise.all([getNumInvokers(), getInvokers()]);
  //     console.log('invokersNumResult:', invokersNumResult);
  //     console.log('invokersDataResult:', invokersDataResult);

  //     console.log('invokersNumResult.data:', invokersNumResult.data);
  //     return { num: invokersNumResult, data: invokersDataResult.data };
  //   },
  // });

  // INVOKERS NUMBER
  const queryKeyNumInvokers = ['invokersNum']

@@ -83,7 +69,7 @@ const Homedash = () => {
    queryFn: getApis,
  });

  // APIS NUMBER
  // USERS NUMBER
  const queryKeyNumUsers = ['usersNum']

  const { data: usersNum, isLoadingNumUsers, isErrorNumUsers, refetchNumUsers } = useQuery({
+1 −3
Original line number Diff line number Diff line
@@ -150,8 +150,6 @@ const Users = () => {
  
      const currentPageBeforeDelete = currentPage; // Guarda la página actual antes de la eliminación
  
      // const { username, password } = selectedUser
      // await deleteUser(username, password)
      await deleteUsers(selectedUsers)
  
      // Carga el mensaje de éxito
@@ -172,7 +170,7 @@ const Users = () => {
      setDeleteDialogOpen(false);
      setSelectedUsers([]);
      setSelectedUser(null);

      setShowDeleteMessage(true);
      // Refresca los datos de la caché
      setShowDeleteMessage(true);
    } catch (error) {