diff --git a/src/core/components/operation.jsx b/src/core/components/operation.jsx index 9b71d465..7f3c8b9f 100644 --- a/src/core/components/operation.jsx +++ b/src/core/components/operation.jsx @@ -54,11 +54,11 @@ export default class Operation extends PureComponent { let { isShown, - isShownKey, jumpToKey, path, method, op, + tag, showSummary, operationId, allowTryItOut, @@ -83,6 +83,7 @@ export default class Operation extends PureComponent { let security = operation.get("security") || specSelectors.security() let parameters = getList(operation, ["parameters"]) let operationScheme = specSelectors.operationScheme(path, method) + let isShownKey = ["operations", tag, operationId] const Responses = getComponent("responses") const Parameters = getComponent( "parameters" ) @@ -110,7 +111,7 @@ export default class Operation extends PureComponent { e.preventDefault() : null} - href={isDeepLinkingEnabled ? `#/${tagKey}/${operationKey}` : null}> + href={isDeepLinkingEnabled ? `#/${isShownKey.join("/")}` : null}> {path} diff --git a/src/core/containers/OperationContainer.jsx b/src/core/containers/OperationContainer.jsx index 14dc6d09..ac192389 100644 --- a/src/core/containers/OperationContainer.jsx +++ b/src/core/containers/OperationContainer.jsx @@ -22,7 +22,6 @@ export default class OperationContainer extends PureComponent { operationId: PropTypes.string.isRequired, showSummary: PropTypes.bool.isRequired, isShown: PropTypes.bool.isRequired, - isShownKey: PropTypes.instanceOf(Iterable).isRequired, jumpToKey: PropTypes.string.isRequired, allowTryItOut: PropTypes.bool, displayOperationId: PropTypes.bool, @@ -55,13 +54,12 @@ export default class OperationContainer extends PureComponent { const { docExpansion, deepLinking, displayOperationId, displayRequestDuration } = getConfigs() const showSummary = layoutSelectors.showSummary() const operationId = op.getIn(["operation", "operationId"]) || op.getIn(["operation", "__originalOperationId"]) || opId(op.get("operation"), props.path, props.method) || op.get("id") - const isShownKey = fromJS(["operations", props.tag, operationId]) + const isShownKey = ["operations", props.tag, operationId] const isDeepLinkingEnabled = deepLinking && deepLinking !== "false" return { operationId, isDeepLinkingEnabled, - isShownKey, showSummary, displayOperationId, displayRequestDuration, @@ -125,7 +123,6 @@ export default class OperationContainer extends PureComponent { operationId, showSummary, isShown, - isShownKey, jumpToKey, allowTryItOut, response, @@ -155,7 +152,6 @@ export default class OperationContainer extends PureComponent { operationId, showSummary, isShown, - isShownKey, jumpToKey, allowTryItOut, request, @@ -171,6 +167,7 @@ export default class OperationContainer extends PureComponent { operation={operationProps} response={response} request={request} + isShown={isShown} toggleShown={this.toggleShown} onTryoutClick={this.onTryoutClick}