Skip to content

Commit 8023d35

Browse files
committed
Shift to graphql-ws
1 parent 784b346 commit 8023d35

File tree

3 files changed

+11710
-11266
lines changed

3 files changed

+11710
-11266
lines changed

config.js

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,35 @@
1+
window.REACT_APP_WELCOME_MESSAGE = "Welcome to MINT Demo Indiana";
2+
window.REACT_APP_MODEL_CATALOG_DEFAULT_USER= "[email protected]";
3+
// Mint Services
4+
window.REACT_APP_CROMO_URL = "http://localhost:30001";
5+
window.REACT_APP_DATA_CATALOG_API = "http://localhost:30002";
6+
window.REACT_APP_MODEL_CATALOG_API = "http://localhost:30004/v1.8.0";
7+
window.REACT_APP_ENSEMBLE_MANAGER_API = "http://localhost:30008/v1";
8+
window.REACT_APP_GRAPHQL_ENDPOINT = "localhost:30003/v1/graphql";
9+
window.REACT_APP_GRAPHQL_ENABLE_SSL = false;
10+
11+
12+
// Google API Key
13+
window.REACT_APP_GOOGLE_MAPS_KEY = "AIzaSyBl8J85KibSuhHEw_j0JTlITVTBb8oXiMo";
14+
15+
//Authentications
16+
window.REACT_APP_AUTH_SERVER = "https://auth.mint.isi.edu/";
17+
window.REACT_APP_AUTH_REALM = "production";
18+
window.REACT_APP_AUTH_CLIENT_ID = "mint-ui";
19+
20+
//Visualization and Ingestion - Not used any more - Remove ?
21+
window.REACT_APP_VISUALIZATION_URL = "http://dev.viz.mint.isi.edu";
22+
window.REACT_APP_INGESTION_API = "http://node1.ingestion.mint.isi.edu/v1.3.0";
23+
24+
/*
125
window.REACT_APP_WELCOME_MESSAGE = "Welcome to MINT";
226
window.REACT_APP_MODEL_CATALOG_DEFAULT_USER = "[email protected]";
327
428
// Mint Services
5-
window.REACT_APP_DATA_CATALOG_API = "https://data-catalog.mint.isi.edu";
29+
window.REACT_APP_DATA_CATALOG_API = "https://data-catalog.dev.mint.isi.edu";
630
window.REACT_APP_CROMO_API = "https://cromo.wildfire.mint.isi.edu/v1.0";
7-
window.REACT_APP_MODEL_CATALOG_API = "https://api.models.mint.isi.edu/v1.8.0";
8-
window.REACT_APP_ENSEMBLE_MANAGER_API = "https://ensemble.mint.isi.edu/v1";
31+
window.REACT_APP_MODEL_CATALOG_API = "http://localhost:30004/v1.8.0";
32+
window.REACT_APP_ENSEMBLE_MANAGER_API = "http://localhost:30008/v1";
933
1034
// Google API Key
1135
window.REACT_APP_GOOGLE_MAPS_KEY = "AIzaSyBl8J85KibSuhHEw_j0JTlITVTBb8oXiMo";
@@ -17,12 +41,12 @@ window.REACT_APP_AUTH_CLIENT_ID = "mint-ui";
1741
1842
//Execution - Local
1943
window.REACT_APP_EXECUTION_ENGINE = "localex";
20-
window.REACT_APP_LOCALEX_CODEDIR = "/data/storage/mint/localex/code";
21-
window.REACT_APP_LOCALEX_DATADIR = "/data/storage/mint/data-catalog/production/local-execution";
22-
window.REACT_APP_LOCALEX_DATAURL = "https://data.mint.isi.edu/files/local-execution";
23-
window.REACT_APP_LOCALEX_LOGDIR = "/data/storage/mint/data-catalog/production/local-execution/logs";
24-
window.REACT_APP_LOCALEX_LOGURL = "https://data.mint.isi.edu/files/local-execution/logs";
25-
window.REACT_APP_LOCALEX_PARALLEL = 50;
44+
window.REACT_APP_LOCALEX_CODEDIR = "~/mintprroject/code";
45+
window.REACT_APP_LOCALEX_DATADIR = "~/mintproject/data";
46+
window.REACT_APP_LOCALEX_DATAURL = "file://~/mintproject/data";
47+
window.REACT_APP_LOCALEX_LOGDIR = "~/mintproject/logs";
48+
window.REACT_APP_LOCALEX_LOGURL = "file://~/mintproject/logs";
49+
window.REACT_APP_LOCALEX_PARALLEL = 2;
2650
2751
//Execution - Wings
2852
window.REACT_APP_WINGS_EXPORT_URL = "https://data.mint.isi.edu/files/wings-export";
@@ -31,9 +55,10 @@ window.REACT_APP_WINGS_DOTPATH = "/data/storage/mint/data-catalog/production/win
3155
window.REACT_APP_WINGS_ONTURL = "https://data.mint.isi.edu/files/wings-export/dot";
3256
3357
//Database
34-
window.REACT_APP_GRAPHQL_ENDPOINT = "graphql.mint.isi.edu/v1/graphql";
35-
window.REACT_APP_GRAPHQL_ENABLE_SSL = "True";
58+
window.REACT_APP_GRAPHQL_ENDPOINT = "localhost:30003/v1/graphql";
59+
window.REACT_APP_GRAPHQL_ENABLE_SSL = false;
3660
3761
//Visualization and Ingestion
3862
window.REACT_APP_VISUALIZATION_URL = "https://viz.mint.isi.edu";
3963
window.REACT_APP_INGESTION_API = "https://node1.ingestion.mint.isi.edu/v1.3.0";
64+
*/

src/config/graphql.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import { ApolloClient, createHttpLink, InMemoryCache, split, NormalizedCacheObject } from '@apollo/client';
2-
import { WebSocketLink } from '@apollo/client/link/ws';
2+
import { GraphQLWsLink } from '@apollo/client/link/subscriptions'
3+
import { createClient } from 'graphql-ws';
34
import { getMainDefinition } from '@apollo/client/utilities';
45
import { MintPreferences, User } from 'app/reducers';
56
import { SubscriptionClient } from 'subscriptions-transport-ws';
@@ -49,19 +50,18 @@ export class GraphQL {
4950
let protocol = MINT_PREFERENCES.graphql.enable_ssl? "wss://" : "ws://"
5051
let uri = protocol + MINT_PREFERENCES.graphql.endpoint
5152
// Subscription Link
52-
const subscriptionClient = new SubscriptionClient(
53-
uri,
53+
const subscriptionClient = createClient(
5454
{
55-
reconnect: true,
55+
url: uri,
56+
shouldRetry: () => true,
5657
lazy: true,
5758
connectionParams: {
5859
headers: KeycloakAdapter.getAccessTokenHeader()
5960
}
6061
}
6162
);
62-
// @ts-ignore
63-
subscriptionClient.maxConnectTimeGenerator.duration = () => subscriptionClient.maxConnectTimeGenerator.max;
64-
return new WebSocketLink(subscriptionClient);
63+
// subscriptionClient.maxConnectTimeGenerator.duration = () => subscriptionClient.maxConnectTimeGenerator.max;
64+
return new GraphQLWsLink(subscriptionClient);
6565
}
6666

6767
static getHTTPSLink() {

0 commit comments

Comments
 (0)