Toggle task compensation and loop markers by vehikl-jacare · Pull Request #1280 · ProcessMaker/modeler

vehikl-jacare · 2020-12-01T16:03:33Z

This PR adds radio buttons for Task Loop Characteristics in the advanced inspector:

This produces the following bpmn:

<bpmn:task id="node_1" name="Form Task" pm:assignment="requester">
      <bpmn:standardLoopCharacteristics />
</bpmn:task>

It also adds a "For Compensation" checkbox to set the isForCompensation property on the task:

This produces the following bpmn:

<bpmn:task id="node_1" name="Form Task" isForCompensation="true" pm:assignment="requester" />

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

src/components/nodes/task/index.js

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

caleeli · 2020-12-02T16:24:06Z

I've do quick test. I found an issue when setting the task properties after changing the loop characteristics.

caleeli · 2020-12-02T16:44:41Z

Review inspector handler after loading:

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

This reverts commit 320767c.

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare

@caleeli We've addressed the loss of reactivity that you found, thanks for testing it

caleeli · 2020-12-04T21:37:47Z

@vehikl-jacare there is something more to check, it fails after you change focus.

caleeli · 2020-12-08T17:02:44Z

processmaker/id-required
    Element is missing ID

ID validation is triggered when a Loop characteristic is added to the task. ID is not required for LoopCharacteristics nodes.

vehikl-jacare · 2020-12-08T18:47:50Z

@caleeli The ID validation will need to be updated in the bpmnlint-plugin package. We've created a ticket for it in that repo: ProcessMaker/bpmnlint-plugin#7.

If there are no other issues this can be merged independent of that validation.

This reverts commit e36cde4.

vehikl-jacare and others added 16 commits November 27, 2020 11:36

WIP add marker flags control to tasks

34628e7

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

WIP: add task marker options in advanced inspector

62d373c

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

add custom data transform for task

4efa251

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

set some default values for markerFlags

6f7044f

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

remove compensation icon if isForCompensation is false

cdaadd2

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

cleanup compensation icon logic

f26c5d8

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

refactor watcher for compensation

125e4df

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

get standard loop characteristic to show up

802294c

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

unset loop icon

b44cda4

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

properly remove marker

d2c5440

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

sort the bottom center markers alphabetically

b433ab0

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

assert that bottom centre markers get sorted

41f76d0

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

did do the todo

86edac8

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

set the MarkerFlags radio values from the bpmn

c48a2d9

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

WIP: add e2e tests for adding task marker flags

9a7cfa8

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

add tests for task markers

1192d00

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare commented Dec 1, 2020

View reviewed changes

src/components/nodes/task/index.js Outdated Show resolved Hide resolved

src/components/nodes/task/index.js Outdated Show resolved Hide resolved

src/components/nodes/task/index.js Show resolved Hide resolved

vehikl-jacare and others added 3 commits December 1, 2020 11:17

Fix spacing

c2f4cc0

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

reword tests

99aafdf

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

fix failing test

b5ee459

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare and others added 3 commits December 2, 2020 14:54

add failing test

2de44f8

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

space

e105d32

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

remove .only

f4ff120

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare added the WIP Work in progress; do not merge yet. label Dec 2, 2020

vehikl-jacare and others added 4 commits December 3, 2020 10:45

fix watcher bug

cc0061c

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

fix setting props so they are reactive

83a26d1

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

Merge branch 'develop' into 1271-add-loop-characteristic-toggles

690ebcc

update data input and output association ids

7e3aae9

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare and others added 10 commits December 3, 2020 11:49

lint spacinig

536a750

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

fix null definitiion reference error

c9258af

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

Update ci test spec

1e48d3f

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

add test for no validation errors

1eb4345

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

update assertion as timer and name accordions are now linked

320767c

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

Revert "update assertion as timer and name accordions are now linked"

a76485f

This reverts commit 320767c.

rename inspector accordion names to be unique

c778035

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

fix unsetting definition value

2ee7f70

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

add test for unsetting loop characteristics

c2f7f7e

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

rename

99281af

Co-Authored-By: Justin Struk <10167488+JStruk@users.noreply.github.com> Co-Authored-By: Robert Komaromi <chipit24@users.noreply.github.com> Co-Authored-By: Gerrie Swart <johnblackspear@users.noreply.github.com>

vehikl-jacare commented Dec 4, 2020

View reviewed changes

vehikl-jacare removed the WIP Work in progress; do not merge yet. label Dec 4, 2020

vehikl-jacare added 2 commits December 7, 2020 10:16

refactor method so early return works without skipping other updates

5af7081

early return to remove one level of if block

d7fffb3

vehikl-jacare mentioned this pull request Dec 8, 2020

Ignore loop characteristics elements in the ID required rule ProcessMaker/bpmnlint-plugin#7

Open

caleeli self-requested a review December 9, 2020 12:46

caleeli approved these changes Dec 9, 2020

View reviewed changes

vehikl-jacare merged commit e36cde4 into develop Dec 9, 2020

vehikl-jacare deleted the 1271-add-loop-characteristic-toggles branch December 9, 2020 18:57

vehikl-jacare added a commit that referenced this pull request Dec 9, 2020

Revert "Toggle task compensation and loop markers (#1280)"

de35786

This reverts commit e36cde4.

vehikl-jacare mentioned this pull request Dec 9, 2020

Revert "Toggle task compensation and loop markers" #1296

Merged

vehikl-jacare added a commit that referenced this pull request Dec 9, 2020

Revert "Toggle task compensation and loop markers (#1280)" (#1296)

b249667

This reverts commit e36cde4.

vehikl-jacare mentioned this pull request Dec 9, 2020

Toggle task compensation and loop markers #1297

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Toggle task compensation and loop markers#1280

Toggle task compensation and loop markers#1280
vehikl-jacare merged 38 commits intodevelopfrom
1271-add-loop-characteristic-toggles

vehikl-jacare commented Dec 1, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

caleeli commented Dec 2, 2020

Uh oh!

caleeli commented Dec 2, 2020

Uh oh!

vehikl-jacare left a comment

Uh oh!

caleeli commented Dec 4, 2020

Uh oh!

caleeli commented Dec 8, 2020 •

edited

Loading

Uh oh!

vehikl-jacare commented Dec 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

vehikl-jacare commented Dec 1, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

caleeli commented Dec 2, 2020

Uh oh!

caleeli commented Dec 2, 2020

Uh oh!

vehikl-jacare left a comment

Choose a reason for hiding this comment

Uh oh!

caleeli commented Dec 4, 2020

Uh oh!

caleeli commented Dec 8, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vehikl-jacare commented Dec 8, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

caleeli commented Dec 8, 2020 •

edited

Loading