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
10 changes: 5 additions & 5 deletions src/services/api/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,19 @@ export type AxiosOptions = {
};

export interface BaseAPIParams {
singleClusterMode?: boolean;
proxyMeta?: boolean;
singleClusterMode: undefined | boolean;
proxyMeta: undefined | boolean;
}

export class BaseYdbAPI extends AxiosWrapper {
DEFAULT_RETRIES_COUNT = 0;

singleClusterMode?: boolean;
singleClusterMode: BaseAPIParams['singleClusterMode'];

constructor(axiosOptions?: AxiosWrapperOptions, {singleClusterMode}: BaseAPIParams = {}) {
constructor(axiosOptions: AxiosWrapperOptions, baseApiParams: BaseAPIParams) {
super(axiosOptions);

this.singleClusterMode = singleClusterMode;
this.singleClusterMode = baseApiParams.singleClusterMode;

axiosRetry(this._axios, {
retries: this.DEFAULT_RETRIES_COUNT,
Expand Down
26 changes: 16 additions & 10 deletions src/services/api/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,18 @@ import {TabletsAPI} from './tablets';
import {VDiskAPI} from './vdisk';
import {ViewerAPI} from './viewer';

// Require all fields to be explicitly passed
// It is needed to prevent forgotten params in installations
// Where ydb-embedded-ui is used as a package
interface YdbEmbeddedAPIProps {
webVersion: undefined | boolean;
withCredentials: undefined | boolean;
singleClusterMode: undefined | boolean;
proxyMeta: undefined | boolean;
csrfTokenGetter: undefined | (() => string | undefined);
defaults: undefined | AxiosRequestConfig;
}

export class YdbEmbeddedAPI {
auth: AuthAPI;
operation: OperationAPI;
Expand All @@ -25,24 +37,18 @@ export class YdbEmbeddedAPI {
tablets: TabletsAPI;
vdisk: VDiskAPI;
viewer: ViewerAPI;

meta?: MetaAPI;
codeAssist?: CodeAssistAPI;

constructor({
webVersion = false,
withCredentials = false,
singleClusterMode,
singleClusterMode = true,
proxyMeta = false,
csrfTokenGetter = () => undefined,
defaults = {},
proxyMeta = false,
}: {
webVersion?: boolean;
withCredentials?: boolean;
singleClusterMode?: boolean;
csrfTokenGetter?: () => string | undefined;
defaults?: AxiosRequestConfig;
proxyMeta?: boolean;
} = {}) {
}: YdbEmbeddedAPIProps) {
const axiosParams: AxiosWrapperOptions = {config: {withCredentials, ...defaults}};
const baseApiParams = {singleClusterMode, proxyMeta};

Expand Down
9 changes: 5 additions & 4 deletions src/services/api/meta.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,12 @@ import type {AxiosOptions, BaseAPIParams} from './base';
import {BaseYdbAPI} from './base';

export class MetaAPI extends BaseYdbAPI {
proxyMeta?: boolean;
constructor(axiosOptions?: AxiosWrapperOptions, {proxyMeta}: BaseAPIParams = {}) {
super(axiosOptions);
proxyMeta: BaseAPIParams['proxyMeta'];

this.proxyMeta = proxyMeta;
constructor(axiosOptions: AxiosWrapperOptions, baseApiParams: BaseAPIParams) {
super(axiosOptions, baseApiParams);

this.proxyMeta = baseApiParams.proxyMeta;
}
getPath(path: string, clusterName?: string) {
if (this.proxyMeta && clusterName) {
Expand Down
3 changes: 3 additions & 0 deletions src/store/configureStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,9 @@ export function configureStore({
webVersion,
singleClusterMode: isSingleClusterMode,
withCredentials: !customBackend,
proxyMeta: false,
csrfTokenGetter: undefined,
defaults: undefined,
}),
} = {}) {
const params = getUrlData({singleClusterMode, customBackend});
Expand Down
15 changes: 9 additions & 6 deletions src/uiFactory/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,8 @@ export interface UIFactory<H extends string = CommonIssueType> {
getDatabaseLinks?: GetDatabaseLinks;
getClusterLinks?: GetClusterLinks;

renderBackups?: (props: {
database: string;
scrollContainerRef: React.RefObject<HTMLDivElement>;
}) => React.ReactNode;

renderEvents?: () => React.ReactNode;
renderBackups?: RenderBackups;
renderEvents?: RenderEvents;

healthcheck: {
getHealthckechViewTitles: GetHealthcheckViewTitles<H>;
Expand Down Expand Up @@ -73,3 +69,10 @@ export type GetDatabaseLinks = (params: {
}) => DatabaseLink[];

export type GetClusterLinks = (params: {clusterInfo: ClusterInfo}) => ClusterLink[];

export type RenderBackups = (props: {
database: string;
scrollContainerRef: React.RefObject<HTMLDivElement>;
}) => React.ReactNode;

export type RenderEvents = () => React.ReactNode;
Loading