From 5c915906c84a81121876c135f26eb3a24725077b Mon Sep 17 00:00:00 2001 From: Jon Nicholson Date: Sun, 12 May 2019 20:07:50 +0100 Subject: [PATCH 1/2] fix: clean up field values display (#855) --- src/components/Fields/EnumValues.tsx | 6 ++++-- src/components/Fields/FieldDetail.tsx | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/components/Fields/EnumValues.tsx b/src/components/Fields/EnumValues.tsx index ea3fe376..30472ff7 100644 --- a/src/components/Fields/EnumValues.tsx +++ b/src/components/Fields/EnumValues.tsx @@ -17,9 +17,11 @@ export class EnumValues extends React.PureComponent {
{type === 'array' ? 'Items' : ''} {values.length === 1 ? 'Value' : 'Enum'}: - + {' '} {values.map((value, idx) => ( - {JSON.stringify(value)} + + {JSON.stringify(value)} + ))}
); diff --git a/src/components/Fields/FieldDetail.tsx b/src/components/Fields/FieldDetail.tsx index 2aa792fb..26221439 100644 --- a/src/components/Fields/FieldDetail.tsx +++ b/src/components/Fields/FieldDetail.tsx @@ -14,7 +14,9 @@ export class FieldDetail extends React.PureComponent { return (
{this.props.label} {' '} - {JSON.stringify(this.props.value)} + + {JSON.stringify(this.props.value)} +
); } From 64453ff6cdb67079e9413ad97d690d635b55ab6b Mon Sep 17 00:00:00 2001 From: Anto Date: Sun, 12 May 2019 21:10:49 +0200 Subject: [PATCH 2/2] fix: remove query string from server URL (#895) --- src/components/Endpoint/Endpoint.tsx | 4 ++-- src/utils/helpers.ts | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/components/Endpoint/Endpoint.tsx b/src/components/Endpoint/Endpoint.tsx index 00d7bda0..bc7863d4 100644 --- a/src/components/Endpoint/Endpoint.tsx +++ b/src/components/Endpoint/Endpoint.tsx @@ -5,7 +5,7 @@ import { Markdown } from '../Markdown/Markdown'; import { OptionsContext } from '../OptionsProvider'; import { SelectOnClick } from '../SelectOnClick/SelectOnClick'; -import { getBasePath } from '../../utils'; +import {getBasePath, removeQueryString} from '../../utils'; import { EndpointInfo, HttpVerb, @@ -68,7 +68,7 @@ export class Endpoint extends React.Component { {hideHostname || options.hideHostname ? getBasePath(server.url) - : server.url} + : removeQueryString(server.url)} {operation.path} diff --git a/src/utils/helpers.ts b/src/utils/helpers.ts index 699d3da5..210748f4 100644 --- a/src/utils/helpers.ts +++ b/src/utils/helpers.ts @@ -165,3 +165,9 @@ export function resolveUrl(url: string, to: string) { export function getBasePath(serverUrl: string): string { return new URL(serverUrl).pathname; } + +export function removeQueryString(serverUrl: string): string { + const url = new URL(serverUrl); + url.search = ''; + return url.toString(); +}