From e6a94006bf64a959c07c7b0bd8317abeb9af4418 Mon Sep 17 00:00:00 2001 From: Karthik Venkateswaran Date: Mon, 18 Mar 2019 14:26:07 +0530 Subject: [PATCH 1/4] npm installed --- console/package-lock.json | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index bbf53f9f3f77e..c9ba1cb7d0e9f 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -6092,7 +6092,7 @@ "dependencies": { "combined-stream": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "~1.0.0" @@ -6220,7 +6220,8 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "concat-map": { "version": "0.0.1", @@ -6228,7 +6229,8 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true + "bundled": true, + "optional": true }, "core-util-is": { "version": "1.0.2", @@ -6331,7 +6333,8 @@ }, "inherits": { "version": "2.0.3", - "bundled": true + "bundled": true, + "optional": true }, "ini": { "version": "1.3.5", @@ -6341,6 +6344,7 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, + "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6452,7 +6456,8 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true + "bundled": true, + "optional": true }, "object-assign": { "version": "4.1.1", @@ -6567,6 +6572,7 @@ "string-width": { "version": "1.0.2", "bundled": true, + "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9488,7 +9494,7 @@ }, "node-fetch": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" }, "node-gyp": { @@ -12146,7 +12152,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -12243,7 +12249,7 @@ }, "p-is-promise": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", "dev": true }, @@ -17671,7 +17677,7 @@ }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" }, "whet.extend": { From fc1c19fb68a9cd408a78387604bd6ce7e422d4cb Mon Sep 17 00:00:00 2001 From: Karthik Venkateswaran Date: Mon, 18 Mar 2019 16:22:32 +0530 Subject: [PATCH 2/4] Fix #1530 --- console/src/components/ApiExplorer/ApiExplorer.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/console/src/components/ApiExplorer/ApiExplorer.js b/console/src/components/ApiExplorer/ApiExplorer.js index 1dd7c54b8802b..7f5610081164f 100644 --- a/console/src/components/ApiExplorer/ApiExplorer.js +++ b/console/src/components/ApiExplorer/ApiExplorer.js @@ -16,6 +16,14 @@ import { // import {triggerOnBoarding} from '../Main/Actions'; class ApiExplorer extends Component { + componentWillUnmount() { + const cmNodes = this.getCodeMirrorIfAvailable(); + if (cmNodes.length > 0) { + cmNodes.forEach(cm => { + cm.remove(); + }); + } + } onTabSelectionChanged = tabIndex => { this.props.dispatch(changeTabSelection(tabIndex)); }; @@ -39,6 +47,9 @@ class ApiExplorer extends Component { _query.args = JSON.parse(JSON.stringify(args)); return _query; } + getCodeMirrorIfAvailable() { + return document.querySelectorAll('.CodeMirror-hints.graphiql'); + } updateDQBState(data) { this.props.dispatch(hydrateDQBData(data)); From d75560d000bbd96259f3e1a05d2d1030eaf886dc Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 18 Mar 2019 23:28:02 +0530 Subject: [PATCH 3/4] revert package-lock.json --- console/package-lock.json | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/console/package-lock.json b/console/package-lock.json index c9ba1cb7d0e9f..bbf53f9f3f77e 100644 --- a/console/package-lock.json +++ b/console/package-lock.json @@ -6092,7 +6092,7 @@ "dependencies": { "combined-stream": { "version": "1.0.6", - "resolved": "http://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", + "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz", "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=", "requires": { "delayed-stream": "~1.0.0" @@ -6220,8 +6220,7 @@ }, "code-point-at": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "concat-map": { "version": "0.0.1", @@ -6229,8 +6228,7 @@ }, "console-control-strings": { "version": "1.1.0", - "bundled": true, - "optional": true + "bundled": true }, "core-util-is": { "version": "1.0.2", @@ -6333,8 +6331,7 @@ }, "inherits": { "version": "2.0.3", - "bundled": true, - "optional": true + "bundled": true }, "ini": { "version": "1.3.5", @@ -6344,7 +6341,6 @@ "is-fullwidth-code-point": { "version": "1.0.0", "bundled": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -6456,8 +6452,7 @@ }, "number-is-nan": { "version": "1.0.1", - "bundled": true, - "optional": true + "bundled": true }, "object-assign": { "version": "4.1.1", @@ -6572,7 +6567,6 @@ "string-width": { "version": "1.0.2", "bundled": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -9494,7 +9488,7 @@ }, "node-fetch": { "version": "2.1.2", - "resolved": "http://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.1.2.tgz", "integrity": "sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=" }, "node-gyp": { @@ -12152,7 +12146,7 @@ }, "onetime": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz", "integrity": "sha1-ofeDj4MUxRbwXs78vEzP4EtO14k=", "dev": true }, @@ -12249,7 +12243,7 @@ }, "p-is-promise": { "version": "1.1.0", - "resolved": "http://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", + "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-1.1.0.tgz", "integrity": "sha1-nJRWmJ6fZYgBewQ01WCXZ1w9oF4=", "dev": true }, @@ -17677,7 +17671,7 @@ }, "whatwg-fetch": { "version": "2.0.4", - "resolved": "http://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz", "integrity": "sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==" }, "whet.extend": { From 8390016707d406ddc1a6850f2fb8ccd32724fdd1 Mon Sep 17 00:00:00 2001 From: rikinsk Date: Mon, 18 Mar 2019 23:43:52 +0530 Subject: [PATCH 4/4] code refactor --- .../src/components/ApiExplorer/ApiExplorer.js | 123 ++++++++++-------- 1 file changed, 68 insertions(+), 55 deletions(-) diff --git a/console/src/components/ApiExplorer/ApiExplorer.js b/console/src/components/ApiExplorer/ApiExplorer.js index 7f5610081164f..17af9ac2df24b 100644 --- a/console/src/components/ApiExplorer/ApiExplorer.js +++ b/console/src/components/ApiExplorer/ApiExplorer.js @@ -1,85 +1,98 @@ -/* eslint-disable */ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import ApiCollectionPanel from './ApiCollectionPanel'; -import ApiRequestWrapper from './ApiRequestWrapper'; import Helmet from 'react-helmet'; -import { - changeTabSelection, - changeApiSelection, - expandAuthApi, - clearHistory, - changeRequestParams, -} from './Actions'; +import ApiRequestWrapper from './ApiRequestWrapper'; +// import ApiCollectionPanel from './ApiCollectionPanel'; + +// import { +// changeTabSelection, +// changeApiSelection, +// expandAuthApi, +// clearHistory, +// // changeRequestParams, +// } from './Actions'; // import {triggerOnBoarding} from '../Main/Actions'; class ApiExplorer extends Component { componentWillUnmount() { - const cmNodes = this.getCodeMirrorIfAvailable(); + this.clearCodeMirrorHints(); + } + + clearCodeMirrorHints() { + const cmNodes = document.querySelectorAll('.CodeMirror-hints.graphiql'); + if (cmNodes.length > 0) { cmNodes.forEach(cm => { cm.remove(); }); } } - onTabSelectionChanged = tabIndex => { - this.props.dispatch(changeTabSelection(tabIndex)); - }; - - onApiSelectionChanged = (selectedApi, authApiExpanded) => { - this.props.dispatch(changeApiSelection(selectedApi, authApiExpanded)); - }; - - onAuthApiExpanded = index => { - this.props.dispatch(expandAuthApi(index)); - }; - onClearHistoryClicked = () => { - this.props.dispatch(clearHistory()); - }; - - getDQBQuery(propsObj) { - const { type, args } = propsObj; - const _query = {}; - _query.type = type; - _query.args = JSON.parse(JSON.stringify(args)); - return _query; - } - getCodeMirrorIfAvailable() { - return document.querySelectorAll('.CodeMirror-hints.graphiql'); - } - - updateDQBState(data) { - this.props.dispatch(hydrateDQBData(data)); - } + // onTabSelectionChanged = tabIndex => { + // this.props.dispatch(changeTabSelection(tabIndex)); + // }; + // + // onApiSelectionChanged = (selectedApi, authApiExpanded) => { + // this.props.dispatch(changeApiSelection(selectedApi, authApiExpanded)); + // }; + // + // onAuthApiExpanded = index => { + // this.props.dispatch(expandAuthApi(index)); + // }; + // + // onClearHistoryClicked = () => { + // this.props.dispatch(clearHistory()); + // }; + // + // getDQBQuery(propsObj) { + // const { type, args } = propsObj; + // const _query = {}; + // _query.type = type; + // _query.args = JSON.parse(JSON.stringify(args)); + // return _query; + // } + // + // updateDQBState(data) { + // this.props.dispatch(hydrateDQBData(data)); + // } render() { + const { + displayedApi, + credentials, + explorerData, + route, + dataHeaders, + tables, + headerFocus, + location, + serverVersion, + } = this.props; + const styles = require('./ApiExplorer.scss'); - let wrapperClass = styles.apiExplorerWrapper; - let panelStyles = ''; - let requestStyles = ''; - let wdClass = ''; - // check if onboarding is enabled + + const wrapperClass = styles.apiExplorerWrapper; + const requestStyles = ''; + const wdClass = ''; // show api request wrapper or graphiql depending on selection - const displayedApi = this.props.displayedApi; - let requestWrapper = ( + const requestWrapper = ( );