这是indexloc提供的服务，不要输入任何密码
Skip to content

make graphiql api endpoint and request header sections collapsible #1723

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 1, 2019
Merged

make graphiql api endpoint and request header sections collapsible #1723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
9262222
Install deps
karthikvt26 Mar 6, 2019
7eb3a84
Add CollapsibleToggle component, add min-height to variables section …
karthikvt26 Mar 8, 2019
f7aae23
Make graphiql height to 60vh and reduces min height of graphql query …
karthikvt26 Mar 8, 2019
b4d7d95
Merge remote-tracking branch 'main/master' into issue-1624
karthikvt26 Mar 8, 2019
ba5c0f3
Fix test, update height for query variables
karthikvt26 Mar 8, 2019
0cc63e9
Remove variable-query style from global css file
karthikvt26 Mar 8, 2019
ed9a383
Keep the header section open by default
karthikvt26 Mar 11, 2019
eaaefbd
check box alignment fix
surendran82 Mar 11, 2019
3e5e9cc
Merge branch 'issue-1624' of github.com:karthikvt26/graphql-engine in…
surendran82 Mar 11, 2019
999a40e
Fix
karthikvt26 Mar 11, 2019
ec0a6eb
Remove padding-top from right side icons
karthikvt26 Mar 14, 2019
5df29c0
Merge branch 'master' into issue-1624
karthikvt26 Mar 15, 2019
0fd234a
Merge branch 'master' into issue-1624
rikinsk Mar 20, 2019
34f503e
code refactor
rikinsk Mar 20, 2019
bb03f0c
code refactor
rikinsk Mar 20, 2019
fd64d3b
fix common.scss
rikinsk Mar 20, 2019
bbcc9e2
fix common.scss
rikinsk Mar 20, 2019
0df7951
Merge branch 'master' into issue-1624
rikinsk Apr 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions console/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

116 changes: 56 additions & 60 deletions console/src/components/ApiExplorer/ApiExplorer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,20 @@ import PropTypes from 'prop-types';
import Helmet from 'react-helmet';

import ApiRequestWrapper from './ApiRequestWrapper';
// import ApiCollectionPanel from './ApiCollectionPanel';

// import {
// changeTabSelection,
// changeApiSelection,
// expandAuthApi,
// clearHistory,
// // changeRequestParams,
// } from './Actions';
/*
import ApiCollectionPanel from './ApiCollectionPanel';

// import {triggerOnBoarding} from '../Main/Actions';
import {
changeTabSelection,
changeApiSelection,
expandAuthApi,
clearHistory,
// changeRequestParams,
} from './Actions';

import {triggerOnBoarding} from '../Main/Actions';
*/

class ApiExplorer extends Component {
componentWillUnmount() {
Expand All @@ -30,33 +33,35 @@ class ApiExplorer extends Component {
}
}

// 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));
// }
/*
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 {
Expand All @@ -73,33 +78,24 @@ class ApiExplorer extends Component {

const styles = require('./ApiExplorer.scss');

const wrapperClass = styles.apiExplorerWrapper;
const requestStyles = '';
const wdClass = '';

// show api request wrapper or graphiql depending on selection
const requestWrapper = (
<ApiRequestWrapper
credentials={credentials}
explorerData={explorerData}
details={displayedApi.details}
request={displayedApi.request}
requestStyles={requestStyles}
dispatch={this.props.dispatch}
wdStyles={wdClass}
route={route}
dataHeaders={dataHeaders}
numberOfTables={tables.length}
headerFocus={headerFocus}
queryParams={location.query}
serverVersion={serverVersion}
/>
);

return (
<div className={'container-fluid ' + styles.padd_remove}>
<Helmet title="API Explorer | Hasura" />
<div className={wrapperClass}>{requestWrapper}</div>
<div className={styles.apiExplorerWrapper}>
<ApiRequestWrapper
dispatch={this.props.dispatch}
credentials={credentials}
explorerData={explorerData}
details={displayedApi.details}
request={displayedApi.request}
route={route}
dataHeaders={dataHeaders}
numberOfTables={tables.length}
headerFocus={headerFocus}
queryParams={location.query}
serverVersion={serverVersion}
/>
</div>
</div>
);
}
Expand Down
12 changes: 7 additions & 5 deletions console/src/components/ApiExplorer/ApiExplorer.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,22 +267,23 @@

.closeHeader {
cursor: pointer;
padding-top: 8px;
font-size: 16px;
float: right;
display: inline-block;
}

.showAdminSecret {
cursor: pointer;
padding-top: 8px;
padding-right: 8px;
font-size: 16px;
float: left;
display: inline-block;
}

.apiRequestWrapper {
margin-top: 20px;
.headerWrapper {
margin-bottom: 20px;
}
.file_upload_wrapper {
width: 100%;
text-align: left;
Expand Down Expand Up @@ -588,7 +589,7 @@
// padding: 5px;
padding: 0px 5px;
min-width: 50px;

vertical-align: middle;
.responseTableInput {
background-color: transparent;
border: 0;
Expand Down Expand Up @@ -711,7 +712,8 @@

.common_checkbox_label {
margin-bottom: 0px !important;
padding-top: 5px;
padding-top: 0px;
display: flex;
}

.common_checkbox + .common_checkbox_label:before {
Expand Down
Loading