projects
/
arvados-workbench2.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
14720: Federated login chooser wip
[arvados-workbench2.git]
/
src
/
index.tsx
diff --git
a/src/index.tsx
b/src/index.tsx
index 508fa7c3dad5cb140246352cb821b56c98d49d7a..f5eedc73c7e3c8ff1032864670537b564c15a7dc 100644
(file)
--- a/
src/index.tsx
+++ b/
src/index.tsx
@@
-59,6
+59,8
@@
import { apiClientAuthorizationActionSet } from '~/views-components/context-menu
import { groupActionSet } from '~/views-components/context-menu/action-sets/group-action-set';
import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set';
import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set';
import { groupActionSet } from '~/views-components/context-menu/action-sets/group-action-set';
import { groupMemberActionSet } from '~/views-components/context-menu/action-sets/group-member-action-set';
import { linkActionSet } from '~/views-components/context-menu/action-sets/link-action-set';
+import { loadFileViewersConfig } from '~/store/file-viewers/file-viewers-actions';
+import { setRemoteHosts } from '~/views/login-panel/login-panel';
console.log(`Starting arvados [${getBuildInfo()}]`);
console.log(`Starting arvados [${getBuildInfo()}]`);
@@
-101,13
+103,15
@@
fetchConfig()
const store = configureStore(history, services);
store.subscribe(initListener(history, store, services, config));
const store = configureStore(history, services);
store.subscribe(initListener(history, store, services, config));
- store.dispatch(initAuth());
+ store.dispatch(initAuth(
config
));
store.dispatch(setBuildInfo());
store.dispatch(setCurrentTokenDialogApiHost(apiHost));
store.dispatch(setUuidPrefix(config.uuidPrefix));
store.dispatch(setBuildInfo());
store.dispatch(setCurrentTokenDialogApiHost(apiHost));
store.dispatch(setUuidPrefix(config.uuidPrefix));
+ store.dispatch(setRemoteHosts(config.remoteHosts));
store.dispatch(loadVocabulary);
store.dispatch(loadVocabulary);
+ store.dispatch(loadFileViewersConfig);
- const TokenComponent = (props: any) => <ApiToken authService={services.authService} {...props} />;
+ const TokenComponent = (props: any) => <ApiToken authService={services.authService}
config={config}
{...props} />;
const MainPanelComponent = (props: any) => <MainPanel {...props} />;
const App = () =>
const MainPanelComponent = (props: any) => <MainPanel {...props} />;
const App = () =>