Skip to content

Commit 9ecac14

Browse files
committed
Unique column selection popup changed to fit on the screen. Improvements to saving data groupings when validation errors are present.
1 parent 68e91b6 commit 9ecac14

2 files changed

Lines changed: 26 additions & 25 deletions

File tree

dqops/src/main/frontend/src/components/ColumnsRecordDialog/ColumnsRecordDialog.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ const ColumnsRecordDialog = ({
104104
style={{ width: '200px !important', minWidth: '25%', maxWidth: '25%' }}
105105
className="pt-6"
106106
>
107-
<div className="w-full h-full overflow-hidden">
107+
<div className="w-full h-full overflow-x-hidden max-h-[50vh] overflow-y-auto" >
108108
<table
109109
className="table-fixed text-black text-sm w-full"
110110
style={{ tableLayout: 'fixed' }}

dqops/src/main/frontend/src/components/Connection/TableView/DataGroupingConfigurationEditView.tsx

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,30 @@ const DataGroupingConfigurationEditView = ({
6262

6363
const onUpdate = async () => {
6464
try {
65+
if (name === '') {
66+
return;
67+
}
68+
69+
if (!dataGroupingConfiguration) {
70+
setError('Grouping Configuration is Required');
71+
return;
72+
}
73+
const errors: Errors = {};
74+
75+
Object.entries(dataGroupingConfiguration).forEach(([level, item]) => {
76+
if (
77+
item.source === DataGroupingDimensionSpecSourceEnum.tag &&
78+
!item.tag
79+
) {
80+
errors[level] = 'Tag is Required';
81+
}
82+
});
83+
84+
if (Object.values(errors).length) {
85+
setLevelErrors(errors);
86+
return;
87+
}
88+
6589
setIsUpdating(true);
6690
if (selectedGroupingConfiguration) {
6791
await DataGroupingConfigurationsApi.updateTableGroupingConfiguration(
@@ -75,30 +99,6 @@ const DataGroupingConfigurationEditView = ({
7599
}
76100
);
77101
} else {
78-
if (name === '') {
79-
return;
80-
}
81-
82-
if (!dataGroupingConfiguration) {
83-
setError('Grouping Configuration is Required');
84-
return;
85-
}
86-
const errors: Errors = {};
87-
88-
Object.entries(dataGroupingConfiguration).forEach(([level, item]) => {
89-
if (
90-
item.source === DataGroupingDimensionSpecSourceEnum.tag &&
91-
!item.tag
92-
) {
93-
errors[level] = 'Tag is Required';
94-
}
95-
});
96-
97-
if (Object.values(errors).length) {
98-
setLevelErrors(errors);
99-
return;
100-
}
101-
102102
await DataGroupingConfigurationsApi.createTableGroupingConfiguration(
103103
connection,
104104
schema,
@@ -109,6 +109,7 @@ const DataGroupingConfigurationEditView = ({
109109
}
110110
);
111111
}
112+
112113
setIsUpdated(false);
113114
getGroupingConfigurations();
114115
onBack();

0 commit comments

Comments
 (0)