Skip to content

[CMG-84], [CMG-85] #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
snehalsankhe merged 4 commits into from
Apr 30, 2024
Merged

[CMG-84], [CMG-85] #72

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8d08ebe
[CMG-84], [CMG-85]
sayalijoshi27 Apr 30, 2024
39e3da7
Refactor: PR comments resolved
sayalijoshi27 Apr 30, 2024
805b9ce
Revert 'refactor: Removed unwanted Venus Components' This reverts com…
sayalijoshi27 Apr 30, 2024
ad4a3cc
Refactor: PR comments resolved
sayalijoshi27 Apr 30, 2024
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
Prev Previous commit
Refactor: PR comments resolved
  • Loading branch information
@sayalijoshi27
sayalijoshi27 committed Apr 30, 2024
commit ad4a3cce8195c44f25b07dfc64844de0238a6d7d
56 changes: 28 additions & 28 deletions ui/src/components/Common/AddStack/addStack.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@ const AddStack = (props: any): JSX.Element => {
const onSubmit = async (formData: any) => {
setIsProcessing(true);
const resp = await props.onSubmit({
name: formData?.name || props.defaultValues.name,
description: formData?.description || props.defaultValues.description,
locale: formData?.locale?.value || props.defaultValues.locale
name: formData?.name || props?.defaultValues?.name,
description: formData?.description || props?.defaultValues?.description,
locale: formData?.locale?.value || props?.defaultValues?.locale
});

if (resp) {
Expand All @@ -61,7 +61,7 @@ const AddStack = (props: any): JSX.Element => {

useEffect(() => {
//check if offline CMS data field is set to true, if then read data from cms data file.
getCMSDataFromFile(CS_ENTRIES.ADD_STACK)
getCMSDataFromFile(CS_ENTRIES?.ADD_STACK)
.then((data: AddStackCMSData) => {
//Check for null
if (!data) {
Expand Down Expand Up @@ -93,10 +93,10 @@ const AddStack = (props: any): JSX.Element => {
keepDirtyOnReinitialize={true}
validate={(values): any => {
const errors: any = {};
if (!values.name || values.name.trim().lenght < 1) {
if (!values?.name || values?.name?.trim().lenght < 1) {
errors.name = 'Stack name required';
}
if (!values.locale || values.locale === '') {
if (!values?.locale || values?.locale === '') {
errors.locale = 'Required';
}
return errors;
Expand All @@ -109,7 +109,7 @@ const AddStack = (props: any): JSX.Element => {
<>
<div className="ReactModal__add-stack">
<form onSubmit={handleSubmit}>
<ModalHeader title={addStackCMSData?.title} closeModal={props.closeModal} />
<ModalHeader title={addStackCMSData?.title} closeModal={props?.closeModal} />
<ModalBody className="no-scroll">
<Field>
<ReactFinalField name="name" type="input">
Expand All @@ -120,30 +120,30 @@ const AddStack = (props: any): JSX.Element => {
required
testId="cs-stack-create-title"
version="v2"
error={meta.error && meta.touched && true}
error={meta?.error && meta?.touched && true}
htmlFor="name"
>
{addStackCMSData.stack_name}
{addStackCMSData?.stack_name}
</FieldLabel>
<TextInput
testId="cs-stack-create-title-input"
version="v2"
{...input}
onChange={(event: any): any => {
input.onChange(event);
input?.onChange(event);
}}
name="name"
autoComplete="off"
type="text"
placeholder={addStackCMSData.stack_name_placeholder}
error={(meta.error || meta.submitError) && meta.touched}
placeholder={addStackCMSData?.stack_name_placeholder}
error={(meta?.error || meta?.submitError) && meta?.touched}
/>
{meta.error && meta.touched && (
{meta?.error && meta?.touched && (
<ValidationMessage
version="v2"
testId="cs-stack-create-title-validation"
>
{meta.error}
{meta?.error}
</ValidationMessage>
)}
</>
Expand All @@ -162,7 +162,7 @@ const AddStack = (props: any): JSX.Element => {
version="v2"
htmlFor="description"
>
{addStackCMSData.stack_description}
{addStackCMSData?.stack_description}
</FieldLabel>
<Textarea
testId="cs-stack-create-description-input"
Expand All @@ -171,9 +171,9 @@ const AddStack = (props: any): JSX.Element => {
{...input}
name="description"
onChange={(event: any): any => {
input.onChange(event);
input?.onChange(event);
}}
placeholder={addStackCMSData.stack_description_placeholder}
placeholder={addStackCMSData?.stack_description_placeholder}
/>
</Field>
</div>
Expand All @@ -190,30 +190,30 @@ const AddStack = (props: any): JSX.Element => {
required
testId="cs-stack-create-language"
version="v2"
error={meta.error && meta.touched && true}
error={meta?.error && meta?.touched && true}
htmlFor="locale"
>
{addStackCMSData.stack_locales}
{addStackCMSData?.stack_locales}
</FieldLabel>
<Select
value={input.value}
value={input?.value}
isSearchable={true}
onChange={(event: any): any => {
input.onChange(event);
input?.onChange(event);
}}
name="locale"
width="300px"
options={props.locales}
options={props?.locales}
isClearable={true}
version={'v2'}
placeholder={addStackCMSData.stack_locale_description}
placeholder={addStackCMSData?.stack_locale_description}
/>
{meta.error && meta.touched && (
{meta?.error && meta?.touched && (
<ValidationMessage
testId="cs-stack-create-language-validation"
version="v2"
>
{meta.error}
{meta?.error}
</ValidationMessage>
)}
</>
Expand All @@ -230,10 +230,10 @@ const AddStack = (props: any): JSX.Element => {
testId="cs-cancel-create-stack"
buttonType="tertiary"
onClick={(): any => {
props.closeModal();
props?.closeModal();
}}
>
{addStackCMSData.secondary_cta.title}
{addStackCMSData?.secondary_cta?.title}
</Button>
<Button
aria-label="Create New Stack"
Expand All @@ -244,7 +244,7 @@ const AddStack = (props: any): JSX.Element => {
type="submit"
loading={isProcessing}
>
{addStackCMSData.primary_cta.title}
{addStackCMSData?.primary_cta?.title}
</Button>
</ButtonGroup>
</ModalFooter>
Expand Down