sartography/cr-connect-bpmn
1
0
Fork 0
mirror of https://github.com/sartography/cr-connect-bpmn.git synced 2025-02-02 11:56:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #51 from sartography/dev

Browse Source 
Dev --> Testing
This commit is contained in:
Aaron Louie 2020-08-14 11:38:38 -04:00 committed by GitHub
commit 6a89f3a811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -13,7 +13,9 @@ services:
before_install: before_install:
- | - |
if [[ $TRAVIS_BRANCH =~ ^(dev|testing|demo|training|staging|rrt\/.*)$ ]]; then if [[ $TRAVIS_BRANCH =~ ^(feature\/.*)$ ]]; then
export E2E_TAG="dev"
elif [[ $TRAVIS_BRANCH =~ ^(dev|testing|demo|training|staging|rrt\/.*)$ ]]; then
export E2E_TAG="${TRAVIS_BRANCH//\//_}" export E2E_TAG="${TRAVIS_BRANCH//\//_}"
else else
export E2E_TAG="latest" export E2E_TAG="latest"

6
package-lock.json generated
View File

@ -12050,9 +12050,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
}, },
"sartography-workflow-lib": { "sartography-workflow-lib": {
"version": "0.0.342", "version": "0.0.376",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.342.tgz", "resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.376.tgz",
"integrity": "sha512-cNW0INFMuN7lFwn69mjWiY9xvv+mIMLpyUzNYt7ZYifPIPLCdt4MU28wZxYvWfTjWC6kY+c+8hovgY56NFpwyg==" "integrity": "sha512-TRL0mBnCyX9WRX/IB+Lt/xj/Q81qMKX0aJZ6arpEibDM68bXABhuSDKqzRZIV4WdZ4iOtXZaJAEE33aFimeOUw=="
}, },
"sass": { "sass": {
"version": "1.26.3", "version": "1.26.3",

2
package.json
View File

@ -52,7 +52,7 @@
"ngx-file-drop": "^8.0.8", "ngx-file-drop": "^8.0.8",
"ngx-markdown": "^9.1.1", "ngx-markdown": "^9.1.1",
"rxjs": "~6.5.4", "rxjs": "~6.5.4",
"sartography-workflow-lib": "0.0.342", "sartography-workflow-lib": "0.0.376",
"tslib": "^1.13.0", "tslib": "^1.13.0",
"uuid": "^7.0.2", "uuid": "^7.0.2",
"zone.js": "^0.10.3" "zone.js": "^0.10.3"

17
src/app/diagram/diagram.component.ts
View File

@ -63,13 +63,13 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
onTouched() { onTouched() {
} }
initializeModeler(diagramType: FileType) { initializeModeler(diagramType: FileType): DmnModeler | BpmnModeler {
this.clearElements(); this.clearElements();
if (diagramType === FileType.DMN) { if (diagramType === FileType.DMN) {
this.initializeDMNModeler(); return this.initializeDMNModeler() as DmnModeler;
} else { } else {
this.initializeBPMNModeler(); return this.initializeBPMNModeler() as BpmnModeler;
} }
} }
@ -103,7 +103,7 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
openDiagram(xml?: string, diagramType?: FileType) { openDiagram(xml?: string, diagramType?: FileType) {
this.diagramType = diagramType || getDiagramTypeFromXml(xml); this.diagramType = diagramType || getDiagramTypeFromXml(xml);
this.xml = xml; this.xml = xml;
this.initializeModeler(diagramType); const modeler = this.initializeModeler(diagramType);
return this.zone.run(() => { return this.zone.run(() => {
if (!xml) { if (!xml) {
@ -111,6 +111,7 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
xml = defaultXml.replace(/REPLACE_ME/gi, () => this.getRandomString(7)); xml = defaultXml.replace(/REPLACE_ME/gi, () => this.getRandomString(7));
} }
// Add an arbitrary string to get the save button to enable
this.modeler.importXML(xml, (e, w) => this.onImport(e, w)); this.modeler.importXML(xml, (e, w) => this.onImport(e, w));
}); });
} }
@ -180,7 +181,7 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
}); });
} }
private initializeBPMNModeler() { private initializeBPMNModeler(): BpmnModeler {
this.modeler = new BpmnModeler({ this.modeler = new BpmnModeler({
container: this.containerRef.nativeElement, container: this.containerRef.nativeElement,
propertiesPanel: { propertiesPanel: {
@ -202,9 +203,11 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
}); });
} }
}); });
return this.modeler as BpmnModeler;
} }
private initializeDMNModeler() { private initializeDMNModeler(): DmnModeler {
this.modeler = new DmnModeler({ this.modeler = new DmnModeler({
container: this.containerRef.nativeElement, container: this.containerRef.nativeElement,
drd: { drd: {
@ -244,6 +247,8 @@ export class DiagramComponent implements ControlValueAccessor, AfterViewInit {
}); });
} }
}); });
return this.modeler as DmnModeler;
} }
private clearElements() { private clearElements() {

2
src/app/modeler/modeler.component.ts
View File

@ -92,7 +92,7 @@ export class ModelerComponent implements AfterViewInit {
this.importError = error; this.importError = error;
this.importWarnings = warnings; this.importWarnings = warnings;
this.draftXml = this.xml; this.draftXml = this.xml + ' ';
} }
onSubmitFileToOpen() { onSubmitFileToOpen() {