Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ui/src/cmsData/content_mapping.json
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
"_version": 3
},
"table_search_placeholder": "Search fields",
"search_placeholder": "Search content models",
"search_placeholder": "Search...",
"tags": [],
"title": "Content Mapping",
"updated_at": "2024-01-25T12:13:32.967Z",
Expand Down
11 changes: 11 additions & 0 deletions ui/src/components/Common/AddStack/addStack.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
@import '../../../scss/App.scss';

/**
* Styles for the ReactModal__add-stack class.
*/
Expand Down Expand Up @@ -26,3 +28,12 @@
.ReactModal__Overlay .ReactModal__Content .ReactModal__Content__body.selectWrapperBody {
overflow: visible;
}
.stack-creation-warning {
color: $color-font-base;
font-size: $size-font-large;
margin-left: .5rem;
margin-top: .5rem;
.imp-text {
font-weight: $font-weight-semi-bold;
}
}
275 changes: 137 additions & 138 deletions ui/src/components/Common/AddStack/addStack.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -150,163 +150,162 @@ const AddStack = (props: any): JSX.Element => {
}}
render={({ handleSubmit }): JSX.Element => {
return (
<>
<div className="ReactModal__add-stack">
<form onSubmit={handleSubmit}>
<ModalHeader title={addStackCMSData?.title} closeModal={props?.closeModal} />
<ModalBody className="no-scroll selectWrapperBody">
<Field>
<ReactFinalField name="name" type="input">
{({ input, meta }): JSX.Element => {
return (
<>
<div className="ReactModal__add-stack">
<form onSubmit={handleSubmit}>
<ModalHeader title={addStackCMSData?.title} closeModal={props?.closeModal} />
<ModalBody className="no-scroll selectWrapperBody">
<Field>
<ReactFinalField name="name" type="input">
{({ input, meta }): JSX.Element => {
return (
<>
<FieldLabel
required
testId="cs-stack-create-title"
version="v2"
error={meta?.error && meta?.touched && true}
htmlFor="name"
>
{addStackCMSData?.stack_name}
</FieldLabel>
<TextInput
testId="cs-stack-create-title-input"
version="v2"
{...input}
onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
input?.onChange(event);
}}
name="name"
autoComplete="off"
type="text"
placeholder={addStackCMSData?.stack_name_placeholder}
error={(meta?.error || meta?.submitError) && meta?.touched}
/>
{meta?.error && meta?.touched && (
<ValidationMessage
version="v2"
testId="cs-stack-create-title-validation"
>
{meta?.error}
</ValidationMessage>
)}
</>
);
}}
</ReactFinalField>
</Field>
<Field>
<ReactFinalField name={'description'} type="textarea">
{({ input, meta }): JSX.Element => {
return (
<div className="input-description">
<Field>
<FieldLabel
required
testId="cs-stack-create-title"
testId="cs-stack-create-description"
version="v2"
error={meta?.error && meta?.touched && true}
htmlFor="name"
htmlFor="description"
>
{addStackCMSData?.stack_name}
{addStackCMSData?.stack_description}
</FieldLabel>
<TextInput
testId="cs-stack-create-title-input"
<Textarea
testId="cs-stack-create-description-input"
version="v2"
className="Description-field"
{...input}
onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
name="description"
onChange={(
event: React.ChangeEvent<HTMLInputElement>
): void => {
input?.onChange(event);
}}
name="name"
autoComplete="off"
type="text"
placeholder={addStackCMSData?.stack_name_placeholder}
placeholder={addStackCMSData?.stack_description_placeholder}
error={(meta?.error || meta?.submitError) && meta?.touched}
/>
{meta?.error && meta?.touched && (
<ValidationMessage
version="v2"
testId="cs-stack-create-title-validation"
testId="cs-stack-create-description-validation"
>
{meta?.error}
</ValidationMessage>
)}
</>
);
}}
</ReactFinalField>
</Field>
<Field>
<ReactFinalField name={'description'} type="textarea">
{({ input, meta }): JSX.Element => {
return (
<div className="input-description">
<Field>
<FieldLabel
testId="cs-stack-create-description"
version="v2"
htmlFor="description"
>
{addStackCMSData?.stack_description}
</FieldLabel>
<Textarea
testId="cs-stack-create-description-input"
version="v2"
className="Description-field"
{...input}
name="description"
onChange={(
event: React.ChangeEvent<HTMLInputElement>
): void => {
input?.onChange(event);
}}
placeholder={addStackCMSData?.stack_description_placeholder}
error={(meta?.error || meta?.submitError) && meta?.touched}
/>
{meta?.error && meta?.touched && (
<ValidationMessage
version="v2"
testId="cs-stack-create-description-validation"
>
{meta?.error}
</ValidationMessage>
)}
</Field>
</div>
);
}}
</ReactFinalField>
</Field>
<Field>
<ReactFinalField name={'locale'}>
{({ input, meta }): JSX.Element => {
return (
<>
<FieldLabel
required
testId="cs-stack-create-language"
</Field>
</div>
);
}}
</ReactFinalField>
</Field>
<Field>
<ReactFinalField name={'locale'}>
{({ input, meta }): JSX.Element => {
return (
<>
<FieldLabel
required
testId="cs-stack-create-language"
version="v2"
error={meta?.error && meta?.touched && true}
htmlFor="locale"
>
{addStackCMSData?.stack_locales}
</FieldLabel>
<Select
value={input?.value}
isSearchable={true}
onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
input?.onChange(event);
}}
name="locale"
width="300px"
options={allLocales}
maxMenuHeight={200}
isClearable={true}
version={'v2'}
placeholder={addStackCMSData?.stack_locale_description}
/>
<div className="stack-creation-warning"><span className='imp-text'>Important:</span> The master language cannot be changed after the stack has been created.</div>
{meta?.error && meta?.touched && (
<ValidationMessage
testId="cs-stack-create-language-validation"
version="v2"
error={meta?.error && meta?.touched && true}
htmlFor="locale"
>
{addStackCMSData?.stack_locales}
</FieldLabel>
<Select
value={input?.value}
isSearchable={true}
onChange={(event: React.ChangeEvent<HTMLInputElement>): void => {
input?.onChange(event);
}}
name="locale"
width="300px"
options={allLocales}
maxMenuHeight={200}
isClearable={true}
version={'v2'}
placeholder={addStackCMSData?.stack_locale_description}
/>
{meta?.error && meta?.touched && (
<ValidationMessage
testId="cs-stack-create-language-validation"
version="v2"
>
{meta?.error}
</ValidationMessage>
)}
</>
);
}}
</ReactFinalField>
</Field>
</ModalBody>
<ModalFooter>
<ButtonGroup>
<Button
aria-label="Cancel"
version="v2"
testId="cs-cancel-create-stack"
buttonType="tertiary"
onClick={(): any => {
props?.closeModal();
}}
>
{addStackCMSData?.secondary_cta?.title}
</Button>
<Button
aria-label="Create New Stack"
version="v2"
testId="cs-create-stack"
buttonType="primary"
name="submit"
type="submit"
loading={isProcessing}
>
{addStackCMSData?.primary_cta?.title}
</Button>
</ButtonGroup>
</ModalFooter>
</form>
</div>
</>
{meta?.error}
</ValidationMessage>
)}
</>
);
}}
</ReactFinalField>
</Field>
</ModalBody>
<ModalFooter>
<ButtonGroup>
<Button
aria-label="Cancel"
version="v2"
testId="cs-cancel-create-stack"
buttonType="tertiary"
onClick={(): any => {
props?.closeModal();
}}
>
{addStackCMSData?.secondary_cta?.title}
</Button>
<Button
aria-label="Create New Stack"
version="v2"
testId="cs-create-stack"
buttonType="primary"
name="submit"
type="submit"
loading={isProcessing}
>
{addStackCMSData?.primary_cta?.title}
</Button>
</ButtonGroup>
</ModalFooter>
</form>
</div>
);
}}
/>
Expand Down
12 changes: 9 additions & 3 deletions ui/src/components/ContentMapper/index.scss
Original file line number Diff line number Diff line change
Expand Up @@ -156,11 +156,17 @@
padding: 0 1.25rem;
}
.cms-field {
text-transform: capitalize;
// text-transform: capitalize;
// overflow: hidden;
// text-overflow: ellipsis;
// white-space: nowrap;
// width: 445px;

display: -webkit-box;
-webkit-box-orient: vertical;
-webkit-line-clamp: 1;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 445px;
}
.InstructionText {
font-size: $size-font-small;
Expand Down
Loading
Loading