Skip to content

Commit b712813

Browse files
committed
remove hideBlankRow param, depend on required field to show blank row
1 parent cfd6ddd commit b712813

File tree

7 files changed

+2
-10
lines changed

7 files changed

+2
-10
lines changed

packages/backend/src/apps/custom-api/actions/http-request/index.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ const action: IRawAction = {
5454
description: 'Add custom headers here.',
5555
variables: true,
5656
addRowButtonText: 'Add',
57-
hideBlankRow: true,
5857
subFields: [
5958
{
6059
placeholder: 'Key',

packages/backend/src/apps/lettersg/actions/create-letter/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ const action: IRawAction = {
6969
label: 'Personalised fields',
7070
key: 'letterParams',
7171
type: 'multirow' as const,
72-
required: false,
72+
required: true,
7373
description:
7474
'Specify values for each personalised field in your template.',
7575

packages/backend/src/graphql/schema.graphql

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ type ActionSubstepArgument {
189189
source: ActionSubstepArgumentSource
190190
hiddenIf: FieldVisibilityCondition
191191
addRowButtonText: String
192-
hideBlankRow: Boolean
193192

194193
# Only for dropdown
195194
addNewOption: DropdownAddNewOption

packages/frontend/src/components/InputCreator/index.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,6 @@ export default function InputCreator(props: InputCreatorProps): JSX.Element {
164164
subFields={schema.subFields}
165165
required={required}
166166
addRowButtonText={schema.addRowButtonText}
167-
hideBlankRow={schema.hideBlankRow}
168167
showDivider={type !== 'multirow-multicol'}
169168
type={type}
170169
// These are InputCreatorProps which MultiRow will forward.

packages/frontend/src/components/MultiRow/index.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ export type MultiRowProps = {
2121
label?: string
2222
description?: string
2323
flexDir?: string
24-
hideBlankRow?: boolean
2524
showDivider?: boolean
2625
addRowButtonText?: string
2726
type?: string
@@ -35,7 +34,6 @@ function MultiRow(props: MultiRowProps): JSX.Element {
3534
required,
3635
description,
3736
addRowButtonText,
38-
hideBlankRow,
3937
showDivider,
4038
type,
4139
...forwardedInputCreatorProps
@@ -74,7 +72,7 @@ function MultiRow(props: MultiRowProps): JSX.Element {
7472
<Controller
7573
name={name}
7674
control={control}
77-
defaultValue={hideBlankRow ? [] : [{ ...newRowDefaultValue }]}
75+
defaultValue={!required ? [] : [{ ...newRowDefaultValue }]}
7876
render={({ field: { value: fallbackRows } }): JSX.Element => {
7977
// HACKFIX (ogp-weeloong): I don't know why `rows` lags behind
8078
// `fallbackRows` on the 1st render.

packages/frontend/src/graphql/queries/get-apps.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ export const GET_APPS = gql`
189189
variableTypes
190190
allowArbitrary
191191
addRowButtonText
192-
hideBlankRow
193192
showOptionValue
194193
value
195194
options {

packages/types/index.d.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -354,7 +354,6 @@ export interface IFieldMultiRowMultiCol extends IBaseField {
354354
type: 'multirow-multicol'
355355
value?: string
356356
addRowButtonText?: string
357-
hideBlankRow?: boolean
358357

359358
subFields: IField[]
360359
}
@@ -363,7 +362,6 @@ export interface IFieldMultiRow extends IBaseField {
363362
type: 'multirow'
364363
value?: string
365364
addRowButtonText?: string
366-
hideBlankRow?: boolean
367365

368366
subFields: IField[]
369367
}

0 commit comments

Comments
 (0)