From 8f3001924ed04155d43566dd8a72fc3bbdea29fb Mon Sep 17 00:00:00 2001 From: Praveen D Date: Fri, 3 Aug 2018 12:12:47 +0530 Subject: [PATCH 1/5] console: export data and graphiql wip --- console/index.js | 40 ++++++++++++++++++++++++++++++++++++++++ console/package.json | 1 + 2 files changed, 41 insertions(+) create mode 100644 console/index.js diff --git a/console/index.js b/console/index.js new file mode 100644 index 0000000000000..454fe483a6bda --- /dev/null +++ b/console/index.js @@ -0,0 +1,40 @@ +// import GraphiQL parts +import GraphiQLWrapper from './src/components/ApiExplorer/GraphiQLWrapper'; + +// import Data Tab parts +import routes from './src/routes'; +import dataRouter from './src/components/Services/Data/DataRouter'; +import { dataReducer } from './src/components/Services/Data'; +import globals from './src/Globals'; +import endpoints from './src/Endpoints'; +import mainState from './src/components/Main/State'; +import { changeRequestHeader } from './src/components/ApiExplorer/Actions'; +import { validateLogin } from './src/components/Main/Actions'; +import dataHeaders from './src/components/Services/Data/Common/Headers'; +import { handleMigrationErrors } from './src/components/Services/Data/TableModify/ModifyActions'; +import { + fetchSchemaList, + loadSchema, + loadUntrackedSchema, + UPDATE_CURRENT_SCHEMA, + UPDATE_DATA_HEADERS, + ACCESS_KEY_ERROR, +} from './src/components/Services/Data/DataActions'; + +const filterQueryScss = require('./src/components/Services/Data/TableBrowseRows/FilterQuery.scss'); +const tableScss = require('./src/components/Services/Data/TableCommon/Table.scss'); + +// export GraphiQL parts +export { GraphiQLWrapper }; + +// export Data Tab parts +export default routes; +export { dataRouter, dataReducer }; +export { globals, endpoints, mainState }; +export { fetchSchemaList, loadSchema, loadUntrackedSchema }; +export { UPDATE_CURRENT_SCHEMA, UPDATE_DATA_HEADERS, ACCESS_KEY_ERROR }; +export { changeRequestHeader }; +export { validateLogin }; +export { dataHeaders }; +export { filterQueryScss, tableScss }; +export { handleMigrationErrors }; diff --git a/console/package.json b/console/package.json index c3d8cbe53c16a..a971a41057263 100644 --- a/console/package.json +++ b/console/package.json @@ -8,6 +8,7 @@ "type": "git", "url": "https://github.com/hasura/graphql-engine" }, + "main": "index.js", "homepage": "https://hasura.io/", "keywords": [], "scripts": { From 8bf5f1140b0300dadc0cafce3fa88b35f0424a42 Mon Sep 17 00:00:00 2001 From: Praveen D Date: Mon, 6 Aug 2018 16:43:11 +0530 Subject: [PATCH 2/5] console: add admin headers by default --- console/src/components/Services/Data/DataState.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/console/src/components/Services/Data/DataState.js b/console/src/components/Services/Data/DataState.js index aab786a662356..0c815212c716b 100644 --- a/console/src/components/Services/Data/DataState.js +++ b/console/src/components/Services/Data/DataState.js @@ -113,7 +113,11 @@ const defaultState = { schemaList: ['public'], currentSchema: 'public', accessKeyError: false, - dataHeaders: { 'Content-Type': 'application/json' }, + dataHeaders: { + 'Content-Type': 'application/json', + 'X-Hasura-Role': 'admin', + 'X-Hasura-User-Id': '1', + }, }; export default defaultState; From b91cabcd10cac43712ad8398122eb5e0dbcdc6a6 Mon Sep 17 00:00:00 2001 From: Praveen D Date: Mon, 13 Aug 2018 12:04:01 +0530 Subject: [PATCH 3/5] console: modify license --- console/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/package.json b/console/package.json index 41516de431c25..d4073c7501ae0 100644 --- a/console/package.json +++ b/console/package.json @@ -2,7 +2,7 @@ "name": "hasura-console", "description": "Console for Hasura GraphQL Engine", "author": "Hasura (https://github.com/hasura/graphql-engine)", - "license": "MIT", + "license": "AGPLv3", "version": "0.1.0", "repository": { "type": "git", From 8994b3811fa1191fbe19369ea4deac8e4c6045b7 Mon Sep 17 00:00:00 2001 From: Praveen D Date: Mon, 13 Aug 2018 12:10:38 +0530 Subject: [PATCH 4/5] console: modify package name --- console/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/console/package.json b/console/package.json index d4073c7501ae0..0386e58bada91 100644 --- a/console/package.json +++ b/console/package.json @@ -1,5 +1,5 @@ { - "name": "hasura-console", + "name": "graphql-engine-console", "description": "Console for Hasura GraphQL Engine", "author": "Hasura (https://github.com/hasura/graphql-engine)", "license": "AGPLv3", From aca1614d55ddfce6c7b7ef1e054706a7cbf57705 Mon Sep 17 00:00:00 2001 From: Praveen D Date: Mon, 13 Aug 2018 13:09:41 +0530 Subject: [PATCH 5/5] console: remove admin headers --- console/src/components/Services/Data/DataState.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/console/src/components/Services/Data/DataState.js b/console/src/components/Services/Data/DataState.js index e89f25170c8c0..fef4350c4960d 100644 --- a/console/src/components/Services/Data/DataState.js +++ b/console/src/components/Services/Data/DataState.js @@ -117,8 +117,6 @@ const defaultState = { accessKeyError: false, dataHeaders: { 'Content-Type': 'application/json', - 'X-Hasura-Role': 'admin', - 'X-Hasura-User-Id': '1', }, };