Skip to content

Commit 75977d6

Browse files
XingYXingY
committed
code review changes
1 parent 38bce12 commit 75977d6

8 files changed

Lines changed: 270 additions & 7708 deletions

File tree

‎packages/components/src/internal/components/EditInlineField.test.tsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ describe('EditInlineField', () => {
4242
expect(document.querySelector('.edit-inline-field__label')).toHaveTextContent('Test Label');
4343
}
4444

45-
expect(document.querySelectorAll('.date-input')).toHaveLength(type?.date ?? 0);
4645
expect(document.querySelectorAll('.date-input')).toHaveLength(type?.date ?? 0);
4746
expect(document.querySelectorAll('textarea')).toHaveLength(type?.textarea ?? 0);
4847
expect(document.querySelectorAll('input')).toHaveLength(type?.text ?? type?.date ?? 0);
@@ -212,7 +211,7 @@ describe('EditInlineField', () => {
212211
renderWithAppContext(
213212
<EditInlineField
214213
{...DEFAULT_PROPS}
215-
value="18:00:00.123"
214+
value="18:00:00.1234"
216215
column={
217216
new QueryColumn({
218217
format: 'hh:mm a',

‎packages/components/src/internal/components/EditInlineField.tsx‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -156,9 +156,7 @@ export const EditInlineField: FC<Props> = memo(props => {
156156
if (!date) {
157157
if (isDate) setDateValue(undefined);
158158
else setTimeJsonValue(undefined);
159-
}
160-
161-
if (typeof date === 'string') {
159+
} else if (typeof date === 'string') {
162160
if (!isDate) setTimeJsonValue(date);
163161
} else {
164162
if (isDate) setDateValue(date);

‎packages/components/src/internal/components/editable/actions.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,6 @@ async function prepareInsertRowDataFromBulkForm(
483483
const data = rowData.get(cn);
484484
const colIdx = colMin + cn;
485485
const col = insertColumns[colIdx];
486-
// convert date/time fields
487486
const { message, valueDescriptors } = await convertRowToEditorModelData(data, col, containerPath);
488487
values = values.push(valueDescriptors);
489488

‎packages/components/src/internal/components/forms/QueryInfoForm.test.tsx‎

Lines changed: 36 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ import { render } from '@testing-library/react';
1818

1919
import { makeQueryInfo } from '../../test/testHelpers';
2020
import mixturesQueryInfo from '../../../test/data/mixtures-getQueryDetails.json';
21-
import samplesQueryInfo from '../../../test/data/sampleDateTimeProps-getQueryDetails.json';
2221

2322
import { getUpdatedFields, QueryInfoForm } from './QueryInfoForm';
2423

2524
const MIXTURE_QUERY_INFO = makeQueryInfo(mixturesQueryInfo);
26-
const SAMPLE_QUERY_INFO = makeQueryInfo(samplesQueryInfo);
2725

2826
describe('QueryInfoForm', () => {
2927
test('default props', () => {
@@ -199,42 +197,43 @@ describe('QueryInfoForm', () => {
199197

200198
describe('getUpdatedFields', () => {
201199
const formData = {
202-
date: '2025-04-17',
203-
dateTime: '2025-04-16 22:30:00.000',
204-
time: '22:20:00.000',
200+
expirationTime: '22:20:00.000',
201+
extraTestColumn: 'abc ',
202+
numItems: 10,
205203
};
206204

207-
const formDataWithExtraPrecision = {
208-
date: '2025-04-17',
209-
dateTime: '2025-04-16 22:30:01.123',
210-
time: '22:20:01.123',
211-
};
212-
213-
const formDataWithDiffFormat = {
214-
date: '2025/04/17',
215-
dateTime: '2025/04/16 22:30:01.123',
216-
time: '10:20:01.123 PM',
217-
};
218-
219-
const formatted = {
220-
date: '2025-04-17',
221-
dateTime: '2025-04-16 22:30',
222-
time: '22:20',
223-
};
224-
225-
test('submitForEdit = true', () => {
226-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formData, true).toJS()).toEqual(formatted);
227-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formDataWithExtraPrecision, true).toJS()).toEqual(formatted);
228-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formDataWithDiffFormat, true).toJS()).toEqual(formatted);
229-
});
230-
231-
test('submitForEdit = false', () => {
232-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formData, false).toJS()).toEqual(formData);
233-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formDataWithExtraPrecision, false).toJS()).toEqual(
234-
formDataWithExtraPrecision
235-
);
236-
expect(getUpdatedFields(SAMPLE_QUERY_INFO, formDataWithDiffFormat, false).toJS()).toEqual(
237-
formDataWithDiffFormat
238-
);
205+
test('without ::enabled', () => {
206+
expect(getUpdatedFields(MIXTURE_QUERY_INFO, formData).toJS()).toEqual({
207+
expirationTime: '22:20:00.000',
208+
extraTestColumn: 'abc'
209+
});
210+
});
211+
212+
test('without ::enabled, with additionalFields', () => {
213+
expect(getUpdatedFields(MIXTURE_QUERY_INFO, formData, ['numItems']).toJS()).toEqual({
214+
expirationTime: '22:20:00.000',
215+
extraTestColumn: 'abc',
216+
numItems: 10
217+
});
218+
});
219+
220+
test('with ::enabled=false', () => {
221+
expect(getUpdatedFields(MIXTURE_QUERY_INFO, {
222+
...formData,
223+
'extraTestColumn::enabled': false
224+
}).toJS()).toEqual({
225+
expirationTime: '22:20:00.000',
226+
});
227+
});
228+
229+
test('with ::enabled=false, with additionalFields', () => {
230+
expect(getUpdatedFields(MIXTURE_QUERY_INFO, {
231+
...formData,
232+
'extraTestColumn::enabled': false
233+
}, ['numItems', 'extraTestColumn']).toJS()).toEqual({
234+
expirationTime: '22:20:00.000',
235+
extraTestColumn: 'abc',
236+
numItems: 10
237+
});
239238
});
240239
});

‎packages/components/src/internal/components/forms/QueryInfoForm.tsx‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ import { CommentTextArea } from './input/CommentTextArea';
4545
export const getUpdatedFields = (
4646
queryInfo: QueryInfo,
4747
data: any,
48-
submitForEdit?: boolean,
4948
additionalFields?: string[]
5049
): OrderedMap<string, any> => {
5150
const fieldsToUpdate = queryInfo.columns.filter(column => {
@@ -56,7 +55,7 @@ export const getUpdatedFields = (
5655
let filteredData = OrderedMap<string, any>();
5756
for (const key in data) {
5857
if (data.hasOwnProperty(key)) {
59-
if (fieldsToUpdate.has(key.toLowerCase()) || additionalFields.indexOf(key) !== -1) {
58+
if (fieldsToUpdate.has(key.toLowerCase()) || (additionalFields && additionalFields?.indexOf(key) !== -1)) {
6059
const col = queryInfo?.getColumn(key);
6160
if (col?.jsonType === 'string' && typeof data[key] === 'string') {
6261
filteredData = filteredData.set(key, data[key]?.trim());
@@ -192,7 +191,7 @@ export class QueryInfoForm extends PureComponent<QueryInfoFormProps, State> {
192191
if (onFormChangeWithData) {
193192
const row = this.formRef?.['current']?.['getModel']?.();
194193
if (row) {
195-
const updatedRow = getUpdatedFields(queryInfo, row, this.state.submitForEdit, [
194+
const updatedRow = getUpdatedFields(queryInfo, row, [
196195
'numItems',
197196
'creationType',
198197
]);
@@ -222,7 +221,7 @@ export class QueryInfoForm extends PureComponent<QueryInfoFormProps, State> {
222221
errorMsg: undefined,
223222
isSubmitting: true,
224223
});
225-
const updatedRow = getUpdatedFields(this.props.queryInfo, row, submitForEdit, ['numItems', 'creationType']);
224+
const updatedRow = getUpdatedFields(this.props.queryInfo, row, ['numItems', 'creationType']);
226225
const submitFn = submitForEdit ? onSubmitForEdit : onSubmit;
227226

228227
submitFn(updatedRow, comment).then(

0 commit comments

Comments
 (0)