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

fixes issue with form switch for name-value-editor on eventSources #4918

Merged
merged 2 commits into from
Apr 6, 2020
Merged

fixes issue with form switch for name-value-editor on eventSources #4918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98a818f
fixes issue with form switch for name-value-editor on eventSources cr…
invincibleJai Apr 3, 2020
080facd
refactored and made use of async componenet in form itself
invincibleJai Apr 6, 2020
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
9 changes: 7 additions & 2 deletions frontend/packages/knative-plugin/src/components/add/event-sources/ApiServerSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import * as fuzzy from 'fuzzysearch';
import { useFormikContext, FormikValues } from 'formik';
import { FormGroup } from '@patternfly/react-core';
import { ServiceAccountModel } from '@console/internal/models';
import { NameValueEditor } from '@console/internal/components/utils/name-value-editor';
import { ResourceDropdownField, DropdownField, getFieldId } from '@console/shared';
import { AsyncComponent } from '@console/internal/components/utils/async';
import FormSection from '@console/dev-console/src/components/import/section/FormSection';

interface ApiServerSectionProps {
Expand Down Expand Up @@ -62,7 +62,12 @@ const ApiServerSection: React.FC<ApiServerSectionProps> = ({ namespace }) => {
return (
<FormSection title="ApiServerSource">
<FormGroup fieldId={fieldId} label="Resource" isRequired>
<NameValueEditor
<AsyncComponent
loader={() =>
import('@console/internal/components/utils/name-value-editor').then(
(c) => c.NameValueEditor,
)
}
nameValuePairs={nameValue}
valueString="kind"
nameString="apiVersion"
Expand Down
9 changes: 7 additions & 2 deletions frontend/packages/knative-plugin/src/components/add/event-sources/SinkBindingSection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import * as _ from 'lodash';
import { useFormikContext, FormikValues } from 'formik';
import { TextInputTypes, FormGroup } from '@patternfly/react-core';
import { InputField, getFieldId } from '@console/shared';
import { NameValueEditor } from '@console/internal/components/utils/name-value-editor';
import { AsyncComponent } from '@console/internal/components/utils/async';
import FormSection from '@console/dev-console/src/components/import/section/FormSection';

const SinkBindingSection: React.FC = () => {
Expand Down Expand Up @@ -47,7 +47,12 @@ const SinkBindingSection: React.FC = () => {
required
/>
<FormGroup fieldId={fieldId} label="Match Labels">
<NameValueEditor
<AsyncComponent
loader={() =>
import('@console/internal/components/utils/name-value-editor').then(
(c) => c.NameValueEditor,
)
}
nameValuePairs={nameValue}
valueString="Value"
nameString="Name"
Expand Down
4 changes: 2 additions & 2 deletions ...kages/knative-plugin/src/components/add/event-sources/__tests__/ApiServerSection.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import { shallow } from 'enzyme';
import { ResourceDropdownField } from '@console/shared';
import { NameValueEditor } from '@console/internal/components/utils/name-value-editor';
import FormSection from '@console/dev-console/src/components/import/section/FormSection';
import { AsyncComponent } from '@console/internal/components/utils/async';
import ApiServerSection from '../ApiServerSection';

jest.mock('formik', () => ({
Expand All @@ -26,7 +26,7 @@ describe('ApiServerSection', () => {

it('should render NameValueEditor', () => {
const wrapper = shallow(<ApiServerSection namespace="test-project" />);
const nameValueEditorField = wrapper.find(NameValueEditor);
const nameValueEditorField = wrapper.find(AsyncComponent);
expect(nameValueEditorField).toHaveLength(1);
expect(nameValueEditorField.props().nameString).toBe('apiVersion');
expect(nameValueEditorField.props().valueString).toBe('kind');
Expand Down
4 changes: 2 additions & 2 deletions ...ges/knative-plugin/src/components/add/event-sources/__tests__/SinkBindingSection.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import * as React from 'react';
import { shallow, ShallowWrapper } from 'enzyme';
import { InputField } from '@console/shared';
import { NameValueEditor } from '@console/internal/components/utils/name-value-editor';
import FormSection from '@console/dev-console/src/components/import/section/FormSection';
import { AsyncComponent } from '@console/internal/components/utils/async';
import SinkBindingSection from '../SinkBindingSection';

type SinkBindingSectionProps = React.ComponentProps<typeof SinkBindingSection>;
Expand Down Expand Up @@ -30,7 +30,7 @@ describe('SinkBindingSection', () => {
});

it('should render NameValueEditor', () => {
const nameValueEditorField = wrapper.find(NameValueEditor);
const nameValueEditorField = wrapper.find(AsyncComponent);
expect(nameValueEditorField).toHaveLength(1);
expect(nameValueEditorField.props().nameString).toBe('Name');
expect(nameValueEditorField.props().valueString).toBe('Value');
Expand Down