From e3d75ede6558bf2770e832ca462290ec6851f692 Mon Sep 17 00:00:00 2001 From: frikky Date: Sun, 16 Aug 2020 09:29:51 +0200 Subject: [PATCH] #112: Fixed too large param and frontend app creator bugs --- backend/go-app/walkoff.go | 6 +++--- frontend/package-lock.json | 6 +++--- frontend/package.json | 2 +- frontend/src/views/AppCreator.jsx | 13 ++++++------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/backend/go-app/walkoff.go b/backend/go-app/walkoff.go index db1e322f..d6b3ff9f 100644 --- a/backend/go-app/walkoff.go +++ b/backend/go-app/walkoff.go @@ -192,7 +192,7 @@ type WorkflowExecution struct { Description string `json:"description" datastore:"description"` ID string `json:"id" datastore:"id"` Name string `json:"name" datastore:"name"` - Value string `json:"value" datastore:"value"` + Value string `json:"value" datastore:"value,noindex"` } `json:"execution_variables,omitempty" datastore:"execution_variables,omitempty"` } @@ -217,7 +217,7 @@ type Action struct { Description string `json:"description" datastore:"description"` ID string `json:"id" datastore:"id"` Name string `json:"name" datastore:"name"` - Value string `json:"value" datastore:"value"` + Value string `json:"value" datastore:"value,noindex"` } `json:"execution_variable,omitempty" datastore:"execution_variable,omitempty"` Position struct { X float64 `json:"x" datastore:"x"` @@ -307,7 +307,7 @@ type Workflow struct { Description string `json:"description" datastore:"description"` ID string `json:"id" datastore:"id"` Name string `json:"name" datastore:"name"` - Value string `json:"value" datastore:"value"` + Value string `json:"value" datastore:"value,noindex"` } `json:"execution_variables,omitempty" datastore:"execution_variables"` } diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 6f78e4b1..61b088a9 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -5868,9 +5868,9 @@ } }, "class-transformer": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.2.3.tgz", - "integrity": "sha512-qsP+0xoavpOlJHuYsQJsN58HXSl8Jvveo+T37rEvCEeRfMWoytAyR0Ua/YsFgpM6AZYZ/og2PJwArwzJl1aXtQ==" + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/class-transformer/-/class-transformer-0.3.1.tgz", + "integrity": "sha512-cKFwohpJbuMovS8xVLmn8N2AUbAuc8pVo4zEfsUVo8qgECOogns1WVk/FkOZoxhOPTyTYFckuoH+13FO+MQ8GA==" }, "class-utils": { "version": "0.3.6", diff --git a/frontend/package.json b/frontend/package.json index 129ec3e2..0c78e907 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,7 @@ "@material-ui/icons": "^4.5.1", "@material-ui/styles": "^4.5.2", "@use-it/interval": "^0.1.3", - "class-transformer": "^0.3.1", + "class-transformer": "^0.3.1", "create-react-app": "^2.0.3", "cytoscape": "^3.11.0", "cytoscape-clipboard": "^2.2.1", diff --git a/frontend/src/views/AppCreator.jsx b/frontend/src/views/AppCreator.jsx index 75182bf0..ef0d1b88 100644 --- a/frontend/src/views/AppCreator.jsx +++ b/frontend/src/views/AppCreator.jsx @@ -279,9 +279,9 @@ const AppCreator = (props) => { return response.json() }) .then((responseJson) => { - setIsAppLoaded(true) if (!responseJson.success) { alert.error("Failed to get the app") + setIsAppLoaded(true) } else { const data = JSON.parse(responseJson.body) parseIncomingOpenapiData(data) @@ -365,6 +365,8 @@ const AppCreator = (props) => { var firstUrl = data.servers[0].url if (firstUrl.endsWith("/")) { setBaseUrl(firstUrl.slice(0, firstUrl.length-1)) + } else { + setBaseUrl(firstUrl) } } @@ -378,9 +380,6 @@ const AppCreator = (props) => { securitySchemes = data.components.securitySchemes } - - console.log(data) - // FIXME - headers? var newActions = [] var wordlist = {} @@ -398,7 +397,6 @@ const AppCreator = (props) => { "errors": [], } - for (var key in methodvalue.parameters) { const parameter = methodvalue.parameters[key] if (parameter.in === "query") { @@ -520,6 +518,7 @@ const AppCreator = (props) => { } setActions(newActions) + setIsAppLoaded(true) } // Saving the app that's been configured. @@ -1590,12 +1589,12 @@ const AppCreator = (props) => { style={{flex: "1", marginTop: "5px", marginRight: "15px", backgroundColor: inputColor}} fullWidth={true} type="name" - id="outlined-with-placeholder" + id="outlined-with-placeholder" margin="normal" variant="outlined" placeholder="A description for the service" value={description} - onChange={e => setDescription(e.target.value)} + onChange={e => setDescription(e.target.value)} InputProps={{ classes: { notchedOutline: classes.notchedOutline,