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 apps/ocp-plugin/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"@patternfly/react-table": "^6.4.0",
"@patternfly/react-topology": "^6.4.0",
"@types/react-redux": "^7.1.33",
"formik": "^2.4.5",
"formik": "^2.4.9",
"fuzzysearch": "^1.0.3",
"i18next": "^21.8.14",
"js-yaml": "^4.1.1",
Expand Down
1 change: 1 addition & 0 deletions libs/ui-components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
"devDependencies": {
"@types/file-saver": "^2.0.5",
"@types/react-dom": "^18.2.17",
"@types/semver": "^7.5.2",
"react-router": "6.30.3",
"react-router-dom": "6.30.3"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ const ApplicationHelmForm = ({ index, isReadOnly }: { index: number; isReadOnly?
)}
>
<FieldArray name={`${appFieldName}.valuesFiles`}>
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{(valuesFiles || []).map((file, fileIndex) => (
<Split hasGutter key={fileIndex} className="pf-v6-u-mb-sm">
Expand All @@ -91,7 +91,7 @@ const ApplicationHelmForm = ({ index, isReadOnly }: { index: number; isReadOnly?
variant="link"
icon={<MinusCircleIcon />}
iconPosition="end"
onClick={() => remove(fileIndex)}
onClick={() => arrayHelpers.remove(fileIndex)}
/>
</SplitItem>
)}
Expand All @@ -111,7 +111,7 @@ const ApplicationHelmForm = ({ index, isReadOnly }: { index: number; isReadOnly?
iconPosition="start"
isAriaDisabled={!canAddValuesFile}
onClick={() => {
push('');
arrayHelpers.push('');
}}
>
{t('Add values file')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ const ApplicationInlineForm = ({
return (
<Grid hasGutter>
<FieldArray name={`applications.${index}.files`}>
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{fileList.map((file, fileIndex) => {
const fieldName = `applications[${index}].files[${fileIndex}]`;
Expand All @@ -94,7 +94,7 @@ const ApplicationInlineForm = ({
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(fileIndex)}
onClick={() => arrayHelpers.remove(fileIndex)}
/>
</SplitItem>
)}
Expand All @@ -109,7 +109,7 @@ const ApplicationInlineForm = ({
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push({
arrayHelpers.push({
path: '',
content: '',
base64: false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ const ApplicationTemplates = ({
)}
</Content>
<FieldArray name="applications">
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{values.applications.map((_app, index) => {
const appCatalog = !!_app.name && !!labels?.[`${_app.name}.${APP_CATALOG_LABEL_KEY}`];
Expand All @@ -227,7 +227,7 @@ const ApplicationTemplates = ({
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(index)}
onClick={() => arrayHelpers.remove(index)}
/>
</SplitItem>
)}
Expand All @@ -244,7 +244,7 @@ const ApplicationTemplates = ({
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push(createInitialAppForm(AppType.AppTypeContainer));
arrayHelpers.push(createInitialAppForm(AppType.AppTypeContainer));
}}
>
{t('Add application')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const ApplicationVariablesForm = ({ appFieldName, isReadOnly }: ApplicationVaria
return (
<FormGroup label={t('Environment variables')} className="fctl-application-variables-form">
<FieldArray name={`${appFieldName}.variables`}>
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{variables.map((_variable, variableIndex) => {
const variableFieldName = `${appFieldName}.variables[${variableIndex}]`;
Expand Down Expand Up @@ -56,7 +56,7 @@ const ApplicationVariablesForm = ({ appFieldName, isReadOnly }: ApplicationVaria
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(variableIndex)}
onClick={() => arrayHelpers.remove(variableIndex)}
/>
</SplitItem>
)}
Expand All @@ -71,7 +71,7 @@ const ApplicationVariablesForm = ({ appFieldName, isReadOnly }: ApplicationVaria
variant="link"
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => push({ name: '', value: '' })}
onClick={() => arrayHelpers.push({ name: '', value: '' })}
>
{t('Add variable')}
</Button>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ const ApplicationVolumeForm = ({
return (
<FormGroup label={t('Volumes')} className="fctl-application-volume-form">
<FieldArray name={`${appFieldName}.volumes`}>
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{volumes.map((volume, volumeIndex) => {
const volumeFieldName = `${appFieldName}.volumes[${volumeIndex}]`;
Expand Down Expand Up @@ -108,7 +108,7 @@ const ApplicationVolumeForm = ({
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(volumeIndex)}
onClick={() => arrayHelpers.remove(volumeIndex)}
/>
</SplitItem>
)}
Expand All @@ -124,7 +124,7 @@ const ApplicationVolumeForm = ({
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push({
arrayHelpers.push({
name: '',
imageRef: '',
imagePullPolicy: ImagePullPolicy.PullIfNotPresent,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ const ConfigInlineTemplateForm = ({ index, isReadOnly }: ConfigInlineTemplateFor

return (
<FieldArray name={`configTemplates.${index}.files`}>
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{inlineConfig.files?.map((_, fileIndex) => {
const fieldName = `configTemplates[${index}].files[${fileIndex}]`;
Expand All @@ -137,7 +137,7 @@ const ConfigInlineTemplateForm = ({ index, isReadOnly }: ConfigInlineTemplateFor
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(fileIndex)}
onClick={() => arrayHelpers.remove(fileIndex)}
/>
</SplitItem>
)}
Expand All @@ -151,7 +151,7 @@ const ConfigInlineTemplateForm = ({ index, isReadOnly }: ConfigInlineTemplateFor
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push({
arrayHelpers.push({
path: '',
content: '',
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ const ConfigurationTemplatesForm = ({
)}
>
<FieldArray name="configTemplates">
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{values.configTemplates.map((_, index) => (
<FormSection key={index}>
Expand All @@ -182,7 +182,7 @@ const ConfigurationTemplatesForm = ({
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(index)}
onClick={() => arrayHelpers.remove(index)}
/>
</SplitItem>
)}
Expand All @@ -197,7 +197,7 @@ const ConfigurationTemplatesForm = ({
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push({
arrayHelpers.push({
name: '',
type: '',
});
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ const UpdateStepRolloutPolicy = ({ isReadOnly }: { isReadOnly: boolean }) => {

<FormGroup>
<FieldArray name="rolloutPolicy.batches">
{({ push, remove }) => (
{(arrayHelpers) => (
<>
{batches.map((_, index) => (
<FormSection key={index}>
Expand All @@ -164,7 +164,7 @@ const UpdateStepRolloutPolicy = ({ isReadOnly }: { isReadOnly: boolean }) => {
variant="link"
icon={<MinusCircleIcon />}
iconPosition="start"
onClick={() => remove(index)}
onClick={() => arrayHelpers.remove(index)}
isDisabled={batches.length === 1}
/>
</SplitItem>
Expand All @@ -180,7 +180,7 @@ const UpdateStepRolloutPolicy = ({ isReadOnly }: { isReadOnly: boolean }) => {
icon={<PlusCircleIcon />}
iconPosition="start"
onClick={() => {
push(getEmptyInitializedBatch());
arrayHelpers.push(getEmptyInitializedBatch());
}}
>
{t('Add batch')}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,19 @@ const CreateResourceSyncsForm = () => {

return (
<FieldArray name="resourceSyncs">
{({ remove, push }) => (
{(arrayHelpers) => (
<>
{values.resourceSyncs.map((resourceSync, index) => (
<React.Fragment key={index}>
<CreateResourceSyncForm rs={resourceSync} index={index} />
{values.resourceSyncs.length > 1 && (
<FormGroup isInline>
<Button variant="link" icon={<MinusCircleIcon />} iconPosition="left" onClick={() => remove(index)}>
<Button
variant="link"
icon={<MinusCircleIcon />}
iconPosition="left"
onClick={() => arrayHelpers.remove(index)}
>
{t('Remove resource sync')}
</Button>
</FormGroup>
Expand All @@ -76,7 +81,7 @@ const CreateResourceSyncsForm = () => {
variant="link"
icon={<PlusCircleIcon />}
iconPosition="left"
onClick={() => push({ name: '', path: '', targetRevision: '' } as ResourceSyncFormValue)}
onClick={() => arrayHelpers.push({ name: '', path: '', targetRevision: '' } as ResourceSyncFormValue)}
>
{t('Add another resource sync')}
</Button>
Expand Down
Loading