hasura/graphql-engine
1
0
Fork 0
mirror of https://github.com/hasura/graphql-engine.git synced 2024-12-14 08:02:15 +03:00
Code Issues Projects Releases Wiki Activity

server/console: fix Apollo Federation UI to extend table types in other subgraphs

Browse Source 
PR-URL: https://github.com/hasura/graphql-engine-mono/pull/10071
Co-authored-by: Varun Choudhary <68095256+Varun-Choudhary@users.noreply.github.com>
GitOrigin-RevId: 5acbc792fd8b3fd9ae6a02ea740b3e13040b9c72
This commit is contained in:
paritosh-08 2023-08-09 18:23:42 +05:30 committed by hasura-bot
parent 29bb76d6d3
commit ed43fe9863
4 changed files with 20 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
frontend/libs/console/legacy-ce/src/lib/components/Services/Data/Common/Components/ApolloFederationSupport.tsx
View File

@ -24,7 +24,7 @@ export const ApolloFederationSupport = ({
}
const isSupportForApolloFederationEnabled =
configData?.experimental_features.includes('apollo_federation');
configData?.is_apollo_federation_enabled;
return (
<div className="mb-lg">
<div className="flex items-center mb-formlabel">
@ -37,10 +37,16 @@ export const ApolloFederationSupport = ({
{!isSupportForApolloFederationEnabled ? (
<div className="font-thin">
Apollo federation is not enabled. To enable apollo federation support,
start the Hasura server with environment variable
<code>
HASURA_GRAPHQL_EXPERIMENTAL_FEATURES: &quot;apollo_federation&quot;
</code>
set the{' '}
<a href="https://hasura.io/docs/latest/hasura-cloud/projects/env-vars/">
project env variable
</a>{' '}
or start the Hasura server with{' '}
<a href="https://hasura.io/docs/latest/deployment/graphql-engine-flags/index/#using-environment-variables">
{' '}
environment variable{' '}
</a>
<code>HASURA_GRAPHQL_ENABLE_APOLLO_FEDERATION: &quot;true&quot;</code>
</div>
) : (
<div data-toggle="tooltip">

1
frontend/libs/console/legacy-ce/src/lib/hooks/useServerConfig.ts
View File

@ -32,6 +32,7 @@ export interface ServerConfig {
claims_format: string;
};
is_prometheus_metrics_enabled: boolean;
is_apollo_federation_enabled: boolean;
}
export function useServerConfig<T = ServerConfig>(

10
server/src-lib/Hasura/Server/API/Config.hs
View File

@ -18,7 +18,7 @@ import Hasura.Server.Auth
import Hasura.Server.Auth.JWT
import Hasura.Server.Init.Config (API (METRICS), AllowListStatus)
import Hasura.Server.Init.FeatureFlag (FeatureFlag (..))
import Hasura.Server.Types (ExperimentalFeature)
import Hasura.Server.Types (ApolloFederationStatus, ExperimentalFeature)
import Hasura.Server.Version (Version, currentVersion)
data FeatureFlagInfo = FeatureFlagInfo
@ -58,7 +58,8 @@ data ServerConfig = ServerConfig
scfgExperimentalFeatures :: !(Set.HashSet ExperimentalFeature),
scfgIsPrometheusMetricsEnabled :: !Bool,
scfgDefaultNamingConvention :: !NamingCase,
scfgFeatureFlags :: !(Set.HashSet FeatureFlagInfo)
scfgFeatureFlags :: !(Set.HashSet FeatureFlagInfo),
scfgIsApolloFederationEnabled :: !ApolloFederationStatus
}
deriving (Show, Eq, Generic)
@ -78,6 +79,7 @@ runGetConfig ::
Set.HashSet API ->
NamingCase ->
[(FeatureFlag, Text, Bool)] ->
ApolloFederationStatus ->
ServerConfig
runGetConfig
functionPermsCtx
@ -90,7 +92,8 @@ runGetConfig
experimentalFeatures
enabledAPIs
defaultNamingConvention
featureFlags =
featureFlags
apolloFederationStatus =
ServerConfig
currentVersion
functionPermsCtx
@ -107,6 +110,7 @@ runGetConfig
isPrometheusMetricsEnabled
defaultNamingConvention
featureFlagSettings
apolloFederationStatus
where
isPrometheusMetricsEnabled = METRICS `Set.member` enabledAPIs
featureFlagSettings =

1
server/src-lib/Hasura/Server/App.hs
View File

@ -756,6 +756,7 @@ configApiGetHandler appStateRef = do
acEnabledAPIs
acDefaultNamingConvention
featureFlagSettings
acApolloFederationStatus
return (emptyHttpLogGraphQLInfo, JSONResp $ HttpResponse (encJFromJValue res) [])
data HasuraApp = HasuraApp