Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion src/lib.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export {AsideNavigation} from './containers/AsideNavigation/AsideNavigation';
export {configureStore, rootReducer} from './store';
export {default as appRoutes} from './routes';

export {createApi, YdbEmbeddedAPI} from './services/api';
export {YdbEmbeddedAPI} from './services/api';
export {settingsManager} from './services/settings';
export {getUserSettings} from './containers/UserSettings/settings';
export {setSettingValue, getSettingValue} from './store/reducers/settings/settings';
Expand Down
10 changes: 3 additions & 7 deletions src/services/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@ export class YdbEmbeddedAPI {
meta?: MetaAPI;
codeAssist?: CodeAssistAPI;

constructor({config, webVersion}: {config: AxiosRequestConfig; webVersion?: boolean}) {
constructor({webVersion = false, withCredentials = false} = {}) {
const config: AxiosRequestConfig = {withCredentials};

this.auth = new AuthAPI({config});
if (webVersion) {
this.meta = new MetaAPI({config});
Expand All @@ -41,9 +43,3 @@ export class YdbEmbeddedAPI {
this.viewer = new ViewerAPI({config});
}
}

export function createApi({webVersion = false, withCredentials = false} = {}) {
const config: AxiosRequestConfig = {withCredentials};
const api = new YdbEmbeddedAPI({config, webVersion});
return api;
}
4 changes: 2 additions & 2 deletions src/store/configureStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import type {History} from 'history';
import {createBrowserHistory} from 'history';
import {listenForHistoryChange} from 'redux-location-state';

import {createApi} from '../services/api';
import {YdbEmbeddedAPI} from '../services/api';

import {getUrlData} from './getUrlData';
import rootReducer from './reducers';
Expand Down Expand Up @@ -57,7 +57,7 @@ const isSingleClusterMode = `${metaBackend}` === 'undefined';
export function configureStore({
aRootReducer = rootReducer,
singleClusterMode = isSingleClusterMode,
api = createApi({webVersion, withCredentials: !customBackend}),
api = new YdbEmbeddedAPI({webVersion, withCredentials: !customBackend}),
} = {}) {
({backend, basename, clusterName} = getUrlData({
href: window.location.href,
Expand Down
Loading