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

add server version to console html (close #2444) #2452

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 3 commits into from
Jul 2, 2019
Merged

add server version to console html (close #2444) #2452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
393d40c
pass serverVersion to console.html template
ajeetdsouza Jul 1, 2019
73df114
Merge branch 'master' into issue-2444-serverversion
ajeetdsouza Jul 2, 2019
6fcaf07
Merge branch 'master' into issue-2444-serverversion
shahidhk Jul 2, 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 cli/assets/assets.go
View file
Open in desktop

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

3 changes: 2 additions & 1 deletion cli/assets/unversioned/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
urlPrefix: "/",
consoleMode: "cli",
cliUUID: {{.cliUUID}},
enableTelemetry: {{.enableTelemetry}}
enableTelemetry: {{.enableTelemetry}},
serverVersion: "{{.serverVersion}}",
};
</script>
</head>
Expand Down
3 changes: 2 additions & 1 deletion cli/assets/v1.0/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
urlPrefix: "/",
consoleMode: "cli",
cliUUID: {{.cliUUID}},
enableTelemetry: {{.enableTelemetry}}
enableTelemetry: {{.enableTelemetry}},
serverVersion: "{{.serverVersion}}",
};
</script>
</head>
Expand Down
1 change: 1 addition & 0 deletions cli/commands/console.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ func (o *consoleOptions) run() error {
"apiHost": "http://" + o.Address,
"apiPort": o.APIPort,
"cliVersion": o.EC.Version.GetCLIVersion(),
"serverVersion": o.EC.Version.GetServerVersion(),
"dataApiUrl": o.EC.ServerConfig.ParsedEndpoint.String(),
"dataApiVersion": "",
"hasAccessKey": adminSecretHeader == XHasuraAccessKey,
Expand Down
1 change: 1 addition & 0 deletions server/src-lib/Hasura/Server/App.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -345,6 +345,7 @@ mkConsoleHTML path authMode enableTelemetry consoleAssetsDir = do
, "enableTelemetry" .= boolToText enableTelemetry
, "cdnAssets" .= boolToText (isNothing consoleAssetsDir)
, "assetsVersion" .= consoleVersion
, "serverVersion" .= currentVersion
]
consolePath = case path of
"" -> "/console"
Expand Down
1 change: 1 addition & 0 deletions server/src-rsr/console.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
assetsPath: "https://graphql-engine-cdn.hasura.io/console/assets",
assetsVersion: "{{assetsVersion}}",
cdnAssets: {{cdnAssets}},
serverVersion: "{{serverVersion}}",
};
window.__env.versionedAssetsPath = window.__env.assetsPath;
</script>
Expand Down