Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: DVT-114 #233

Merged
merged 2 commits into from
Mar 28, 2024
Merged

fix: DVT-114 #233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d8ad774
completed
Muhammed-baban Mar 27, 2024
adb1ed7
update
Muhammed-baban Mar 27, 2024
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
168 changes: 95 additions & 73 deletions superset-frontend/src/components/DvtTable/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,16 @@ interface HeaderProps {
modalLabel?: string;
input?: boolean;
editor?: boolean;
select?: boolean;
selectData?: any[];
checkboxData?: boolean;
checkboxField?: boolean;
radio?: boolean;
disabledRadioField?: string;
collapse?: boolean;
collapseField?: boolean;
placeholder?: string;
extra?: boolean;
}

export interface DvtTableSortProps {
Expand All @@ -99,7 +105,6 @@ export interface DvtTableProps {
setSort?: (args: any) => void;
activeRadio?: string;
setActiveRadio?: (row: any) => void;
collapseData?: any[];
}

const DvtTable: React.FC<DvtTableProps> = ({
Expand All @@ -115,11 +120,11 @@ const DvtTable: React.FC<DvtTableProps> = ({
setSort,
activeRadio = '',
setActiveRadio = () => {},
collapseData,
}) => {
const dispatch = useDispatch();
const { addDangerToast } = useToasts();
const [openRow, setOpenRow] = useState<number | null>(null);
const [collapseRowId, setCollapseRowId] = useState<string>('');

const formatDateTime = (dateTimeString: string) => {
const [datePart, timePart] = dateTimeString.split(' ');
Expand Down Expand Up @@ -202,57 +207,59 @@ const DvtTable: React.FC<DvtTableProps> = ({
<StyledTableTable>
<StyledTabletHead>
<StyledTableTitle>
{header.map((column, columnIndex) => (
<StyledTableTh
key={columnIndex}
flex={(column.flex || 1) * columnsWithDefaults}
>
{column.checkbox && (
<StyledTableCheckbox>
<Checkbox
indeterminate={indeterminate}
onChange={onCheckAllChange}
checked={checkAll}
/>
</StyledTableCheckbox>
)}
{column.sort ? (
<StyledTableThSort
onClick={() =>
!!setSort &&
setSort({
column: column.field,
direction:
column.field === sort?.column
? sort?.direction === 'desc'
? 'asc'
: 'desc'
: 'asc',
})
}
>
{column.title}
<StyledTableThSortRotate
asc={
column.field === sort?.column &&
sort?.direction === 'asc'
{header
.filter((header: any) => !header.collapseField)
.map((column, columnIndex) => (
<StyledTableTh
key={columnIndex}
flex={(column.flex || 1) * columnsWithDefaults}
>
{column.checkbox && (
<StyledTableCheckbox>
<Checkbox
indeterminate={indeterminate}
onChange={onCheckAllChange}
checked={checkAll}
/>
</StyledTableCheckbox>
)}
{column.sort ? (
<StyledTableThSort
onClick={() =>
!!setSort &&
setSort({
column: column.field,
direction:
column.field === sort?.column
? sort?.direction === 'desc'
? 'asc'
: 'desc'
: 'asc',
})
}
>
<Icon
fileName="dvt-sort"
iconColor={
column.field === sort?.column
? supersetTheme.colors.dvt.primary.base
: supersetTheme.colors.grayscale.dark2
{column.title}
<StyledTableThSortRotate
asc={
column.field === sort?.column &&
sort?.direction === 'asc'
}
/>
</StyledTableThSortRotate>
</StyledTableThSort>
) : (
column.title
)}
</StyledTableTh>
))}
>
<Icon
fileName="dvt-sort"
iconColor={
column.field === sort?.column
? supersetTheme.colors.dvt.primary.base
: supersetTheme.colors.grayscale.dark2
}
/>
</StyledTableThSortRotate>
</StyledTableThSort>
) : (
column.title
)}
</StyledTableTh>
))}
</StyledTableTitle>
</StyledTabletHead>
<StyledTableTbody>
Expand All @@ -269,6 +276,14 @@ const DvtTable: React.FC<DvtTableProps> = ({
{header.map((column, columnIndex) => (
<StyledTableTd key={columnIndex}>
<StyledTableIcon>
{column.collapse && (
<StyledTableCheckbox>
<Icon
fileName="plus_large"
onClick={() => setCollapseRowId(row.id)}
/>
</StyledTableCheckbox>
)}
{column.checkbox && columnIndex === 0 && (
<StyledTableCheckbox>
<Checkbox
Expand All @@ -290,7 +305,7 @@ const DvtTable: React.FC<DvtTableProps> = ({
/>
</StyledTableCheckbox>
)}
{column.input && (
{column.input && !column.collapseField && (
<StyledTableInput>
<DvtInput
value={column.field ? row[column.field] : ''}
Expand All @@ -305,7 +320,7 @@ const DvtTable: React.FC<DvtTableProps> = ({
</StyledTableInput>
)}

{column.editor && (
{column.editor && !column.collapseField && (
<StyledTableEditor>
<DvtAceEditor
mode="sql"
Expand Down Expand Up @@ -499,64 +514,71 @@ const DvtTable: React.FC<DvtTableProps> = ({
</StyledTableTd>
))}
</StyledTableTr>
{row.collapse && (
{collapseRowId === row.id && (
<StyledTableTr>
<StyledTableTd colSpan={header.length}>
<StyledTableCollapse>
{collapseData?.map(field => (
{header.map(column => (
<>
{field.type === 'sqlEditor' && (
{column.editor && column.collapseField && (
<>
{field.label}
{column.title}
<DvtAceEditor
mode="sql"
placeholder={field.placeholder}
value={
field.fieldName ? row[field.fieldName] : ''
}
placeholder={column.placeholder}
value={column.field ? row[column.field] : ''}
onChange={newValue =>
handleInputChange(
newValue,
row.id,
field.fieldName ? field.fieldName : '',
column.field ? column.field : '',
)
}
height="200px"
fontSize={16}
/>
</>
)}
{field.type === 'input' && (
{column.input && column.collapseField && (
<DvtInput
label={field.label}
label={column.title}
value={
field.fieldName ? row[field.fieldName] : ''
column.field && column.extra && row.extra
? JSON.parse(row.extra)[column.field]
: column.field && row[column.field]
? row[column.field]
: ''
}
onChange={newValue =>
handleInputChange(
newValue,
row.id,
field.fieldName ? field.fieldName : '',
column.field ? column.field : '',
)
}
placeholder={field.placeholder}
placeholder={column.placeholder}
/>
)}
{field.type === 'select' && (
{column.select && column.collapseField && (
<DvtSelect
data={field.data}
data={column.selectData || []}
selectedValue={
field.fieldName ? row[field.fieldName] : ''
column.field
? {
value: row[column.field],
label: row[column.field],
}
: ''
}
setSelectedValue={newValue =>
handleInputChange(
newValue,
newValue.value,
row.id,
field.fieldName,
column.field ? column.field : '',
)
}
label={field.label}
placeholder={field.placeholder}
label={column.title}
placeholder={column.placeholder}
/>
)}
</>
Expand Down
22 changes: 13 additions & 9 deletions superset-frontend/src/dvt-modal/body/dataset-edit/dataset-edit.module.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,14 +105,6 @@ const SourceInputContainer = styled.div`
gap: 15px;
`;

const MetricsBody = styled.div`
background-color: ${({ theme }) => theme.colors.dvt.grayscale.light2};
margin: 0px 27px 16px 27px;
border-radius: 12px;
padding: 18px 28px;
gap: 15px;
`;

const MetricsButtonContainer = styled.div`
display: flex;
justify-content: flex-end;
Expand All @@ -124,6 +116,19 @@ const ColumnsBody = styled.div`
border-radius: 12px;
padding: 18px 28px;
gap: 15px;
max-height: 400px;
overflow-y: auto;
&::-webkit-scrollbar {
background-color: ${({ theme }) => theme.colors.dvt.grayscale.light1};
width: 6px;
border-radius: 12px;
}

&::-webkit-scrollbar-thumb {
background-color: ${({ theme }) => theme.colors.dvt.grayscale.base};
width: 4px;
border-radius: 12px;
}
`;

const ColumnsButtonContainer = styled.div`
Expand Down Expand Up @@ -161,7 +166,6 @@ export {
SourceLockContainer,
SourceCheckboxContainer,
SourceInputContainer,
MetricsBody,
MetricsButtonContainer,
ColumnsBody,
ColumnsButtonContainer,
Expand Down
Loading
Loading