Skip to content

Commit 1ebc472

Browse files
committed
typed Dataset component and dataset actions
1 parent 344b9cc commit 1ebc472

File tree

16 files changed

+678
-695
lines changed

16 files changed

+678
-695
lines changed

src/shared/schema/bi/types/datasets.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -200,20 +200,20 @@ export type GetDataSetFieldsByIdArgs = WorkbookIdArg & {
200200
};
201201

202202
type CreateDatasetBaseArgs = {
203-
dataset: Dataset['dataset'];
203+
dataset: Partial<Dataset['dataset']>;
204204
name: string;
205205
created_via?: string;
206206
};
207207

208-
type CreateDirDatasetArgs = CreateDatasetBaseArgs & {
208+
export type CreateDirDatasetArgs = CreateDatasetBaseArgs & {
209209
dir_path: string;
210210
};
211211

212-
type CreateWorkbookDatsetArgs = CreateDatasetBaseArgs & {
212+
export type CreateWorkbookDatasetArgs = CreateDatasetBaseArgs & {
213213
workbook_id: string;
214214
};
215215

216-
export type CreateDatasetArgs = CreateDirDatasetArgs | CreateWorkbookDatsetArgs;
216+
export type CreateDatasetArgs = CreateDirDatasetArgs | CreateWorkbookDatasetArgs;
217217

218218
export type CreateDatasetResponse = Id & DatasetWithOptions;
219219

@@ -222,7 +222,7 @@ export type UpdateDatasetResponse = DatasetWithOptions;
222222
export type UpdateDatasetArgs = {
223223
version: DatasetVersion;
224224
data: {
225-
dataset: Dataset['dataset'];
225+
dataset: Partial<Dataset['dataset']>;
226226
};
227227
} & DatasetId;
228228

src/shared/types/dataset.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ export interface DatasetOptions {
265265
}[];
266266
max: number;
267267
};
268-
source_listing: {
268+
source_listing?: {
269269
supports_source_search: boolean;
270270
supports_source_pagination: boolean;
271271
supports_db_name_listing: boolean;

src/ui/store/actions/editHistory.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,9 @@ interface ResetEditHistoryUnitAction {
6969
unitId: string;
7070
}
7171

72-
export function resetEditHistoryUnit({unitId}: Omit<ResetEditHistoryUnitAction, 'type'>) {
72+
export function resetEditHistoryUnit({
73+
unitId,
74+
}: Omit<ResetEditHistoryUnitAction, 'type'>): ResetEditHistoryUnitAction {
7375
return {
7476
type: RESET_EDIT_HISTORY_UNIT,
7577
unitId,

src/ui/units/datasets/components/DatasetPanel/DatasetPanel.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function TabSwitch(props: TabSwitchProps) {
3838
<RadioButton
3939
qa={DatasetPanelQA.TabRadio}
4040
value={tab}
41-
onChange={(e) => switchTab(e.target.value)}
41+
onChange={(e) => switchTab(e.target.value as DatasetTab)}
4242
>
4343
{tabs.map(({value, label, disabled}) => (
4444
<RadioButton.Option
@@ -57,7 +57,7 @@ type DatasetPanelProps = StateProps & {
5757
isCreationProcess: boolean;
5858
previewEnabled: boolean;
5959
tab: DatasetTab;
60-
switchTab: (tab: string) => void;
60+
switchTab: (tab: DatasetTab) => void;
6161
refreshSources: () => void;
6262
openDialogFieldEditor: () => void;
6363
togglePreview: () => void;

src/ui/units/datasets/components/DialogCreateDataset/DialogCreateDataset.tsx

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import React from 'react';
22

33
import {I18n} from '../../../../../i18n';
4-
import type {CreateDatasetResponse} from '../../../../../shared/schema/types';
54
import type {
65
DialogCreateWorkbookEntryProps,
76
EntryDialogBaseProps,
@@ -17,18 +16,19 @@ type DialogCreateDatasetBaseProps = {
1716
visible: boolean;
1817
};
1918

20-
type DialogCreateDatasetInNavigationProps = {
21-
onApply: EntryDialogBaseProps<CreateDatasetResponse>['onApply'];
19+
export type DialogCreateDatasetInNavigationProps = {
20+
onApply: EntryDialogBaseProps<void>['onApply'];
2221
creationScope: 'navigation';
2322
};
2423

25-
type DialogCreateDatasetInWorkbookProps = {
26-
onApply: DialogCreateWorkbookEntryProps<CreateDatasetResponse>['onApply'];
24+
export type DialogCreateDatasetInWorkbookProps = {
25+
onApply: DialogCreateWorkbookEntryProps<void>['onApply'];
2726
creationScope: 'workbook';
2827
};
2928

30-
type DialogCreateDatasetProps = DialogCreateDatasetBaseProps &
31-
(DialogCreateDatasetInNavigationProps | DialogCreateDatasetInWorkbookProps);
29+
type DialogCreateDatasetProps =
30+
| (DialogCreateDatasetBaseProps & DialogCreateDatasetInNavigationProps)
31+
| (DialogCreateDatasetBaseProps & DialogCreateDatasetInWorkbookProps);
3232

3333
const DialogCreateDataset = (props: DialogCreateDatasetProps) => {
3434
const {visible, onClose} = props;

0 commit comments

Comments
 (0)