Skip to content

Commit c0ce9cf

Browse files
committed
Fixes after review
1 parent 3c3ae8c commit c0ce9cf

6 files changed

Lines changed: 10 additions & 7 deletions

File tree

frontend/src/components/form/Toogle/index.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ export const FormToggle = <T extends FieldValues>({
1818
leftContent,
1919
toggleLabel,
2020
onChange: onChangeProp,
21+
toggleDescription,
2122
...props
2223
}: FormToggleProps<T>) => {
2324
return (
@@ -28,6 +29,7 @@ export const FormToggle = <T extends FieldValues>({
2829
render={({ field: { onChange, value, ...fieldRest }, fieldState: { error } }) => {
2930
return (
3031
<FormField
32+
description={description}
3133
label={label}
3234
info={info}
3335
stretch={stretch}
@@ -45,7 +47,7 @@ export const FormToggle = <T extends FieldValues>({
4547
onChange(event.detail.checked);
4648
onChangeProp?.(event);
4749
}}
48-
description={description}
50+
description={toggleDescription}
4951
>
5052
{toggleLabel}
5153
</ToggleCSD>

frontend/src/components/form/Toogle/types.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import { ToggleProps } from '@cloudscape-design/components/toggle';
66
export type FormToggleProps<T extends FieldValues> = Omit<ToggleProps, 'value' | 'checked' | 'name'> &
77
Omit<FormFieldProps, 'errorText'> &
88
Pick<ControllerProps<T>, 'control' | 'name' | 'rules'> & {
9+
toggleDescription?: ReactNode;
910
leftContent?: ReactNode;
1011
toggleLabel?: ReactNode | string;
1112
};

frontend/src/locale/en.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"add": "Add",
77
"yes": "Yes",
88
"no": "No",
9-
"create_": "Create",
10-
"create": "Create {{text}}",
9+
"create": "Create",
10+
"create_wit_text": "Create {{text}}",
1111
"edit": "Edit",
1212
"delete": "Delete",
1313
"remove": "Remove",

frontend/src/pages/Project/Add/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const ProjectAdd: React.FC = () => {
2323
href: ROUTES.PROJECT.LIST,
2424
},
2525
{
26-
text: t('common.create', { text: t('navigation.project') }),
26+
text: t('common.create_wit_text', { text: t('navigation.project') }),
2727
href: ROUTES.PROJECT.ADD,
2828
},
2929
]);

frontend/src/pages/Project/CreateWizard/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ export const CreateProjectWizard: React.FC = () => {
136136
href: ROUTES.PROJECT.LIST,
137137
},
138138
{
139-
text: t('common.create', { text: t('navigation.project') }),
139+
text: t('common.create_wit_text', { text: t('navigation.project') }),
140140
href: ROUTES.PROJECT.ADD,
141141
},
142142
]);

frontend/src/pages/Project/List/index.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const ProjectList: React.FC = () => {
5454
const renderEmptyMessage = (): React.ReactNode => {
5555
return (
5656
<ListEmptyMessage title={t('projects.empty_message_title')} message={t('projects.empty_message_text')}>
57-
{isAvailableProjectManaging && <Button onClick={addProjectHandler}>{t('common.create_')}</Button>}
57+
{isAvailableProjectManaging && <Button onClick={addProjectHandler}>{t('common.create')}</Button>}
5858
</ListEmptyMessage>
5959
);
6060
};
@@ -137,7 +137,7 @@ export const ProjectList: React.FC = () => {
137137
{t('common.delete')}
138138
</ButtonWithConfirmation>
139139

140-
<Button onClick={addProjectHandler}>{t('common.create_')}</Button>
140+
<Button onClick={addProjectHandler}>{t('common.create')}</Button>
141141

142142
<Button
143143
iconName="refresh"

0 commit comments

Comments
 (0)