diff --git a/src/Components/API/api.ts b/src/Components/API/api.ts index 72a4947..510428d 100644 --- a/src/Components/API/api.ts +++ b/src/Components/API/api.ts @@ -42,6 +42,9 @@ export async function SetContainerList(request: ISetContainerListRequest): Promi if (window.fetch) { return await fetch(url, { method: 'POST', + headers: new Headers({ + 'Content-Type': 'application/json' + }), body: dataParsed }) .then(async(response) => @@ -56,6 +59,7 @@ export async function SetContainerList(request: ISetContainerListRequest): Promi resolve(JSON.parse(this.responseText)); } }; + xhr.setRequestHeader('Content-type', 'application/json'); xhr.send(dataParsed); }); } diff --git a/src/Components/Editor/Actions/ContextMenuActions.ts b/src/Components/Editor/Actions/ContextMenuActions.ts index 91659f8..260ce73 100644 --- a/src/Components/Editor/Actions/ContextMenuActions.ts +++ b/src/Components/Editor/Actions/ContextMenuActions.ts @@ -68,7 +68,7 @@ function HandleSetContainerList( setNewHistory( AddContainers( selectedContainer.children.length, - response.Containers.map(container => container.properties.type), + response.Containers.map(container => container.Type), selectedContainer.properties.id, configuration, history, @@ -104,7 +104,7 @@ function HandleReplace( const index = selectedContainer.parent.children.indexOf(selectedContainer); - const types = response.Containers.map(container => container.properties.type); + const types = response.Containers.map(container => container.Type); const newHistoryBeforeDelete = AddContainers( index + 1, types, diff --git a/src/Components/Editor/Editor.tsx b/src/Components/Editor/Editor.tsx index 618967f..b1b6243 100644 --- a/src/Components/Editor/Editor.tsx +++ b/src/Components/Editor/Editor.tsx @@ -62,7 +62,7 @@ function InitActions( // API Actions for (const availableContainer of configuration.AvailableContainers) { - if (availableContainer.Actions === undefined) { + if (availableContainer.Actions === undefined || availableContainer.Actions === null) { continue; } diff --git a/src/Interfaces/ISetContainerListResponse.ts b/src/Interfaces/ISetContainerListResponse.ts index 53725e4..96cdccf 100644 --- a/src/Interfaces/ISetContainerListResponse.ts +++ b/src/Interfaces/ISetContainerListResponse.ts @@ -1,6 +1,6 @@ /* eslint-disable @typescript-eslint/naming-convention */ -import { IContainerModel } from './IContainerModel'; +import { IAvailableContainer } from './IAvailableContainer'; export interface ISetContainerListResponse { - Containers: IContainerModel[] + Containers: IAvailableContainer[] } diff --git a/test-server/http.js b/test-server/http.js index 650c48a..4c84bfd 100644 --- a/test-server/http.js +++ b/test-server/http.js @@ -219,19 +219,13 @@ const FillHoleWithChassis = (request) => { const SplitRemplissage = (request) => { const lstModels = [ { - properties: { - type: 'Remplissage' - } + Type: 'Remplissage' }, { - properties: { - type: 'Montant' - } + Type: 'Montant' }, { - properties: { - type: 'Remplissage' - } + Type: 'Remplissage' }, ];