Skip to content

[Backport] Web console: make double detection better #16060

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

Merged
vogievetsky merged 1 commit into from
Mar 8, 2024
Merged

[Backport] Web console: make double detection better #16060

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions web-console/src/druid-models/ingestion-spec/ingestion-spec.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,6 +720,7 @@ describe('spec utils', () => {
expect(guessColumnTypeFromInput([null, 1, 2.1, 3], true)).toEqual('double');
expect(guessColumnTypeFromInput([null, '1', '2.1', '3'], false)).toEqual('string');
expect(guessColumnTypeFromInput([null, '1', '2.1', '3'], true)).toEqual('double');
expect(guessColumnTypeFromInput([null, '1.0', '2.0', '3.0'], true)).toEqual('double');
});

it('works for ARRAY<string>', () => {
Expand Down
4 changes: 3 additions & 1 deletion web-console/src/druid-models/ingestion-spec/ingestion-spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2504,7 +2504,9 @@ function isIntegerOrNull(x: any): boolean {

function isIntegerOrNullAcceptString(x: any): boolean {
return (
x == null || ((typeof x === 'number' || typeof x === 'string') && Number.isInteger(Number(x)))
x == null ||
(typeof x === 'number' && Number.isInteger(x)) ||
(typeof x === 'string' && !x.includes('.') && Number.isInteger(Number(x)))
);
}

Expand Down
9 changes: 6 additions & 3 deletions web-console/src/views/workbench-view/input-format-step/input-format-step.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,9 @@ export const InputFormatStep = React.memo(function InputFormatStep(props: InputF
inputSourceAndFormat.inputSource,
);

const needsResample = inputSourceAndFormatToSample !== inputSourceAndFormat;
const nextDisabled = !inputSourceFormatAndMore || needsResample;

return (
<div className="input-format-step">
<div className="preview">
Expand Down Expand Up @@ -246,7 +249,7 @@ export const InputFormatStep = React.memo(function InputFormatStep(props: InputF
onChange={setInputSourceAndFormat as any}
/>
)}
{inputSourceAndFormatToSample !== inputSourceAndFormat && (
{needsResample && (
<FormGroup className="control-buttons">
<Button
text="Preview changes"
Expand Down Expand Up @@ -283,7 +286,7 @@ export const InputFormatStep = React.memo(function InputFormatStep(props: InputF
text={altText}
rightIcon={IconNames.ARROW_TOP_RIGHT}
minimal
disabled={!inputSourceFormatAndMore}
disabled={nextDisabled}
onClick={() => {
if (!inputSourceFormatAndMore) return;
onAltSet(inputSourceFormatAndMore);
Expand All @@ -299,7 +302,7 @@ export const InputFormatStep = React.memo(function InputFormatStep(props: InputF
text={doneButton ? 'Done' : 'Next'}
rightIcon={doneButton ? IconNames.TICK : IconNames.ARROW_RIGHT}
intent={Intent.PRIMARY}
disabled={!inputSourceFormatAndMore}
disabled={nextDisabled}
onClick={() => {
if (!inputSourceFormatAndMore) return;
onSet(inputSourceFormatAndMore);
Expand Down