Merge branch 'apiserver' into 'master'

Apiserver

See merge request !82

src/redux/reducers/exporttableslice.js

@@ -3,15 +3,18 @@ import { base_url } from "../../utils/constants";
 import axios from "axios";
  
 const initialState = {
-    activitiesData:null,
+    // totalReporteesData: [],
+    activitiesData:[],
     loading: false,
     error: null,
+
 };
  
 
-export const fetchReportesActivitiesData = createAsyncThunk("getactivities", async (data) => {
+ 
+export const fetchReportesActivitiesData = createAsyncThunk("gettotalactivities", async (data) => {
   return await axios.post(`${base_url}/getActivities`,  data)
-    .then((response) =>  response.data.activities);
+    .then((response) => response.data);
 });
  
 const exporttableSlice = createSlice({
@@ -24,13 +27,15 @@ const exporttableSlice = createSlice({
    
   },
   extraReducers: (builder) => {
+
     builder.addCase(fetchReportesActivitiesData.pending, (state) => {
       state.loading = true;
       state.error = "pending";
     });
     builder.addCase(fetchReportesActivitiesData.fulfilled, (state, action) => {
+      console.log(action.payload.activities)
       state.loading = false;
-      state.activitiesData = action.payload;
+      state.activitiesData = action.payload.activities      ;
       state.error = "";
     });
     builder.addCase(fetchReportesActivitiesData.rejected, (state, action) => {