.sdc-modal {
.custom-modal-wrapper {
- padding: 35px 60px 20px 60px;
width: auto;
}
+ .form-custom-modal {
+ padding: 30px 35px 20px 35px;
+
+ .sdc-input {
+ margin-bottom: 15px;
+ }
+ }
+
}
.modal-action-bar {
display: flex;
justify-content: flex-end;
-
- button:first-child {
- margin-right: 2em;
- }
}
textarea.field-section.sdc-input__input {
display: flex;
flex-direction: column;
}
+
+ .custom-textarea {
+ resize: none;
+ }
}
#root {
height: 100%;
-}
\ No newline at end of file
+}
.overview-page {
- @include body-1-semibold;
+ @include body-1;
padding: 25px;
.overview-content {
const { closeCreateVersionModal } = this.props;
return (
<form onSubmit={this.handleSubmitForm}>
- <div className="new-version-page custom-modal-wrapper ">
- <Select
- dataObj={VERSION_LEVEL_LIST}
- selectedItem={VERSION_LEVEL_LIST[0].value}
- label={I18n.t('version.category')}
- disabled
- />
- <Description
- name="version-description"
- description={this.state.newVersion.description}
- dataTestId="new-version-description"
- onDataChange={this.versionDetailsChanged}
- />
- <div className="modal-action-bar">
+ <div className="new-version-page custom-modal-wrapper">
+ <div className="form-custom-modal">
+ <Select
+ dataObj={VERSION_LEVEL_LIST}
+ selectedItem={VERSION_LEVEL_LIST[0].value}
+ label={I18n.t('version.category')}
+ disabled
+ />
+ <Description
+ name="version-description"
+ description={this.state.newVersion.description}
+ dataTestId="new-version-description"
+ onDataChange={this.versionDetailsChanged}
+ />
+ </div>
+ <div className="modal-action-bar sdc-modal__footer">
<Button btnType="primary">
{I18n.t('buttons.createBtn')}
</Button>
onSubmit={[Function]}
>
<div
- className="new-version-page custom-modal-wrapper "
+ className="new-version-page custom-modal-wrapper"
>
<div
- className="select-wrapper version-selector sdc-input"
+ className="form-custom-modal"
>
- <label>
- category
- </label>
- <select
- className="inputinput-selector"
- data-test-id="vc-select-box"
- disabled={true}
- value={undefined}
+ <div
+ className="select-wrapper version-selector sdc-input"
>
- <option
- data-test-id="vc-option"
- value="2"
- >
- Major
- </option>
- <option
- data-test-id="vc-option"
- value="1"
+ <label>
+ category
+ </label>
+ <select
+ className="inputinput-selector"
+ data-test-id="vc-select-box"
+ disabled={true}
+ value={undefined}
>
- Minor
- </option>
- </select>
- </div>
- <div
- className="description-part"
- >
+ <option
+ data-test-id="vc-option"
+ value="2"
+ >
+ Major
+ </option>
+ <option
+ data-test-id="vc-option"
+ value="1"
+ >
+ Minor
+ </option>
+ </select>
+ </div>
<div
- className="sdc-input"
+ className="description-part"
>
<div
- className="sdc-input__label"
+ className="sdc-input"
>
- description
+ <div
+ className="sdc-input__label"
+ >
+ description
+ </div>
+ <textarea
+ className="custom-textarea field-section sdc-input__input"
+ data-test-id="new-version-description"
+ onChange={[Function]}
+ value={undefined}
+ />
</div>
- <textarea
- className="field-section sdc-input__input"
- data-test-id="new-version-description"
- onChange={[Function]}
- value={undefined}
- />
</div>
</div>
<div
- className="modal-action-bar"
+ className="modal-action-bar sdc-modal__footer"
>
<button
className="sdc-button sdc-button__primary "
*/
import { createSelector } from 'reselect';
+import { isEmpty } from 'lodash';
import { INPUTS } from 'features/version/inputOutput/inputOutputConstants';
[getInputOutput, getCurrent],
(inputOutput, current) => inputOutput.error[current]
);
+
+export const getErrorsInputOutput = createSelector(
+ getInputOutput,
+ ({ error }) => error
+);
+
+export const getInputErrors = createSelector(
+ getErrorsInputOutput,
+ ({ inputs }) =>
+ !isEmpty(inputs) &&
+ Boolean(inputs.alreadyExists.length || inputs.invalidCharacters.length)
+);
+
+export const getOutputErrors = createSelector(
+ getErrorsInputOutput,
+ ({ outputs }) =>
+ !isEmpty(outputs) &&
+ Boolean(
+ outputs.alreadyExists.length || outputs.invalidCharacters.length
+ )
+);
+
+export const getIOErrors = createSelector(
+ getInputErrors,
+ getOutputErrors,
+ (inputsErrors, outputsErrors) => inputsErrors || outputsErrors
+);
certifyVersionAction
} from 'features/version/versionController/versionControllerConstants';
import { workflowVersionFetchRequestedAction } from '../versionConstants';
+import { getIOErrors } from 'features/version/inputOutput/inputOutputSelectors';
function mapStateToProps(state) {
return {
versionsList: getSortedVersions(state),
savedParams: getSavedObjParams(state),
currentWorkflowVersion: state.currentVersion.general,
- versionState: state.currentVersion.general.state
+ versionState: state.currentVersion.general.state,
+ getIOErrors: getIOErrors(state)
};
}
workflowId: PropTypes.string,
versionState: PropTypes.string,
certifyVersion: PropTypes.func,
- changeVersion: PropTypes.func
+ changeVersion: PropTypes.func,
+ getIOErrors: PropTypes.bool
};
constructor(props) {
currentWorkflowVersion,
workflowName,
versionsList,
- versionState
+ versionState,
+ getIOErrors
} = this.props;
let isCertifyDisable =
versionState &&
onVersionSelectChange={this.versionChangeCallback}
/>
<ActionButtons
+ saveDisabled={isCertifyDisable || getIOErrors}
onSaveClick={this.sendSaveParamsToServer}
certifyDisabled={isCertifyDisable}
onCertifyClick={this.certifyVersion}
<div
className="svg-icon-wrapper bottom"
data-test-id="vc-save-btn"
- disabled={false}
+ disabled={undefined}
onClick={undefined}
>
<test-file-stub
} from 'features/version/inputOutput/inputOutputSelectors';
import { getVersionInfo } from 'features/version/general/generalSelectors';
-export const getVersionsList = state => state && state.workflow.versions;
export const getSavedObjParams = createSelector(
getOutputs,
getInputs,
const Separator = () => <div className="vc-separator" />;
const ActionButtons = props => {
- const { onSaveClick, certifyDisabled, onCertifyClick, onUndoClick } = props;
+ const {
+ onSaveClick,
+ certifyDisabled,
+ onCertifyClick,
+ onUndoClick,
+ saveDisabled
+ } = props;
return (
<div className="save-submit-cancel-container">
<div className="action-buttons">
dataTestId="vc-save-btn"
name="version-controller-save"
tooltipText={I18n.t('buttons.saveBtn')}
- disabled={false}
+ disabled={saveDisabled}
onClick={onSaveClick}
/>
<Separator />
onSaveClick: PropTypes.func,
certifyDisabled: PropTypes.bool,
onCertifyClick: PropTypes.func,
- onUndoClick: PropTypes.func
+ onUndoClick: PropTypes.func,
+ saveDisabled: PropTypes.bool
};
export default ActionButtons;
return (
<form onSubmit={handleSubmitForm}>
<div className="new-workflow-page custom-modal-wrapper">
- <Input
- name="workflowName"
- value={workflowName || ''}
- type="text"
- label={I18n.t('workflow.general.name')}
- onChange={val =>
- workflowInputChange({
- name: val
- })
- }
- isRequired
- />
- <Description
- value={workflowDescription || ''}
- label={I18n.t('workflow.general.description')}
- onDataChange={workflowInputChange}
- />
- <div className="modal-action-bar">
+ <div className="form-custom-modal">
+ <Input
+ name="workflowName"
+ value={workflowName || ''}
+ type="text"
+ label={I18n.t('workflow.general.name')}
+ onChange={val =>
+ workflowInputChange({
+ name: val
+ })
+ }
+ isRequired
+ />
+ <Description
+ value={workflowDescription || ''}
+ label={I18n.t('workflow.general.description')}
+ onDataChange={workflowInputChange}
+ />
+ </div>
+ <div className="modal-action-bar sdc-modal__footer">
<Button btnType="primary">
{I18n.t('buttons.createBtn')}
</Button>
className="new-workflow-page custom-modal-wrapper"
>
<div
- className="sdc-input "
+ className="form-custom-modal"
>
- <label
- className="sdc-input__label required"
- htmlFor="workflowName"
+ <div
+ className="sdc-input "
>
- name
- </label>
- <input
- className="sdc-input__input "
- data-test-id={undefined}
- disabled={false}
- id="workflowName"
- name="workflowName"
- onBlur={[Function]}
- onChange={[Function]}
- onKeyDown={[Function]}
- placeholder={undefined}
- readOnly={false}
- type="text"
- value=""
- />
- </div>
- <div
- className="description-part"
- >
+ <label
+ className="sdc-input__label required"
+ htmlFor="workflowName"
+ >
+ name
+ </label>
+ <input
+ className="sdc-input__input "
+ data-test-id={undefined}
+ disabled={false}
+ id="workflowName"
+ name="workflowName"
+ onBlur={[Function]}
+ onChange={[Function]}
+ onKeyDown={[Function]}
+ placeholder={undefined}
+ readOnly={false}
+ type="text"
+ value=""
+ />
+ </div>
<div
- className="sdc-input"
+ className="description-part"
>
<div
- className="sdc-input__label"
+ className="sdc-input"
>
- description
+ <div
+ className="sdc-input__label"
+ >
+ description
+ </div>
+ <textarea
+ className="custom-textarea field-section sdc-input__input"
+ data-test-id="description"
+ onChange={[Function]}
+ value={undefined}
+ />
</div>
- <textarea
- className="field-section sdc-input__input"
- data-test-id="description"
- onChange={[Function]}
- value={undefined}
- />
</div>
</div>
<div
- className="modal-action-bar"
+ className="modal-action-bar sdc-modal__footer"
>
<button
className="sdc-button sdc-button__primary "
description
</div>
<textarea
- className="field-section sdc-input__input"
+ className="custom-textarea field-section sdc-input__input"
data-test-id="description"
onChange={[Function]}
value="desc 1"
total: 2,
size: 0,
page: 0,
- results: [
+ items: [
{
id: '99adf5bc36764628b8018033d285b591',
name: '1.0',
expect(
overviewReducer([], versionListFetchAction(versionResponse))
- ).toEqual([...versionResponse.results]);
+ ).toEqual([...versionResponse.items]);
});
});
export default function overviewReducer(state = [], action) {
switch (action.type) {
case FETCH_VERSION_LIST:
- return [...action.payload.results];
+ return [...action.payload.items];
default:
return state;
}
onChange={event => {
onDataChange({ description: event.target.value });
}}
- className="field-section sdc-input__input"
+ className="custom-textarea field-section sdc-input__input"
/>
</div>
</div>
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-//import React from 'react';
import store from 'wfapp/store';
import { showErrorModalAction } from 'shared/modal/modalWrapperActions';
export default error => {
const errorData = {
title: error.statusText,
- body: error.responseText ? error.responseText : 'GENERIC ERROR'
+ body: error.data ? error.data : 'GENERIC ERROR'
};
store.dispatch(
showErrorModalAction({
Code Review / sdc / sdc-workflow-designer.git / commitdiff