diff options
author | 2021-09-08 12:34:22 +0100 | |
---|---|---|
committer | 2021-09-10 11:46:48 +0100 | |
commit | 426fa90230fc6732bd2a74e4c202e697ecd4c11b (patch) | |
tree | d696ba8aaaba2f556cb82d651cd1c380486a7c77 /gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js | |
parent | 4ee6cfe3c0c507370118348d782b14a09e1b3c53 (diff) |
Make gui-clamp work in Docker image
Change package.json to generate URLs relative to current pathname
Change REST URLs to use window.location.pathname
Remove broken React state variables for window.location.pathname
Issue-ID: POLICY-3600
Signed-off-by: danielhanrahan <daniel.hanrahan@est.tech>
Change-Id: I6951a0a6b3f3bef15d262242df13cc2d20a198c8
Diffstat (limited to 'gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js')
-rw-r--r-- | gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js index 9a615d0..fc150ef 100644 --- a/gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js +++ b/gui-clamp/ui-react/src/components/dialogs/ControlLoop/CommissioningModal.js @@ -47,7 +47,6 @@ const AlertStyled = styled(Alert)` ` const CommissioningModal = (props) => { - const [windowLocationPathName, setWindowLocationPathName] = useState(''); const [fullToscaTemplate, setFullToscaTemplate] = useState({}); const [toscaInitialValues, setToscaInitialValues] = useState({}); const [commonProperties, setCommonProperties] = useState({}) @@ -62,9 +61,9 @@ const CommissioningModal = (props) => { let editorTemp = null useEffect(async () => { - const toscaTemplateResponse = await ControlLoopService.getToscaTemplate(name, version, windowLocationPathName) + const toscaTemplateResponse = await ControlLoopService.getToscaTemplate(name, version) .catch(error => error.message); - const toscaCommonProperties = await ControlLoopService.getCommonOrInstanceProperties(name, version, windowLocationPathName, true) + const toscaCommonProperties = await ControlLoopService.getCommonOrInstanceProperties(name, version, true) .catch(error => error.message); if (!toscaCommonProperties.ok) { @@ -100,12 +99,11 @@ const CommissioningModal = (props) => { const handleCommission = async () => { - setWindowLocationPathName(window.location.pathname); - await ControlLoopService.deleteToscaTemplate('ToscaServiceTemplateSimple', "1.0.0", windowLocationPathName) + await ControlLoopService.deleteToscaTemplate('ToscaServiceTemplateSimple', "1.0.0") .catch(error => error.message) - const recommissioningResponse = await ControlLoopService.uploadToscaFile(fullToscaTemplate, windowLocationPathName) + const recommissioningResponse = await ControlLoopService.uploadToscaFile(fullToscaTemplate) .catch(error => error.message) await receiveResponseFromCommissioning(recommissioningResponse) |