Skip to content
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

Jump to bottom

Bug 1907890: Fix to show correct alert when required in pipeline parameters and resources forms #7486

Merged
merged 1 commit into from
Dec 16, 2020
Merged

Bug 1907890: Fix to show correct alert when required in pipeline parameters and resources forms #7486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 2 additions & 1 deletion frontend/packages/pipelines-plugin/locales/en/pipelines-plugin.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@
"No parameters are associated with this pipeline.": "No parameters are associated with this pipeline.",
"Description": "Description",
"Default value": "Default value",
"Save": "Save",
"Reload": "Reload",
"Add Pipeline resource": "Add Pipeline resource",
"No resources are associated with this pipeline.": "No resources are associated with this pipeline.",
"Resource type": "Resource type",
Expand Down Expand Up @@ -109,7 +111,6 @@
"Navigate back to the": "Navigate back to the",
"Pipelines page": "Pipelines page",
"Pipeline builder": "Pipeline builder",
"Save": "Save",
"Create": "Create",
"Cancel": "Cancel",
"Add parameters": "Add parameters",
Expand Down
11 changes: 8 additions & 3 deletions ...ges/pipelines-plugin/src/components/pipelines/detail-page-tabs/PipelineParametersForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as React from 'react';
import * as _ from 'lodash';
import { Form } from '@patternfly/react-core';
import { FormikProps, FormikValues, getIn } from 'formik';
import { useTranslation } from 'react-i18next';
import { Form } from '@patternfly/react-core';
import { useAccessReview } from '@console/internal/components/utils';
import { FormFooter } from '@console/shared';
import PipelineParameters from './PipelineParameters';
Expand All @@ -25,6 +26,8 @@ const PipelineParametersForm: React.FC<PipelineParametersFormProps> = ({
namespace,
verb: 'update',
});
const { t } = useTranslation();
const disableSubmit = !dirty || !_.isEmpty(_.compact(getIn(errors, 'parameters')));
return (
<Form onSubmit={handleSubmit}>
<div className="co-m-pane__form">
Expand All @@ -36,8 +39,10 @@ const PipelineParametersForm: React.FC<PipelineParametersFormProps> = ({
isSubmitting={isSubmitting}
errorMessage={status && status.submitError}
successMessage={status && !dirty && status.success}
disableSubmit={!dirty || !_.isEmpty(_.compact(getIn(errors, 'parameters')))}
showAlert={dirty}
disableSubmit={disableSubmit}
showAlert={!disableSubmit}
submitLabel={t('pipelines-plugin~Save')}
resetLabel={t('pipelines-plugin~Reload')}
/>
)}
</div>
Expand Down
11 changes: 8 additions & 3 deletions ...ages/pipelines-plugin/src/components/pipelines/detail-page-tabs/PipelineResourcesForm.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import * as React from 'react';
import * as _ from 'lodash';
import { Form } from '@patternfly/react-core';
import { FormikProps, FormikValues, getIn } from 'formik';
import { useTranslation } from 'react-i18next';
import { Form } from '@patternfly/react-core';
import { useAccessReview } from '@console/internal/components/utils';
import { FormFooter } from '@console/shared';
import PipelineResources from './PipelineResources';
Expand All @@ -25,6 +26,8 @@ const PipelineResourcesForm: React.FC<PipelineResourcesFormProps> = ({
namespace,
verb: 'update',
});
const { t } = useTranslation();
const disableSubmit = !dirty || !_.isEmpty(_.compact(getIn(errors, 'resources')));
return (
<Form onSubmit={handleSubmit}>
<div className="co-m-pane__form">
Expand All @@ -36,8 +39,10 @@ const PipelineResourcesForm: React.FC<PipelineResourcesFormProps> = ({
isSubmitting={isSubmitting}
errorMessage={status && status.submitError}
successMessage={status && !dirty && status.success}
disableSubmit={!dirty || !_.isEmpty(_.compact(getIn(errors, 'resources')))}
showAlert={dirty}
disableSubmit={disableSubmit}
showAlert={!disableSubmit}
submitLabel={t('pipelines-plugin~Save')}
resetLabel={t('pipelines-plugin~Reload')}
/>
)}
</div>
Expand Down