diff options
Diffstat (limited to 'src/client/views/Main.tsx')
| -rw-r--r-- | src/client/views/Main.tsx | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/client/views/Main.tsx b/src/client/views/Main.tsx index 09ef30f6b..175ef3c6d 100644 --- a/src/client/views/Main.tsx +++ b/src/client/views/Main.tsx @@ -274,6 +274,8 @@ export class Main extends React.Component { ]; } +<<<<<<< HEAD +======= @computed get workspaceMenu() { let areWorkspacesShown = () => this._workspacesShown; @@ -284,6 +286,7 @@ export class Main extends React.Component { new={this.createNewWorkspace} allWorkspaces={workspaces.Data} isShown={areWorkspacesShown} toggle={toggleWorkspaces} />; } +>>>>>>> e47656cdc18aa1fd801a3853fa0f819140a68646 render() { return ( @@ -330,9 +333,28 @@ export class Main extends React.Component { } } async initializeNorthstar(): Promise<void> { +<<<<<<< HEAD + let envPath = "/assets/env.json"; + const response = await fetch(envPath, { + redirect: "follow", + method: "GET", + credentials: "include" + }); + const env = await response.json(); + Settings.Instance.Update(env); + let cat = Gateway.Instance.ClearCatalog(); + cat.then(async () => { + this.AddToNorthstarCatalog(await Gateway.Instance.GetCatalog()); + if (!CurrentUserUtils.GetNorthstarSchema("Book1")){ + this.AddToNorthstarCatalog(await Gateway.Instance.GetSchema("http://www.cs.brown.edu/~bcz/Book1.csv")); + } + }); + +======= const getEnvironment = await fetch("/assets/env.json", { redirect: "follow", method: "GET", credentials: "include" }); NorthstarSettings.Instance.UpdateEnvironment(await getEnvironment.json()); Gateway.Instance.ClearCatalog().then(async () => this.SetNorthstarCatalog(await Gateway.Instance.GetCatalog())); +>>>>>>> e47656cdc18aa1fd801a3853fa0f819140a68646 } } |