load sales for customer layout

benjaminpochat · Jan 12, 2024 · 167e894 · 167e894
1 parent daa73e7
commit 167e894
Show file tree

Hide file tree

Showing 17 changed files with 146 additions and 94 deletions.
diff --git a/frontend/app/src/App.js b/frontend/app/src/App.js
@@ -6,7 +6,7 @@ import { ReactKeycloakProvider } from '@react-keycloak/web'
 import Keycloak from 'keycloak-js'
 
 import ProducerLayoutWrapper from './layouts/producer/LayoutWrapper';
-import CustomerLayoutWrapper from './layouts/customer/LayoutWrapper';
+import CustomerLayout from './layouts/customer/CustomerLayout';
 
 import './App.css';
 
@@ -55,7 +55,7 @@ function App() {
 
   function getLayoutWrapper() {
     if(process.env.REACT_APP_MODE === 'CUSTOMER') {
-      return <CustomerLayoutWrapper/>
+      return <CustomerLayout/>
     }
     if(process.env.REACT_APP_MODE === 'PRODUCER') {
       return <ProducerLayoutWrapper/>

diff --git a/...nd/app/src/api/AuthenticatedApiBuilder.js → frontend/app/src/api/ApiBuilder.ts b/...nd/app/src/api/AuthenticatedApiBuilder.js → frontend/app/src/api/ApiBuilder.ts
@@ -2,7 +2,7 @@ import ApiClient from 'viandeendirect_eu/dist/ApiClient'
 import DefaultApi from 'viandeendirect_eu/dist/api/DefaultApi'
 import { MockApi } from './mock/MockApi.ts'
 
-export class AuthenticatedApiBuilder {
+export class ApiBuilder {
 
     backendUrl = undefined
 
@@ -32,6 +32,14 @@ export class AuthenticatedApiBuilder {
         }
     }
 
+    async getAnonymousApi() {
+        if(process.env.REACT_APP_MOCK_API) {
+            return new MockApi()
+        } else {
+            return new DefaultApi(ApiClient.instance)
+        }
+    }
+
     /**
      * 
      * @param {*} apiFunction 
@@ -49,4 +57,8 @@ export class AuthenticatedApiBuilder {
             })
         }
     }
+
+    invokeAnonymousApi(apiFunction) {
+        apiFunction()
+    }
 }
diff --git a/frontend/app/src/api/mock/MockApi.ts b/frontend/app/src/api/mock/MockApi.ts
@@ -27,23 +27,23 @@ export class MockApi {
     }
 
     getPackageTemplates(callback) {
-        callback(this.mockApiProductions.getPackageTemplates())
+        callback(undefined, this.mockApiProductions.getPackageTemplates())
     }
 
     getAddresses(callback) {
-        callback(this.mockApiAddresses.getAddresses())
+        callback(undefined, this.mockApiAddresses.getAddresses())
     }
 
     getCustomers(callback) {
-        callback(this.mockApiCustomers.getCustomers())
+        callback(undefined, this.mockApiCustomers.getCustomers())
     }
 
     getCutomer(customer, callback){
         callback(undefined, this.mockApiCustomers.createCustomer(customer))
     }
 
     getSales(callback) {
-        callback(this.mockApiSales.getSales())
+        callback(undefined, this.mockApiSales.getSales())
     }
 
     getSaleOrders(options, callback) {

diff --git a/frontend/app/src/domains/customer/views/CustomersList.tsx b/frontend/app/src/domains/customer/views/CustomersList.tsx
@@ -4,21 +4,21 @@ import { Typography } from "@mui/material"
 import { DataGrid, GridRowsProp, GridColDef, GridToolbar } from '@mui/x-data-grid';
 
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 
 export default function CustomersList() {
 
     const [customers, setCustomers] = useState([])
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
         loadCustomers()
     }, [keycloak])
 
     function loadCustomers() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getCustomers((error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/production/components/BeefProductionCard.tsx b/frontend/app/src/domains/production/components/BeefProductionCard.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { useEffect, useState } from 'react';
 import { useKeycloak } from '@react-keycloak/web'
 import { Button, Card, CardActions, CardContent, Typography } from "@mui/material"
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 import dayjs from 'dayjs'
 
 export default function BeefProductionCard({
@@ -12,11 +12,11 @@ export default function BeefProductionCard({
 
     const [beefProduction, setBeefProduction] = useState(production)
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getBeefProduction(production.id, (error, data, response) => {
                     if (error) {
                         console.error(error);

diff --git a/frontend/app/src/domains/production/views/BeefProductionForm.js b/frontend/app/src/domains/production/views/BeefProductionForm.js
@@ -3,7 +3,7 @@ import { useState } from "react"
 import { Button, ButtonGroup, Typography, Stepper, Step, StepLabel, StepContent } from "@mui/material"
 import { DatePickerElement, FormContainer, SliderElement, TextFieldElement } from 'react-hook-form-mui'
 
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 import { useKeycloak } from '@react-keycloak/web'
 
 import { LocalizationProvider } from "@mui/x-date-pickers"
@@ -22,7 +22,7 @@ export default function BeefProductionForm({ callback }) {
     const { keycloak, initialized } = useKeycloak()
     const [ activeStep, setActiveStep ] = useState(SET_PRODUCTION_PROPERTIES_STEP)
     const [ beefProduction, setBeefProduction] = useState(new BeefProduction())
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     return <>
             <Typography variant="h6">Nouvel abattage bovin</Typography>
@@ -93,8 +93,8 @@ export default function BeefProductionForm({ callback }) {
     }
 
     function validate() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.createBeefProduction(beefProduction, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/production/views/PackageLotsCreator.js b/frontend/app/src/domains/production/views/PackageLotsCreator.js
@@ -1,7 +1,7 @@
 import React from 'react'
 import { useEffect, useState } from "react"
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 import PackageLot from "viandeendirect_eu/dist/model/PackageLot"
 import PackageLotsConfigurator from "../components/PackageLotConfigurator"
 
@@ -10,11 +10,11 @@ export default function PackageLotsCreator() {
 
     const { keycloak, initialized } = useKeycloak()
     const [packageLots, setPackageLots] = useState([])
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getPackageTemplates((error, data, response) => {
                     if (error) {
                         console.error(error);

diff --git a/frontend/app/src/domains/production/views/ProductionsList.tsx b/frontend/app/src/domains/production/views/ProductionsList.tsx
@@ -2,7 +2,7 @@ import React from 'react'
 import { useEffect, useState } from 'react'
 
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 
 import { Button, Typography } from "@mui/material"
 
@@ -12,15 +12,15 @@ export default function ProductionsList({createBeefProductionCallback: createBee
 
     const [productions, setProductions] = useState([])
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
         loadProductions()
     }, [keycloak])
 
     function loadProductions() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getProductions({}, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/sale/components/SaleCardBeefProduction.js b/frontend/app/src/domains/sale/components/SaleCardBeefProduction.js
@@ -1,24 +1,24 @@
 import { useEffect, useState } from 'react';
 import { useKeycloak } from '@react-keycloak/web'
 import { Typography } from "@mui/material"
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder.js'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 import { AnimalTypeUtils } from '../../../enum/AnimalType.ts';
 import styles from './SaleCard.css'
 
 export default function SaleCardBeefProduction({production: production}) {
 
     const [productionPercentageSold, setProductionPercentageSold] = useState([])
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
         loadProductionPercentageSold()
     }, [keycloak])
 
 
     function loadProductionPercentageSold() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getProductionPercentageSold(production.id, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/sale/components/SaleProductionSelector.js b/frontend/app/src/domains/sale/components/SaleProductionSelector.js
@@ -1,21 +1,21 @@
 import { useState, useEffect } from 'react'
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 import ProductionCard from '../../production/components/ProductionCard.tsx'
 
 export default function SaleProductionSelector({selectProduction: selectProduction}) {
 
     const { keycloak, initialized } = useKeycloak()
     const [productionsForSale, setProductionsForSale] = useState([])
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     useEffect(() => {
         loadProductionsForSale()
     }, [keycloak])
 
     function loadProductionsForSale() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getProductions({ 'forSale': true }, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/sale/views/OrderForm.tsx b/frontend/app/src/domains/sale/views/OrderForm.tsx
@@ -5,7 +5,7 @@ import { Button, Stepper, Step, StepLabel, StepContent, Typography } from "@mui/
 import dayjs from 'dayjs'
 
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder.js'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 
 import Customer from "viandeendirect_eu/dist/model/Customer"
 import OrderItem from "viandeendirect_eu/dist/model/OrderItem"
@@ -25,7 +25,7 @@ export default function OrderForm({ sale: sale, returnCallback: returnCallback }
     const CONFIRMATION_STEP = 3
 
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     const [productions, setProductions] = useState<Array<Production>>([])
     const [customers, setCustomers] = useState<Array<Customer>>([])
@@ -39,8 +39,8 @@ export default function OrderForm({ sale: sale, returnCallback: returnCallback }
     }, [keycloak])
 
     function loadProductions() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getSaleProductions(sale.id, (error, data, response) => {
                     if (error) {
                         console.error(error)
@@ -54,8 +54,8 @@ export default function OrderForm({ sale: sale, returnCallback: returnCallback }
     }
 
     function loadCustomers() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getCustomers((error, data, response) => {
                     if (error) {
                         console.error(error)
@@ -141,8 +141,8 @@ export default function OrderForm({ sale: sale, returnCallback: returnCallback }
     }
 
     function createCustomer(customer: Customer){
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.createCustomer(customer, (error, data, response) => {
                     if (error) {
                         console.error(error)
@@ -156,8 +156,8 @@ export default function OrderForm({ sale: sale, returnCallback: returnCallback }
     }
 
     function createOrder(order: Order) {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.createOrder(order, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/sale/views/OrderView.tsx b/frontend/app/src/domains/sale/views/OrderView.tsx
@@ -4,14 +4,14 @@ import { useEffect, useState } from 'react'
 import { Button, Typography } from '@mui/material'
 
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder.js'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 
 import OrderSummary from '../components/OrderSummary.tsx'
 
 export default function OrderView({order: rawOrder, sale: sale, returnCallback: returnCallback}) {
 
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     const [order, setOrder] = useState([])
 
@@ -20,8 +20,8 @@ export default function OrderView({order: rawOrder, sale: sale, returnCallback:
     }, [keycloak])
 
     function loadOrder() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getOrder(rawOrder.id, (error, data, response) => {
                     if (error) {
                         console.error(error)

diff --git a/frontend/app/src/domains/sale/views/OrdersList.tsx b/frontend/app/src/domains/sale/views/OrdersList.tsx
@@ -6,7 +6,7 @@ import { DataGrid, GridRowsProp, GridColDef, GridToolbar } from '@mui/x-data-gri
 import dayjs from 'dayjs'
 
 import { useKeycloak } from '@react-keycloak/web'
-import { AuthenticatedApiBuilder } from '../../../api/AuthenticatedApiBuilder.js'
+import { ApiBuilder } from '../../../api/ApiBuilder.ts'
 
 import Order from "viandeendirect_eu/dist/model/Order"
 
@@ -17,7 +17,7 @@ export default function OrdersList({
     createOrderCallback: createOrderCallback}) {
 
     const { keycloak, initialized } = useKeycloak()
-    const authenticatedApiBuilder = new AuthenticatedApiBuilder()
+    const apiBuilder = new ApiBuilder()
 
     const [orders, setOrders] = useState([])
 
@@ -26,8 +26,8 @@ export default function OrdersList({
     }, [keycloak])
 
     function loadOrders() {
-        authenticatedApiBuilder.getAuthenticatedApi(keycloak).then(api => {
-            authenticatedApiBuilder.invokeAuthenticatedApi(() => {
+        apiBuilder.getAuthenticatedApi(keycloak).then(api => {
+            apiBuilder.invokeAuthenticatedApi(() => {
                 api.getSaleOrders(sale.id, (error, data, response) => {
                     if (error) {
                         console.error(error)