-
Notifications
You must be signed in to change notification settings - Fork 357
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Transforms haml forms to react for Automate class
Tests added for Add and Edit of class form Hides bottom bar Adds cypress test to create, edit, reset and remove a class (WIP)) Updates cy tests to programatically create domain, namespace,etc Modified cypress tests
- Loading branch information
Showing
9 changed files
with
484 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
app/javascript/components/miq-ae-class/class-form.schema.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| import { componentTypes, validatorTypes } from '@@ddf'; | ||
| import { IsRequired } from '@data-driven-forms/carbon-component-mapper'; | ||
|
|
||
| const createSchema = (fqname) => ({ | ||
| fields: [ | ||
| { | ||
| component: componentTypes.TEXT_FIELD, | ||
| id: 'fqname', | ||
| name: 'fqname', | ||
| label: __('Fully Qualified Name'), | ||
| initialValue: fqname, | ||
| maxLength: 128, | ||
| validate: [{ type: validatorTypes.REQUIRED }], | ||
| isReadOnly: true, | ||
| }, | ||
| { | ||
| component: componentTypes.TEXT_FIELD, | ||
| id: 'name', | ||
| name: 'name', | ||
| label: __('Name'), | ||
| maxLength: 128, | ||
| validate: [{ type: validatorTypes.REQUIRED }], | ||
| isRequired: true, | ||
| }, | ||
| { | ||
| component: componentTypes.TEXT_FIELD, | ||
| id: 'display_name', | ||
| name: 'display_name', | ||
| label: __('Display Name'), | ||
| maxLength: 128, | ||
| }, | ||
| { | ||
| component: componentTypes.TEXT_FIELD, | ||
| id: 'description', | ||
| name: 'description', | ||
| label: __('Description'), | ||
| maxLength: 255, | ||
| }, | ||
| ], | ||
| }); | ||
|
|
||
| export default createSchema; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,173 @@ | ||
| import React, { useState, useEffect } from 'react'; | ||
| import { FormSpy } from '@data-driven-forms/react-form-renderer'; | ||
| import { Button } from 'carbon-components-react'; | ||
| import MiqFormRenderer, { useFormApi } from '@@ddf'; | ||
| import PropTypes from 'prop-types'; | ||
| import createSchema from './class-form.schema'; | ||
| import miqRedirectBack from '../../helpers/miq-redirect-back'; | ||
|
|
||
| const MiqAeClass = ({ classRecord, fqname }) => { | ||
| const [data, setData] = useState({ | ||
| isLoading: true, | ||
| initialValues: undefined, | ||
| }); | ||
|
|
||
| const isEdit = !!(classRecord && classRecord.id); | ||
|
|
||
| useEffect(() => { | ||
| if (isEdit) { | ||
| http.get(`/miq_ae_class/edit_class_record/${classRecord.id}/`).then((recordValues) => { | ||
| if (recordValues) { | ||
| setData({ ...data, isLoading: false, initialValues: recordValues }); | ||
| } | ||
| }); | ||
| } else { | ||
| const initialValues = { | ||
| fqname: fqname, | ||
| name: classRecord && classRecord.name, | ||
| display_name: classRecord && classRecord.display_name, | ||
| description: classRecord && classRecord.description | ||
| }; | ||
| setData({ ...data, isLoading: false, initialValues }); | ||
| } | ||
| }, [classRecord]); | ||
|
|
||
| const onSubmit = (values) => { | ||
| miqSparkleOn(); | ||
|
|
||
| const params = { | ||
| action: isEdit ? 'edit' : 'create', | ||
| name: values.name, | ||
| display_name: values.display_name, | ||
| description: values.description, | ||
| old_data: data.initialValues, | ||
| button: classRecord.id ? 'save' : 'add', | ||
| }; | ||
|
|
||
| const request = isEdit | ||
| ? http.post(`/miq_ae_class/class_update/${classRecord.id}`, params) | ||
| : http.post(`/miq_ae_class/class_update/`, params); | ||
|
|
||
| request | ||
| .then(() => { | ||
| const confirmation = isEdit ? __(`Class "${values.name}" was saved`) : __(`Class "${values.name}" was added`); | ||
| miqRedirectBack(sprintf(confirmation, values.name), 'success', '/miq_ae_class/explorer'); | ||
| }) | ||
| .catch(miqSparkleOff); | ||
| }; | ||
|
|
||
| const onCancel = () => { | ||
| const confirmation = classRecord.id ? __(`Edit of Class "${classRecord.name}" cancelled by the user`) | ||
| : __(`Add of new Class was cancelled by the user`); | ||
| const message = sprintf( | ||
| confirmation | ||
| ); | ||
| miqRedirectBack(message, 'warning', '/miq_ae_class/explorer'); | ||
| }; | ||
|
|
||
| return (!data.isLoading | ||
| ? ( | ||
| <div className="dialog-provision-form"> | ||
| <MiqFormRenderer | ||
| schema={createSchema(fqname)} | ||
| initialValues={data.initialValues} | ||
| onSubmit={onSubmit} | ||
| onCancel={onCancel} | ||
| canReset={!!classRecord.id} | ||
| validate={() => {}} | ||
| FormTemplate={(props) => <FormTemplate {...props} recId={classRecord.id} />} | ||
| /> | ||
| </div> | ||
| ) : null | ||
| ); | ||
| }; | ||
|
|
||
| const FormTemplate = ({ | ||
| formFields, recId, | ||
| }) => { | ||
| const { | ||
| handleSubmit, onReset, onCancel, getState, | ||
| } = useFormApi(); | ||
| const { valid, pristine } = getState(); | ||
| const submitLabel = !!recId ? __('Save') : __('Add'); | ||
| return ( | ||
| <form onSubmit={handleSubmit}> | ||
| {formFields} | ||
| <FormSpy> | ||
| {() => ( | ||
| <div className="custom-button-wrapper"> | ||
| { !recId | ||
| ? ( | ||
| <Button | ||
| disabled={!valid} | ||
| kind="primary" | ||
| className="btnRight" | ||
| type="submit" | ||
| variant="contained" | ||
| > | ||
| {submitLabel} | ||
| </Button> | ||
| ) : ( | ||
| <Button | ||
| disabled={!valid || pristine} | ||
| kind="primary" | ||
| className="btnRight" | ||
| type="submit" | ||
| variant="contained" | ||
| > | ||
| {submitLabel} | ||
| </Button> | ||
| )} | ||
| {!!recId | ||
| ? ( | ||
| <Button | ||
| disabled={pristine} | ||
| kind="secondary" | ||
| className="btnRight" | ||
| variant="contained" | ||
| onClick={onReset} | ||
| type="button" | ||
| > | ||
| { __('Reset')} | ||
| </Button> | ||
| ) : null} | ||
|
|
||
| <Button variant="contained" type="button" onClick={onCancel} kind="secondary"> | ||
| { __('Cancel')} | ||
| </Button> | ||
| </div> | ||
| )} | ||
| </FormSpy> | ||
| </form> | ||
| ); | ||
| }; | ||
|
|
||
| MiqAeClass.propTypes = { | ||
| classRecord: PropTypes.shape({ | ||
| id: PropTypes.number, | ||
| name: PropTypes.string, | ||
| display_name: PropTypes.string, | ||
| description: PropTypes.string, | ||
| }), | ||
| }; | ||
|
|
||
| MiqAeClass.defaultProps = { | ||
| classRecord: undefined, | ||
| }; | ||
|
|
||
| FormTemplate.propTypes = { | ||
| formFields: PropTypes.arrayOf( | ||
| PropTypes.shape({ id: PropTypes.number }), | ||
| PropTypes.shape({ name: PropTypes.string }), | ||
| PropTypes.shape({ display_name: PropTypes.string }), | ||
| PropTypes.shape({ description: PropTypes.string }), | ||
| ), | ||
| recId: PropTypes.number, | ||
| }; | ||
|
|
||
| FormTemplate.defaultProps = { | ||
| formFields: undefined, | ||
| recId: undefined, | ||
| }; | ||
|
|
||
| export default MiqAeClass; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
app/javascript/spec/miq-ae-class-form/__snapshots__/miq-ae-class-form.spec.js.snap
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| // Jest Snapshot v1, https://goo.gl/fbAQLP | ||
|
|
||
| exports[`MiqAeClass Form Component should render add class form correctly 1`] = `""`; | ||
|
|
||
| exports[`MiqAeClass Form Component should render edit class form correctly 1`] = `""`; |
Oops, something went wrong.