Skip to content

Migrate to supergraph #133

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
yousefmoazzam merged 4 commits into from
Jul 24, 2026
Merged

Migrate to supergraph #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
86315e5
Add env vars for graphql endpoints
yousefmoazzam Jul 23, 2026
2411c85
Move from workflows subgraph to supergraph
yousefmoazzam Jul 23, 2026
3653c8b
Add instrument session service query through supergraph
yousefmoazzam Jul 24, 2026
e4e0f7f
Bump version
yousefmoazzam Jul 24, 2026
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
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ VITE_KEYCLOAK_URL = "https://identity-test.diamond.ac.uk"
VITE_KEYCLOAK_REALM = "dls"
VITE_KEYCLOAK_CLIENT_ID = "ImagingHubDev"
VITE_KEYCLOAK_SCOPE = "openid profile posix-uid email"
VITE_GRAPHQL_HTTP_ENDPOINT = "https://graph-nightly.diamond.ac.uk/graphql"
VITE_GRAPHQL_WS_ENDPOINT = "wss://graph-nightly.diamond.ac.uk/graphql/ws"
```

#### Install dependencies and generate code from GraphQL schema
Expand Down
2 changes: 2 additions & 0 deletions frontend/.env.production
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ VITE_KEYCLOAK_URL = "https://identity.diamond.ac.uk"
VITE_KEYCLOAK_REALM = "dls"
VITE_KEYCLOAK_CLIENT_ID = "ImagingHub"
VITE_KEYCLOAK_SCOPE = "openid profile posix-uid email"
VITE_GRAPHQL_HTTP_ENDPOINT = "https://graph.diamond.ac.uk/graphql"
VITE_GRAPHQL_WS_ENDPOINT = "wss://graph.diamond.ac.uk/graphql/ws"
2 changes: 1 addition & 1 deletion frontend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "imaginghub",
"private": true,
"version": "0.8.0",
"version": "0.8.1",
"type": "module",
"scripts": {
"dev": "vite",
Expand Down
10 changes: 8 additions & 2 deletions frontend/relay.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@
"projects": {
"tomography": {
"language": "typescript",
"schema": "src/workflows.graphql",
"schema": "src/supergraph.graphql",
"eagerEsModules": true
},
"unified": {
"language": "typescript",
"schema": "src/supergraph.graphql",
"eagerEsModules": true
}
},
"sources": {
"tomography/src": "tomography"
"tomography/src": "tomography",
"unified/src": "unified"
},
"excludes": ["**/node_modules/**", "**/__mocks__/**", "**/__generated__/**"]
}
4 changes: 2 additions & 2 deletions frontend/src/RelayEnvironment.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import {
import keycloak from "./keycloak";
import { createClient } from "graphql-ws";

const HTTP_ENDPOINT = "https://workflows.diamond.ac.uk/graphql";
const WS_ENDPOINT = "wss://workflows.diamond.ac.uk/graphql/ws";
const HTTP_ENDPOINT = import.meta.env.VITE_GRAPHQL_HTTP_ENDPOINT;
const WS_ENDPOINT = import.meta.env.VITE_GRAPHQL_WS_ENDPOINT;

const fetchFn: FetchFunction = async (request, variables) => {
// Refresh token if needed (minValidity in seconds)
Expand Down
Loading
Loading