status-im
/
spiff-arena
mirror of https://github.com/status-im/spiff-arena.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

process model cypress tests are passing w/ burnettk

This commit is contained in:
jasquat 2022-11-04 12:48:05 -04:00
parent 8a7a7f3de2
commit 5b2264b7f8
6 changed files with 47 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
spiffworkflow-frontend/cypress/e2e/process_models.cy.js
View File

@ -99,7 +99,7 @@ describe('process-models', () => {
cy.contains(/^Process Model File$/);
// Some reason, cypress evals json strings so we have to escape it it with '{{}'
cy.get('.view-line').type('{{} "test_key": "test_value" }');
cy.contains('Save').click();
cy.getBySel('file-save-button').click();
cy.get('input[name=file_name]').type(jsonFileName);
cy.contains('Save Changes').click();
cy.contains(`Process Model File: ${jsonFileName}`);
@ -168,12 +168,8 @@ describe('process-models', () => {
});
it('can allow searching for model', () => {
cy.get('[name=process-model-selection]').click();
cy.get('[name=process-model-selection]').type('model-3');
cy.get(
`[aria-label="acceptance-tests-group-one/acceptance-tests-model-3"]`
).click();
cy.contains('Process Instances').click();
cy.getBySel('process-model-selection').click().type('model-3');
cy.contains('acceptance-tests-group-one/acceptance-tests-model-3').click();
cy.contains('List').click();
});
});

21
spiffworkflow-frontend/src/components/ButtonWithConfirmation.tsx
View File

@ -45,30 +45,11 @@ export default function ButtonWithConfirmation({
onRequestSubmit={handleConfirmation}
/>
);
// return (
// <Modal
// show={showConfirmationPrompt}
// onHide={handleConfirmationPromptCancel}
// >
// <Modal.Header closeButton>
// <Modal.Title>{title}</Modal.Title>
// </Modal.Header>
// {modalBodyElement()}
// <Modal.Footer>
// <Button variant="secondary" onClick={handleConfirmationPromptCancel}>
// Cancel
// </Button>
// <Button variant="primary" onClick={handleConfirmation}>
// {confirmButtonLabel}
// </Button>
// </Modal.Footer>
// </Modal>
// );
};
return (
<>
<Button onClick={handleShowConfirmationPrompt} variant="danger">
<Button onClick={handleShowConfirmationPrompt} kind="danger">
{buttonLabel}
</Button>
{confirmationDialog()}

1
spiffworkflow-frontend/src/components/ProcessModelSearch.tsx
View File

@ -29,6 +29,7 @@ export default function ProcessModelSearch({
<ComboBox
onChange={onChange}
id="process-model-select"
data-qa="process-model-selection"
items={processModels}
itemToString={(processModel: ProcessModel) => {
if (processModel) {

3
spiffworkflow-frontend/src/components/ReactDiagramEditor.tsx
View File

@ -18,7 +18,8 @@ import {
} from 'dmn-js-properties-panel';
import React, { useRef, useEffect, useState } from 'react';
import Button from 'react-bootstrap/Button';
// @ts-ignore
import { Button } from '@carbon/react';
import 'bpmn-js/dist/assets/diagram-js.css';
import 'bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';

44
spiffworkflow-frontend/src/routes/ProcessModelEditDiagram.tsx
View File

@ -194,31 +194,25 @@ export default function ProcessModelEditDiagram() {
const newFileNameBox = () => {
const fileExtension = `.${searchParams.get('file_type')}`;
return (
<Modal show={showFileNameEditor} onHide={handleFileNameCancel}>
<Modal.Header closeButton>
<Modal.Title>Process Model File Name</Modal.Title>
</Modal.Header>
<form onSubmit={handleFileNameSave}>
<label>File Name:</label>
<span>
<input
name="file_name"
type="text"
value={newFileName}
onChange={(e) => setNewFileName(e.target.value)}
autoFocus
/>
{fileExtension}
</span>
<Modal.Footer>
<Button variant="secondary" onClick={handleFileNameCancel}>
Cancel
</Button>
<Button variant="primary" type="submit">
Save Changes
</Button>
</Modal.Footer>
</form>
<Modal
open={showFileNameEditor}
modalHeading="Processs Model File Name"
primaryButtonText="Save Changes"
secondaryButtonText="Cancel"
onSecondarySubmit={handleFileNameCancel}
onRequestSubmit={handleFileNameSave}
>
<label>File Name:</label>
<span>
<input
name="file_name"
type="text"
value={newFileName}
onChange={(e) => setNewFileName(e.target.value)}
autoFocus
/>
{fileExtension}
</span>
</Modal>
);
};

46
spiffworkflow-frontend/src/routes/ReactFormEditor.tsx
View File

@ -119,31 +119,25 @@ export default function ReactFormEditor() {
const newFileNameBox = () => {
return (
<Modal show={showFileNameEditor} onHide={handleFileNameCancel}>
<Modal.Header closeButton>
<Modal.Title>Process Model File Name</Modal.Title>
</Modal.Header>
<form onSubmit={handleFileNameSave}>
<label>File Name:</label>
<span>
<input
name="file_name"
type="text"
value={newFileName}
onChange={(e) => setNewFileName(e.target.value)}
autoFocus
/>
.{fileExtension}
</span>
<Modal.Footer>
<Button variant="secondary" onClick={handleFileNameCancel}>
Cancel
</Button>
<Button variant="primary" type="submit">
Save Changes
</Button>
</Modal.Footer>
</form>
<Modal
open={showFileNameEditor}
modalHeading="Processs Model File Name"
primaryButtonText="Save Changes"
secondaryButtonText="Cancel"
onSecondarySubmit={handleFileNameCancel}
onRequestSubmit={handleFileNameSave}
>
<label>File Name:</label>
<span>
<input
name="file_name"
type="text"
value={newFileName}
onChange={(e) => setNewFileName(e.target.value)}
autoFocus
/>
{fileExtension}
</span>
</Modal>
);
};
@ -161,7 +155,7 @@ export default function ReactFormEditor() {
{processModelFile ? `: ${(processModelFile as any).name}` : ''}
</h2>
{newFileNameBox()}
<Button onClick={saveFile} variant="danger">
<Button onClick={saveFile} variant="danger" data-qa="file-save-button">
Save
</Button>
{params.file_name ? (