Skip to content

Commit 6d6f786

Browse files
committed
fix: review
1 parent 2dd278e commit 6d6f786

File tree

5 files changed

+24
-8
lines changed

5 files changed

+24
-8
lines changed

src/containers/Tenant/ObjectGeneral/ObjectGeneral.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,15 @@ function ObjectGeneral(props: ObjectGeneralProps) {
3232
props;
3333
switch (tenantPage) {
3434
case TENANT_PAGES_IDS.query: {
35-
return <Query tenantName={tenantName} path={path} theme={theme} type={type} />;
35+
return (
36+
<Query
37+
tenantName={tenantName}
38+
path={path}
39+
theme={theme}
40+
type={type}
41+
subType={subType}
42+
/>
43+
);
3644
}
3745
default: {
3846
return (

src/containers/Tenant/Query/Preview/Preview.tsx

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,17 @@ import type {PreviewContainerProps} from './types';
1212
import './Preview.scss';
1313

1414
export function PreviewContainer(props: PreviewContainerProps) {
15-
const {type} = props;
15+
const {type, subType} = props;
1616
const isTable = isTableType(type);
1717
const isTopic = type === EPathType.EPathTypePersQueueGroup;
1818
const isTopicPreviewAvailable = useTopicDataAvailable();
1919

2020
if (isTable) {
2121
return <TablePreview {...props} />;
2222
}
23-
if (isTopic && isTopicPreviewAvailable) {
23+
24+
// preview is not available for topics inside CDC (has subtype)
25+
if (isTopic && !subType && isTopicPreviewAvailable) {
2426
return <TopicPreview {...props} />;
2527
}
2628

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
1-
import type {EPathType} from '../../../../types/api/schema';
1+
import type {EPathSubType, EPathType} from '../../../../types/api/schema';
22

33
export interface PreviewContainerProps {
44
database: string;
55
path: string;
66
type?: EPathType;
7+
subType?: EPathSubType;
78
}

src/containers/Tenant/Query/Query.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import {Helmet} from 'react-helmet-async';
44

55
import {changeUserInput} from '../../../store/reducers/query/query';
66
import {TENANT_QUERY_TABS_ID} from '../../../store/reducers/tenant/constants';
7-
import type {EPathType} from '../../../types/api/schema';
7+
import type {EPathSubType, EPathType} from '../../../types/api/schema';
88
import {cn} from '../../../utils/cn';
99
import {useTypedDispatch, useTypedSelector} from '../../../utils/hooks';
1010

@@ -22,6 +22,7 @@ interface QueryProps {
2222
tenantName: string;
2323
path: string;
2424
type?: EPathType;
25+
subType?: EPathSubType;
2526
}
2627

2728
export const Query = (props: QueryProps) => {

src/containers/Tenant/Query/QueryEditor/QueryEditor.tsx

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
import type {QueryResult} from '../../../../store/reducers/query/types';
2323
import {setQueryAction} from '../../../../store/reducers/queryActions/queryActions';
2424
import {selectShowPreview, setShowPreview} from '../../../../store/reducers/schema/schema';
25-
import type {EPathType} from '../../../../types/api/schema';
25+
import type {EPathSubType, EPathType} from '../../../../types/api/schema';
2626
import type {QueryAction} from '../../../../types/store/query';
2727
import {cn} from '../../../../utils/cn';
2828
import {
@@ -70,11 +70,12 @@ interface QueryEditorProps {
7070
changeUserInput: (arg: {input: string}) => void;
7171
theme: string;
7272
type?: EPathType;
73+
subType?: EPathSubType;
7374
}
7475

7576
export default function QueryEditor(props: QueryEditorProps) {
7677
const dispatch = useTypedDispatch();
77-
const {tenantName, path, type, theme, changeUserInput} = props;
78+
const {tenantName, path, type, theme, changeUserInput, subType} = props;
7879
const savedPath = useTypedSelector(selectTenantPath);
7980
const result = useTypedSelector(selectResult);
8081
const historyQueries = useTypedSelector(selectQueriesHistory);
@@ -270,6 +271,7 @@ export default function QueryEditor(props: QueryEditorProps) {
270271
onExpandResultHandler={onExpandResultHandler}
271272
onCollapseResultHandler={onCollapseResultHandler}
272273
type={type}
274+
subType={subType}
273275
theme={theme}
274276
key={result?.queryId}
275277
result={result}
@@ -291,6 +293,7 @@ interface ResultProps {
291293
onExpandResultHandler: VoidFunction;
292294
onCollapseResultHandler: VoidFunction;
293295
type?: EPathType;
296+
subType?: EPathSubType;
294297
theme: string;
295298
result?: QueryResult;
296299
tenantName: string;
@@ -304,6 +307,7 @@ function Result({
304307
onExpandResultHandler,
305308
onCollapseResultHandler,
306309
type,
310+
subType,
307311
theme,
308312
result,
309313
tenantName,
@@ -313,7 +317,7 @@ function Result({
313317
tableSettings,
314318
}: ResultProps) {
315319
if (showPreview) {
316-
return <PreviewContainer database={tenantName} path={path} type={type} />;
320+
return <PreviewContainer database={tenantName} path={path} type={type} subType={subType} />;
317321
}
318322

319323
if (result) {

0 commit comments

Comments
 (0)