diff options
Diffstat (limited to 'web/src')
11 files changed, 19 insertions, 14 deletions
diff --git a/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewOptionsSpec.js.snap b/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewOptionsSpec.js.snap index e3561ec1..01fab0a7 100644 --- a/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewOptionsSpec.js.snap +++ b/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewOptionsSpec.js.snap @@ -13,7 +13,7 @@ exports[`ContentViewOptions Component should render correctly 1`] = ` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" title="Download the content of the flow." > <i diff --git a/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewSpec.js.snap b/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewSpec.js.snap index a4bc06c5..659eb6c3 100644 --- a/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewSpec.js.snap +++ b/web/src/js/__tests__/components/ContentView/__snapshots__/ContentViewSpec.js.snap @@ -17,7 +17,7 @@ exports[`ViewImage Component should render correctly 1`] = ` <img alt="preview" className="img-thumbnail" - src="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + src="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" /> </div> `; diff --git a/web/src/js/__tests__/components/ContentView/__snapshots__/DownloadContentButtonSpec.js.snap b/web/src/js/__tests__/components/ContentView/__snapshots__/DownloadContentButtonSpec.js.snap index 66900ca4..4c578a0c 100644 --- a/web/src/js/__tests__/components/ContentView/__snapshots__/DownloadContentButtonSpec.js.snap +++ b/web/src/js/__tests__/components/ContentView/__snapshots__/DownloadContentButtonSpec.js.snap @@ -3,7 +3,7 @@ exports[`DownloadContentButton Component should render correctly 1`] = ` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" title="Download the content of the flow." > <i diff --git a/web/src/js/__tests__/components/ContentView/__snapshots__/MetaViewsSpec.js.snap b/web/src/js/__tests__/components/ContentView/__snapshots__/MetaViewsSpec.js.snap index 18ec5bba..1fdd5575 100644 --- a/web/src/js/__tests__/components/ContentView/__snapshots__/MetaViewsSpec.js.snap +++ b/web/src/js/__tests__/components/ContentView/__snapshots__/MetaViewsSpec.js.snap @@ -54,7 +54,7 @@ exports[`ContentTooLarge Components should render correctly 1`] = ` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" title="Download the content of the flow." > <i diff --git a/web/src/js/__tests__/components/FlowView/__snapshots__/MessagesSpec.js.snap b/web/src/js/__tests__/components/FlowView/__snapshots__/MessagesSpec.js.snap index c8290e45..c55d0750 100644 --- a/web/src/js/__tests__/components/FlowView/__snapshots__/MessagesSpec.js.snap +++ b/web/src/js/__tests__/components/FlowView/__snapshots__/MessagesSpec.js.snap @@ -265,7 +265,7 @@ exports[`Request Component should render correctly 1`] = ` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/request/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/request/_content" title="Download the content of the flow." > <i @@ -528,7 +528,7 @@ exports[`Response Component should render correctly 1`] = ` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" title="Download the content of the flow." > <i diff --git a/web/src/js/__tests__/components/__snapshots__/ContentViewSpec.js.snap b/web/src/js/__tests__/components/__snapshots__/ContentViewSpec.js.snap index 60b816e2..fcbab629 100644 --- a/web/src/js/__tests__/components/__snapshots__/ContentViewSpec.js.snap +++ b/web/src/js/__tests__/components/__snapshots__/ContentViewSpec.js.snap @@ -49,7 +49,7 @@ exports[`ContentView Component should render correctly with content too large 1` <a className="btn btn-default btn-xs" - href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/content" + href="/flows/d91165be-ca1f-4612-88a9-c0f8696f3e29/response/_content" title="Download the content of the flow." > <i diff --git a/web/src/js/__tests__/flow/utilsSpec.js b/web/src/js/__tests__/flow/utilsSpec.js index 2d8f0456..24e65651 100644 --- a/web/src/js/__tests__/flow/utilsSpec.js +++ b/web/src/js/__tests__/flow/utilsSpec.js @@ -25,15 +25,15 @@ describe('MessageUtils', () => { let msg = "foo", view = "bar", flow = { request: msg, id: 1} expect(utils.MessageUtils.getContentURL(flow, msg, view)).toEqual( - "/flows/1/request/content/bar" + "/flows/1/request/content/bar.json" ) expect(utils.MessageUtils.getContentURL(flow, msg, '')).toEqual( - "/flows/1/request/content" + "/flows/1/request/_content" ) // response flow = {response: msg, id: 2} expect(utils.MessageUtils.getContentURL(flow, msg, view)).toEqual( - "/flows/2/response/content/bar" + "/flows/2/response/content/bar.json" ) }) }) diff --git a/web/src/js/backends/static.js b/web/src/js/backends/static.js index 6657fecf..7e87a5ed 100644 --- a/web/src/js/backends/static.js +++ b/web/src/js/backends/static.js @@ -11,10 +11,8 @@ export default class StaticBackend { } onOpen() { - this.fetchData("settings") this.fetchData("flows") - this.fetchData("events") - this.fetchData("options") + // this.fetchData("events") # TODO: Add events log to static viewer. } fetchData(resource) { diff --git a/web/src/js/components/FlowView/Messages.jsx b/web/src/js/components/FlowView/Messages.jsx index 4a31faf4..b69dfb69 100644 --- a/web/src/js/components/FlowView/Messages.jsx +++ b/web/src/js/components/FlowView/Messages.jsx @@ -9,6 +9,7 @@ import ContentView from '../ContentView' import ContentViewOptions from '../ContentView/ContentViewOptions' import ValidateEditor from '../ValueEditor/ValidateEditor' import ValueEditor from '../ValueEditor/ValueEditor' +import HideInStatic from '../common/HideInStatic' import Headers from './Headers' import { startEdit, updateEdit } from '../../ducks/ui/flow' @@ -105,6 +106,7 @@ export class Request extends Component { onContentChange={content => updateFlow({ request: {content}})} message={flow.request}/> </article> + <HideInStatic> {!noContent && <footer> <ContentViewOptions @@ -114,6 +116,7 @@ export class Request extends Component { uploadContent={content => uploadContent(flow, content, "request")}/> </footer> } + </HideInStatic> </section> ) } @@ -172,6 +175,7 @@ export class Response extends Component { message={flow.response} /> </article> + <HideInStatic> {!noContent && <footer > <ContentViewOptions @@ -181,6 +185,7 @@ export class Response extends Component { readonly={!isEdit}/> </footer> } + </HideInStatic> </section> ) } diff --git a/web/src/js/flow/utils.js b/web/src/js/flow/utils.js index 3c38058e..9915a639 100644 --- a/web/src/js/flow/utils.js +++ b/web/src/js/flow/utils.js @@ -49,7 +49,7 @@ export var MessageUtils = { } else if (message === flow.response) { message = "response"; } - return `/flows/${flow.id}/${message}/content` + (view ? `/${view}` : ''); + return `/flows/${flow.id}/${message}/` + (view ? `content/${view}.json` : '_content'); } }; diff --git a/web/src/js/utils.js b/web/src/js/utils.js index e8470cec..3aeba1b1 100644 --- a/web/src/js/utils.js +++ b/web/src/js/utils.js @@ -88,6 +88,8 @@ export function fetchApi(url, options={}) { } else { url += "&" + xsrf; } + } else { + url += '.json' } return fetch(url, { |