From 3617aa4d8ddf8a925d2f5e74aedd82211ca3cbf3 Mon Sep 17 00:00:00 2001 From: Luca Restagno <59067245+lucarestagno@users.noreply.github.com> Date: Mon, 26 Jun 2023 15:48:50 +0200 Subject: [PATCH] feat: remove gdc sources from run sql view PR-URL: https://github.com/hasura/graphql-engine-mono/pull/9659 GitOrigin-RevId: cedaf4e389b7499c2b9580f3296d54cb4b56e1ed --- .../components/Services/Data/RawSQL/RawSQL.js | 36 +++++++++++++------ 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/RawSQL/RawSQL.js b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/RawSQL/RawSQL.js index db54cf6256b..e295729e4a5 100644 --- a/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/RawSQL/RawSQL.js +++ b/frontend/libs/console/legacy-ce/src/lib/components/Services/Data/RawSQL/RawSQL.js @@ -629,16 +629,32 @@ RawSQL.propTypes = { statementTimeout: PropTypes.string.isRequired, }; -const mapStateToProps = state => ({ - ...state.rawSQL, - migrationMode: state.main.migrationMode, - currentSchema: state.tables.currentSchema, - allSchemas: state.tables.allSchemas, - serverVersion: state.main.serverVersion ? state.main.serverVersion : '', - sources: getDataSources(state), - currentDataSource: state.tables.currentDataSource, - metadataSources: state.metadata.metadataObject.sources, -}); +const mapStateToProps = state => { + const nativeSources = state.metadata.metadataObject.sources.filter(source => + nativeDrivers.includes(source.kind) + ); + + const sources = getDataSources(state).filter(source => + nativeDrivers.includes(source.driver) + ); + + const currentDataSource = sources.find( + source => source.name === state.tables.currentDataSource + ) + ? state.tables.currentDataSource + : sources?.[0]?.name || ''; + + return { + ...state.rawSQL, + migrationMode: state.main.migrationMode, + currentSchema: state.tables.currentSchema, + allSchemas: state.tables.allSchemas, + serverVersion: state.main.serverVersion ? state.main.serverVersion : '', + sources, + currentDataSource, + metadataSources: nativeSources, + }; +}; const rawSQLConnector = connect => connect(mapStateToProps)(RawSQL);