Skip to content
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

Jump to bottom

Cu 9cdkq8 crear descriptor de elementos bpmn de arkon #44

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open

Cu 9cdkq8 crear descriptor de elementos bpmn de arkon #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
0223fde
Changing arkonElements definition name
JavierMolinaH Jul 8, 2020
1894de7
Merge branch 'develop' into CU-92ecyx_Duplicar-elemento-Task-para-Val…
JavierMolinaH Jul 8, 2020
04921ff
Move "arkon:validationType" to extensionElements
JavierMolinaH Jul 9, 2020
184eba8
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 9, 2020
305fc17
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 9, 2020
4c8eae4
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 9, 2020
f6fdd73
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 9, 2020
3f43594
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 10, 2020
0165ccf
Merge branch 'CU-8gf0x2_Notificación---package' into CU-92ecyx_Duplic…
JavierMolinaH Jul 10, 2020
aa8bbe4
Fix custom icon bug in palette tool
JavierMolinaH Jul 10, 2020
0fbf5bb
Adding arkon definition
JavierMolinaH Jul 11, 2020
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
5 changes: 5 additions & 0 deletions src/bpmn-font/css/bpmn.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,11 @@
content: '\e86f';
}

.bpmn-icon-script-task-validation-palette:before {
font-family: 'Material Icons';
content: '\e86f';
}

.bpmn-icon-user-task-validation:before {
font-family: 'Material Icons';
content: '\e3bd';
Expand Down
4 changes: 2 additions & 2 deletions src/components/Bpmn/Bpmn.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import ActionButton from './components/ActionButton'

import { BpmnType, RemoveCustomTaskEntryType } from './Bpmn.types'
import { findLateralPadEntries, removeElementsByClass } from './utils'
import arkonExtension from './resources/arkon.json'
import arkon from './resources/arkon.json'

import '../../styles/index.css'
import '../../bpmn-font/css/bpmn-embedded.css'
Expand Down Expand Up @@ -211,7 +211,7 @@ const Bpmn: FC<BpmnType> = ({
moddleExtensions: {
...moddleExtensions,
camunda: camundaModdleDescriptor,
arkonElements: arkonExtension
arkon
},
propertiesPanel: {
parent: '#properties-panel'
Expand Down
2 changes: 1 addition & 1 deletion src/components/Bpmn/Custom/CustomPalette.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export default class CustomPalette {
return {
'append.script-validation-task': {
group: 'activity',
className: `${customPadClassNames[5]} script-task-validation-label`,
className: `${customPadClassNames[5]}-palette script-task-validation-label`,
title: translate('Append Script Validation Task'),
action: {
click: appendServiceTask(SCRIPT_VALIDATION_TASK_TEXT),
Expand Down
207 changes: 205 additions & 2 deletions src/components/Bpmn/resources/arkon.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,209 @@
},
"types": [
{
"name": "Validation",
"name": "Groups",
"superClass": ["Element"],
"meta": {
"allowedIn": ["bpmn:ExtensionElements"]
},
"properties": [
{
"name": "group",
"type": "Group",
"isMany": true
}
]
},
{
"name": "Group",
"superClass": ["Element"],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
}
]
},
{
"name": "Fields",
"superClass": ["Element"],
"meta": {
"allowedIn": ["bpmn:ExtensionElements"]
},
"properties": [
{
"name": "field",
"type": "Field",
"isMany": true
}
]
},
{
"name": "Field",
"superClass": ["Element"],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
},
{
"name": "datasetId",
"type": "String",
"isAttr": true
},
{
"name": "name",
"type": "String",
"isAttr": true
},
{
"name": "fieldType",
"type": "String",
"isAttr": true
}
]
},
{
"name": "Task",
"superClass": ["Element"],
"meta": {
"allowedIn": ["bpmn:UserTask", "bpmn:ScriptTask", "bpmn:ExtensionElements"]
},
"properties": [
{
"name": "views",
"type": "Views"
}
]
},
{
"name": "Views",
"superClass": ["Element"],
"properties": [
{
"name": "view",
"type": "View",
"isMany": true
}
]
},
{
"name": "View",
"superClass": ["Element"],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
},
{
"name": "order",
"type": "Integer",
"isAttr": true
},
{
"name": "input",
"type": "Input",
"isMany": true
}
]
},
{
"name": "Input",
"superClass": ["Element"],
"properties": [
{
"name": "id",
"type": "String",
"isAttr": true
},
{
"name": "order",
"type": "Integer",
"isAttr": true
},
{
"name": "width",
"type": "String",
"isAttr": true
},
{
"name": "arkonFieldRef",
"type": "String",
"isAttr": true
},
{
"name": "label",
"type": "String",
"isAttr": true
},
{
"name": "inputType",
"type": "String",
"isAttr": true
},
{
"name": "defaultValue",
"type": "String",
"isAttr": true
},
{
"name": "placeholder",
"type": "String",
"isAttr": true
},
{
"name": "isRequired",
"type": "String",
"isAttr": true
},
{
"name": "isEnabled",
"type": "String",
"isAttr": true
},
{
"name": "helperText",
"type": "String",
"isAttr": true
},
{
"name": "script",
"type": "String",
"isAttr": true
},
{
"name": "dataSource",
"type": "DataSource",
"isMany": false
}
]
},
{
"name": "DataSource",
"superClass": ["Element"],
"properties": [
{
"name": "datasetId",
"type": "String",
"isAttr": true
},
{
"name": "valueField",
"type": "String",
"isAttr": true
},
{
"name": "displayField",
"type": "String",
"isAttr": true
}
]
},
{
"name": "ValidationType",
"extends": ["bpmn:ExtensionElements"],
"properties": [
{
Expand All @@ -17,5 +219,6 @@
}
]
}
]
],
"associations": []
}
4 changes: 4 additions & 0 deletions src/styles/index.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,10 @@ ul.bpp-properties-tabs-links > li.bpp-active a {
color: #2ac4c1 !important;
}

.bpmn-icon-script-task-validation-palette.script-task-validation-label {
color: #2ac4c1 !important;
}

.bpmn-icon-user-task-validation.user-task-validation-label {
color: #fbb344 !important;
}
4 changes: 4 additions & 0 deletions src/styles/index.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@
color: #2ac4c1 !important;
}

.bpmn-icon-script-task-validation-palette.script-task-validation-label {
color: #2ac4c1 !important;
}

.bpmn-icon-user-task-validation.user-task-validation-label {
color: #fbb344 !important;
}