Follow API documentation for budget

compendium_v2/routes/budget.py

@@ -78,8 +78,7 @@ def budget_view() -> Any:
         entries = sorted([_extract_data(entry)
                           for entry in session.query(model.BudgetEntry)],
                          key=lambda d: (d['BUDGET_YEAR'], d['NREN']))
-    dict_obj = {"data": entries}
-    return jsonify(dict_obj)
+    return jsonify(entries)
 
 
 @routes.route('/migration', methods=['GET'])

webapp/src/Schema.tsx

@@ -26,10 +26,6 @@ export interface BudgetMatrix {
     title: string
 }
 
-export interface BudgetAPI {
-    data: [Budget]
-}
-
 export interface Budget {
     BUDGET: string,
     BUDGET_YEAR: number,

webapp/src/pages/DataAnalysis.tsx

 import React, { ReactElement, useEffect, useState } from 'react';
 import { Accordion, Col, Container, ListGroup, Row } from "react-bootstrap";
-import BarGraph from "../components/graphing/BarGraph";
 import LineGraph from "../components/graphing/LineGraph";
 
-import { BudgetMatrix, DataEntrySection, Budget,BudgetAPI } from "../Schema";
-// import {evaluateInteractionItems} from "chart.js/dist/core/core.interaction";
-import barGraph from "../components/graphing/BarGraph";
+import { BudgetMatrix, DataEntrySection, Budget } from "../Schema";
 
 
 export const options = {
@@ -67,17 +64,17 @@ function DataAnalysis(): ReactElement {
         const loadData = async () => {
             console.log("budgetResponse "+ budgetResponse)
             if (budgetResponse == undefined) {
-                api<BudgetAPI>('/api/budget/', {})
-                    .then((budget: BudgetAPI) => {
-                        console.log('budget.data :', budget.data)
+                api<Budget[]>('/api/budget/', {})
+                    .then((budget: Budget[]) => {
+                        console.log('budget.data :', budget)
                         console.log('budget :', budget)
                         const entry = dataEntrySection?.items.find(i => i.id == selectedDataEntry)
                         console.log(selectedDataEntry, dataEntrySection, entry)
                         if (entry)
                             options.plugins.title.text = entry.title;
-                        setBudget(budget.data)
+                        setBudget(budget)
                         console.log("budgetResponse after api "+ budgetResponse)
-                        convertToBudgetPerYearDataResponse(budget.data)
+                        convertToBudgetPerYearDataResponse(budget)
                     })
                     .catch(error => {
                         console.log(`Error fetching from API: ${error}`);