Skip to content

Revert "Toggle task compensation and loop markers" #1296

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vehikl-jacare merged 1 commit into from
Dec 9, 2020
Merged

Revert "Toggle task compensation and loop markers" #1296

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"check-peer-deps": "npm ls --depth=0",
"posttest": "npm run report:combined",
"test-unit": "JEST_JUNIT_OUTPUT_DIR=test_summary_reports/jest/ vue-cli-service test:unit --ci --runInBand --reporters=default --reporters=jest-junit",
"test-ci": "TZ=UTC vue-cli-service test:e2e --mode test --headless --browser chrome -- --reporter mocha-junit-reporter --reporter-options mochaFile=reports/mocha/test-results.xml",
"test-ci": "TZ=UTC vue-cli-service test:e2e --spec tests/e2e/specs/Modeler.spec.js --mode test --headless --browser chrome --reporter mocha-junit-reporter --reporter-options mochaFile=test_summary_reports/mocha/test-results.xml",
"mkdir:reports": "mkdir reports || true",
"precopy:reports": "npm run mkdir:reports",
"copy:reports": "cp cypress-coverage/coverage-final.json reports/from-cypress.json && cp jest-coverage/coverage-final.json reports/from-jest.json",
Expand Down
16 changes: 7 additions & 9 deletions src/components/inspectors/InspectorPanel.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,15 +181,13 @@ export default {

const type = this.highlightedNode && this.highlightedNode.type;

const defaultDataTransform = (node) => Object.entries(node.definition).reduce((data, [key, value]) => {
data[key] = value;

return data;
}, {});

this.data = type && this.nodeRegistry[type].inspectorData
? this.nodeRegistry[type].inspectorData(this.highlightedNode, defaultDataTransform)
: defaultDataTransform(this.highlightedNode);
? this.nodeRegistry[type].inspectorData(this.highlightedNode)
: Object.entries(this.highlightedNode.definition).reduce((data, [key, value]) => {
data[key] = value;

return data;
}, {});
},
isSequenceFlow(type) {
return type === sequenceFlowId;
Expand All @@ -201,7 +199,7 @@ export default {
return definition.targetRef.$type === 'bpmn:CallActivity';
},
customInspectorHandler(value) {
return this.nodeRegistry[this.highlightedNode.type].inspectorHandler(value, this.highlightedNode, this.setNodeProp, this.moddle, this.definitions, this.defaultInspectorHandler);
return this.nodeRegistry[this.highlightedNode.type].inspectorHandler(value, this.highlightedNode, this.setNodeProp, this.moddle, this.definitions);
},
processNodeInspectorHandler(value) {
return this.defaultInspectorHandler(omit(value, ['artifacts', 'flowElements', 'laneSets']));
Expand Down
48 changes: 0 additions & 48 deletions src/components/inspectors/MarkerFlags.vue
View file
Open in desktop

This file was deleted.

35 changes: 0 additions & 35 deletions src/components/inspectors/advancedAccordionConfigWithMarkerFlags.js
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion src/components/inspectors/process.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-process',
name: 'inspector-accordion',
},
items: [
{
Expand Down
7 changes: 3 additions & 4 deletions src/components/modeler/Modeler.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,7 @@ import { id as laneId } from '../nodes/poolLane';
import { id as sequenceFlowId } from '../nodes/sequenceFlow';
import { id as associationId } from '../nodes/association';
import { id as messageFlowId } from '../nodes/messageFlow';
import { id as dataOutputAssociationFlowId } from '../nodes/dataOutputAssociation/config';
import { id as dataInputAssociationFlowId } from '../nodes/dataInputAssociation/config';
import { id as dataAssociationFlowId } from '../nodes/dataOutputAssociation';

import PaperManager from '../paperManager';
import registerInspectorExtension from '@/components/InspectorExtensionManager';
Expand Down Expand Up @@ -432,7 +431,7 @@ export default {

types.forEach(bpmnType => {
if (!this.parsers[bpmnType]) {
this.parsers[bpmnType] = { custom: [], implementation: [], default: []};
this.parsers[bpmnType] = { custom: [], implementation: [], default: [] };
}

if (customParser) {
Expand Down Expand Up @@ -748,7 +747,7 @@ export default {
store.commit('addNode', node);
this.poolTarget = null;

if ([sequenceFlowId, laneId, associationId, messageFlowId, dataOutputAssociationFlowId, dataInputAssociationFlowId].includes(node.type)) {
if ([sequenceFlowId, laneId, associationId, messageFlowId, dataAssociationFlowId].includes(node.type)) {
return;
}

Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/association/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-association',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/baseStartEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-start-event',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/boundaryEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-boundary-event',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/boundaryTimerEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ export default merge(cloneDeep(boundaryEventConfig), {
config: {
label: 'Timing Control',
icon: 'clock',
name: 'inspector-accordion-boundary-timer-event',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/dataInputAssociation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-data-input-association',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/dataObject/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-data-object',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/dataOutputAssociation/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-data-output-association',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/dataStore/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-data-store',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/endEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-end-event',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/eventBasedGateway/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-event-based-gateway',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/exclusiveGateway/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-exlcusive-gateway',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/gateway/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-gateway',
name: 'inspector-accordion',
},
items: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/components/nodes/inclusiveGateway/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-inclusive-gateway-config',
name: 'inspector-accordion',
},
items: [
{
Expand All @@ -55,7 +55,7 @@ export default {
initiallyOpen: false,
label: 'Advanced',
icon: 'cogs',
name: 'inspector-accordion-inclusive-gateway-advanced',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/intermediateEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-intermediate-gateway-config',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/intermediateMessageEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-intermediate-message-event',
name: 'inspector-accordion',
},
items: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/components/nodes/intermediateTimerEvent/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-intermediate-timer-config',
name: 'inspector-accordion',
},
items: [
{
Expand All @@ -107,7 +107,7 @@ export default {
config: {
label: 'Timing Control',
icon: 'clock',
name: 'inspector-accordion-intermediate-timer-event-timing-control',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/manualTask/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-manual-task',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/messageFlow/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-message-flow',
name: 'inspector-accordion',
},
items: [
{
Expand Down
4 changes: 2 additions & 2 deletions src/components/nodes/parallelGateway/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-parallel-gateway-config',
name: 'inspector-accordion',
},
items: [
{
Expand All @@ -52,7 +52,7 @@ export default {
initiallyOpen: false,
label: 'Advanced',
icon: 'cogs',
name: 'inspector-accordion-parallel-gateway-direction',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/pool/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-pool',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/poolLane/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-pool-lane',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/scriptTask/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-script-task',
name: 'inspector-accordion',
},
items: [
{
Expand Down
2 changes: 1 addition & 1 deletion src/components/nodes/sequenceFlow/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export default {
initiallyOpen: true,
label: 'Configuration',
icon: 'cog',
name: 'inspector-accordion-sequence-flow',
name: 'inspector-accordion',
},
items: [
{
Expand Down
Loading