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

Rename Save as draft to Close, add tooltip (#246)

This commit is contained in:
jbirddog 2023-05-09 12:55:49 -04:00 committed by GitHub
parent 351ff8433d
commit e1ba08b83d
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
spiffworkflow-frontend/cypress/pilot/NDR_PP1/initiaterequest.cy.js
View File

@ -405,7 +405,7 @@ describe.only('Initiate a Request - Without Files', () => {
cy.get('#root_item_1_unit_price').type('4500'); cy.get('#root_item_1_unit_price').type('4500');
cy.get('button') cy.get('button')
.contains(/^Save as draft$/) .contains(/^Close$/)
.click(); .click();
//cy.get('button') //cy.get('button')
@ -505,7 +505,7 @@ describe.only('Initiate a Request - Without Files', () => {
cy.get('.cds--text-area__wrapper').find('#root').type('2021 Newest HP 17.3 inch FHD Laptop, AMD Ryzen 5 5500U 6core(Beat i7-1160G7, up to 4.0GHz),16GB RAM, 1TB PCIe SSD, Bluetooth 4.2, WiFi, HDMI, USB-A&C, Windows 10 S, w/Ghost Manta Accessories, Silver\nhttps://www.amazon.com/HP-i7-11G7-Bluetooth-Windows'); cy.get('.cds--text-area__wrapper').find('#root').type('2021 Newest HP 17.3 inch FHD Laptop, AMD Ryzen 5 5500U 6core(Beat i7-1160G7, up to 4.0GHz),16GB RAM, 1TB PCIe SSD, Bluetooth 4.2, WiFi, HDMI, USB-A&C, Windows 10 S, w/Ghost Manta Accessories, Silver\nhttps://www.amazon.com/HP-i7-11G7-Bluetooth-Windows');
cy.get('button') cy.get('button')
.contains(/^Save as draft$/) .contains(/^Close$/)
.click(); .click();
// cy.get('button') // cy.get('button')

11
spiffworkflow-frontend/src/routes/TaskShow.tsx
View File

@ -348,20 +348,21 @@ export default function TaskShow() {
if (task.state === 'READY') { if (task.state === 'READY') {
let submitButtonText = 'Submit'; let submitButtonText = 'Submit';
let saveAsDraftButton = null; let closeButton = null;
if (task.typename === 'ManualTask') { if (task.typename === 'ManualTask') {
submitButtonText = 'Continue'; submitButtonText = 'Continue';
} else if (task.typename === 'UserTask') { } else if (task.typename === 'UserTask') {
saveAsDraftButton = ( closeButton = (
<Button <Button
id="save-as-draft-button" id="close-button"
disabled={disabled} disabled={disabled}
kind="secondary" kind="secondary"
title="Save changes without submitting."
onClick={() => onClick={() =>
handleFormSubmit(currentFormObject, null, FormSubmitType.Draft) handleFormSubmit(currentFormObject, null, FormSubmitType.Draft)
} }
> >
Save as draft Close
</Button> </Button>
); );
} }
@ -370,7 +371,7 @@ export default function TaskShow() {
<Button type="submit" id="submit-button" disabled={disabled}> <Button type="submit" id="submit-button" disabled={disabled}>
{submitButtonText} {submitButtonText}
</Button> </Button>
{saveAsDraftButton} {closeButton}
<> <>
{task.signal_buttons.map((signal) => ( {task.signal_buttons.map((signal) => (
<Button <Button