Skip to content

Commit 0f3eda7

Browse files
VargaJoeVargaJoe
committed
feat(field-controls): show field titles as 'DisplayName (Name)' in all field controls
1 parent 4774874 commit 0f3eda7

File tree

12 files changed

+30
-30
lines changed

12 files changed

+30
-30
lines changed

‎packages/sn-controls-react/src/fieldcontrols/name.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export const Name: React.FC<ReactClientFieldSetting> = (props) => {
4343
autoComplete="off"
4444
name={props.settings.Name}
4545
id={props.settings.Name}
46-
label={props.settings.DisplayName}
46+
label={`${props.settings.DisplayName} (${props.settings.Name})`}
4747
placeholder={props.settings.DisplayName}
4848
value={value}
4949
required={props.settings.Compulsory}
@@ -65,7 +65,7 @@ export const Name: React.FC<ReactClientFieldSetting> = (props) => {
6565
return (
6666
<div>
6767
<Typography variant="caption" gutterBottom={true}>
68-
{props.settings.DisplayName}
68+
{`${props.settings.DisplayName} (${props.settings.Name})`}
6969
</Typography>
7070
<Typography variant="body1" gutterBottom={true}>
7171
{props.fieldValue || localization.noValue}

‎packages/sn-controls-react/src/fieldcontrols/number.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ export const NumberField: React.FC<ReactClientFieldSetting<NumberFieldSetting |
1919
props.fieldValue != null
2020
? props.fieldValue
2121
: (props.actionName === 'new' &&
22-
props.settings.DefaultValue !== undefined &&
23-
Number.parseInt(changeTemplatedValue(props.settings.DefaultValue)!, 10)) ||
24-
undefined
22+
props.settings.DefaultValue !== undefined &&
23+
Number.parseInt(changeTemplatedValue(props.settings.DefaultValue)!, 10)) ||
24+
undefined
2525
const [value, setValue] = useState(initialState)
2626

2727
const handleChange = (e: React.ChangeEvent<HTMLTextAreaElement | HTMLInputElement | HTMLSelectElement>) => {
@@ -90,7 +90,7 @@ export const NumberField: React.FC<ReactClientFieldSetting<NumberFieldSetting |
9090
return (
9191
<div>
9292
<Typography variant="caption" gutterBottom={true}>
93-
{props.settings.DisplayName}
93+
{`${props.settings.DisplayName} (${props.settings.Name})`}
9494
</Typography>
9595
<Typography variant="body1" gutterBottom={true}>
9696
{props.fieldValue != null ? (

‎packages/sn-controls-react/src/fieldcontrols/page-count.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export const PageCount: React.FC<ReactClientFieldSetting> = (props) => {
2929
return (
3030
<>
3131
<label htmlFor={props.settings.Name} style={{ fontSize: '15px' }}>
32-
{props.settings.DisplayName}
32+
{`${props.settings.DisplayName} (${props.settings.Name})`}
3333
</label>
3434
<TextField
3535
variant="outlined"
@@ -53,7 +53,7 @@ export const PageCount: React.FC<ReactClientFieldSetting> = (props) => {
5353
return (
5454
<div>
5555
<Typography variant="caption" gutterBottom={true}>
56-
{props.settings.DisplayName}
56+
{`${props.settings.DisplayName} (${props.settings.Name})`}
5757
</Typography>
5858
<Typography variant="body1" gutterBottom={true}>
5959
{props.fieldValue != null ? (

‎packages/sn-controls-react/src/fieldcontrols/password.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ export const Password: React.FC<ReactClientFieldSetting> = (props) => {
4949
return (
5050
<FormControl fullWidth={true} className={classes.root}>
5151
<InputLabel htmlFor={props.settings.Name} shrink={true}>
52-
{props.settings.DisplayName}
52+
{`${props.settings.DisplayName} (${props.settings.Name})`}
5353
</InputLabel>
5454
<Input
5555
autoComplete="new-password"
@@ -77,7 +77,7 @@ export const Password: React.FC<ReactClientFieldSetting> = (props) => {
7777
default:
7878
return (
7979
<Typography variant="caption" gutterBottom={true}>
80-
{props.settings.DisplayName}
80+
{`${props.settings.DisplayName} (${props.settings.Name})`}
8181
</Typography>
8282
)
8383
}

‎packages/sn-controls-react/src/fieldcontrols/radio-button-group.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export const RadioButtonGroup: React.FC<ReactClientFieldSetting<ChoiceFieldSetti
4545
required={props.settings.Compulsory}
4646
disabled={props.settings.ReadOnly}>
4747
<FormLabel style={{ transform: 'translate(0, 1.5px) scale(0.75)', transformOrigin: 'top left' }}>
48-
{props.settings.DisplayName}
48+
{`${props.settings.DisplayName} (${props.settings.Name})`}
4949
</FormLabel>
5050
<RadioGroup
5151
aria-label={props.settings.DisplayName}
@@ -67,7 +67,7 @@ export const RadioButtonGroup: React.FC<ReactClientFieldSetting<ChoiceFieldSetti
6767
return (
6868
<>
6969
<Typography variant="caption" gutterBottom={true}>
70-
{props.settings.DisplayName}
70+
{`${props.settings.DisplayName} (${props.settings.Name})`}
7171
</Typography>
7272
<Typography variant="body1" gutterBottom>
7373
{value ? props.settings.Options?.find((item) => item.Value === value)?.Text ?? value : localization.noValue}

‎packages/sn-controls-react/src/fieldcontrols/rich-text-editor.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ export const RichTextEditor: React.FC<
105105
return (
106106
<div>
107107
<Typography variant="caption" gutterBottom={true}>
108-
{props.settings.DisplayName}
108+
{`${props.settings.DisplayName} (${props.settings.Name})`}
109109
</Typography>
110110
{initialState ? (
111111
<div

‎packages/sn-controls-react/src/fieldcontrols/short-text.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export const ShortText: React.FC<ReactClientFieldSetting<ShortTextFieldSetting>>
5858
return (
5959
<div>
6060
<Typography variant="caption" gutterBottom={true}>
61-
{props.settings.DisplayName}
61+
{`${props.settings.DisplayName} (${props.settings.Name})`}
6262
</Typography>
6363
<Typography variant="body1" gutterBottom={true}>
6464
{/* Temporary hot fix */}

‎packages/sn-controls-react/src/fieldcontrols/switcher.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ export const Switcher: React.FC<ReactClientFieldSetting<FieldSetting>> = (props)
138138
disabled={props.settings.ReadOnly}>
139139
<Typography component="div" style={{ width: '100%' }}>
140140
<Grid component="label" className={classes.switcherCont} container spacing={1}>
141-
<Grid item>{props.settings.DisplayName}</Grid>
141+
<Grid item>{`${props.settings.DisplayName} (${props.settings.Name})`}</Grid>
142142
<Grid item>
143143
<Switch data-test="edit-switch" size="medium" checked={value} onChange={handleChange} />
144144
</Grid>
@@ -165,7 +165,7 @@ export const Switcher: React.FC<ReactClientFieldSetting<FieldSetting>> = (props)
165165
style={{
166166
paddingRight: '30px',
167167
}}>
168-
{props.settings.DisplayName}
168+
{`${props.settings.DisplayName} (${props.settings.Name})`}
169169
</Grid>
170170
<Grid item>
171171
{props.fieldValue != null ? (

‎packages/sn-controls-react/src/fieldcontrols/tags-input.tsx‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@ export const TagsInput: React.FC<ReactClientFieldSetting<ReferenceFieldSetting>>
8080
let s: GenericContent[] = []
8181
props.settings.AllowMultiple && Array.isArray(event.target.value)
8282
? (s = event.target.value.reduce<GenericContent[]>((value, c: number) => {
83-
const content = getContentById(c)
84-
if (content) {
85-
value.push(content)
86-
}
87-
return value
88-
}, []))
83+
const content = getContentById(c)
84+
if (content) {
85+
value.push(content)
86+
}
87+
return value
88+
}, []))
8989
: (s = [getContentById(event.target.value as number)!])
9090

9191
setFieldValue(s)
@@ -250,7 +250,7 @@ export const TagsInput: React.FC<ReactClientFieldSetting<ReferenceFieldSetting>>
250250
component={'fieldset' as 'div'}
251251
required={props.settings.Compulsory}>
252252
<InputLabel required={props.settings.Compulsory} htmlFor={props.settings.Name}>
253-
{props.settings.DisplayName}
253+
{`${props.settings.DisplayName} (${props.settings.Name})`}
254254
</InputLabel>
255255
<Select
256256
value={getValue()}
@@ -278,8 +278,8 @@ export const TagsInput: React.FC<ReactClientFieldSetting<ReferenceFieldSetting>>
278278
props.repository?.schemas.isContentFromType<User>(content, 'User')
279279
? undefined
280280
: props.renderIcon
281-
? props.renderIcon(content.Type.toLowerCase())
282-
: renderIconDefault(content.Type.toLowerCase())
281+
? props.renderIcon(content.Type.toLowerCase())
282+
: renderIconDefault(content.Type.toLowerCase())
283283
}
284284
key={content.Id}
285285
label={content.DisplayName}
@@ -307,7 +307,7 @@ export const TagsInput: React.FC<ReactClientFieldSetting<ReferenceFieldSetting>>
307307
return (
308308
<>
309309
<Typography variant="caption" gutterBottom={true}>
310-
{props.settings.DisplayName}
310+
{`${props.settings.DisplayName} (${props.settings.Name})`}
311311
</Typography>
312312
<FormGroup>
313313
{fieldValue && fieldValue.length > 0 ? (

‎packages/sn-controls-react/src/fieldcontrols/textarea.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export const Textarea: React.FC<ReactClientFieldSetting<LongTextFieldSetting>> =
5555
return (
5656
<div>
5757
<Typography variant="caption" gutterBottom={true}>
58-
{props.settings.DisplayName}
58+
{`${props.settings.DisplayName} (${props.settings.Name})`}
5959
</Typography>
6060
<Typography component="div" variant="body1" gutterBottom={true}>
6161
{props.fieldValue || localization.noValue}

0 commit comments

Comments
 (0)