Skip to content

Commit

Permalink
fix!: update behaviour for an empty string inside Table field (#630)
Browse files Browse the repository at this point in the history
BREAKING CHANGE: The behavior for an empty string inside the Table field changed (#630 )
Release-As: 1.10.7

Co-authored-by: hung-nguyen <hung-nguyen@cybozu.vn>
  • Loading branch information
tuanphamcybozu and hung-cybo committed Dec 21, 2023
1 parent c2f43e5 commit 418ffdb
Show file tree
Hide file tree
Showing 3 changed files with 134 additions and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,34 @@ export const expected: LocalRecord[] = [
data: {
text: { value: "sample1" },
subTable: {
value: [{ id: "102", value: {} }],
value: [
{
id: "102",
value: {
numberInSubtable: {
value: "",
},
textInSubtable: {
value: "",
},
},
},
],
},
subTable2: {
value: [{ id: "202", value: {} }],
value: [
{
id: "202",
value: {
numberInSubtable2: {
value: "",
},
textInSubtable2: {
value: "",
},
},
},
],
},
},
metadata: {
Expand All @@ -85,6 +109,9 @@ export const expected: LocalRecord[] = [
{
id: "",
value: {
numberInSubtable: {
value: "",
},
textInSubtable: {
value: "carol",
},
Expand All @@ -100,6 +127,9 @@ export const expected: LocalRecord[] = [
numberInSubtable2: {
value: "30",
},
textInSubtable2: {
value: "",
},
},
},
],
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
import type { SubtableRow, FieldInSubtable } from "../subtable";

import { fieldInSubtableReader } from "../subtable";
import type { InSubtable } from "../../../../types/schema";

const fields: InSubtable[] = [
{
type: "SINGLE_LINE_TEXT",
code: "Text_0",
label: "Text",
noLabel: false,
required: false,
minLength: "",
maxLength: "",
expression: "",
hideExpression: false,
unique: false,
defaultValue: "",
},
{
type: "NUMBER",
code: "Number_0",
label: "Number",
noLabel: false,
required: false,
minValue: "",
maxValue: "",
digit: false,
unique: false,
defaultValue: "",
displayScale: "",
unit: "",
unitPosition: "BEFORE",
},
];

const patterns: Array<{
description: string;
input: SubtableRow;
expected: FieldInSubtable[];
}> = [
{
description: "all fields have valid value",
input: {
id: "",
row: {
"*": "*",
Record_number: "",
Table: "1",
Text_0: "Text_0",
Number_0: "10",
},
fields,
},
expected: [
{ code: "Text_0", value: "Text_0", type: "SINGLE_LINE_TEXT" },
{ code: "Number_0", value: "10", type: "NUMBER" },
],
},
{
description: "empty field value",
input: {
id: "",
row: {
"*": "*",
Record_number: "",
Table: "1",
Text_0: "",
Number_0: "10",
},
fields,
},
expected: [
{ code: "Text_0", value: "", type: "SINGLE_LINE_TEXT" },
{ code: "Number_0", value: "10", type: "NUMBER" },
],
},
{
description: "missing field value",
input: {
id: "",
row: {
"*": "*",
Record_number: "",
Table: "1",
Number_0: "10",
},
fields,
},
expected: [{ code: "Number_0", value: "10", type: "NUMBER" }],
},
];

describe("fieldInSubtableReader", () => {
it.each(patterns)("$description", ({ input, expected }) => {
expect(Array.from(fieldInSubtableReader(input))).toStrictEqual(expected);
});
});
10 changes: 4 additions & 6 deletions src/record/import/repositories/parsers/parseCsv/subtable.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export function* subtableFieldReader(
}
}

type SubtableRow = {
export type SubtableRow = {
id: string;
row: CsvRow;
fields: InSubtable[];
Expand Down Expand Up @@ -78,7 +78,7 @@ function* subtableRowReader(
}
}

type FieldInSubtable = {
export type FieldInSubtable = {
code: string;
value: string;
type: InSubtable["type"];
Expand All @@ -90,14 +90,12 @@ const convertFieldInSubtable = (
};

// eslint-disable-next-line func-style
function* fieldInSubtableReader({
export function* fieldInSubtableReader({
row,
fields,
}: SubtableRow): Generator<FieldInSubtable, void, undefined> {
for (const fieldInSubtable of fields) {
if (
!(fieldInSubtable.code in row && row[fieldInSubtable.code].length > 0)
) {
if (!(fieldInSubtable.code in row)) {
continue;
}

Expand Down

0 comments on commit 418ffdb

Please sign in to comment.