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

Merge branch 'dev' into chore/bpmn-refactor-455

This commit is contained in:
alicia pritchett 2021-09-27 12:06:57 -04:00
parent 263edd9dd9 8e2b7c24a7
commit 0b10b808a9
9 changed files with 34 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
angular.json
View File

@ -39,6 +39,7 @@
"node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn.css",
"node_modules/bpmn-js/dist/assets/diagram-js.css",
"node_modules/dmn-js-properties-panel/dist/assets/dmn-js-properties-panel.css",
"node_modules/diagram-js-minimap/assets/diagram-js-minimap.css",
"node_modules/dmn-js/dist/assets/diagram-js.css",
"node_modules/dmn-js/dist/assets/dmn-font/css/dmn-codes.css",
"node_modules/dmn-js/dist/assets/dmn-font/css/dmn-embedded.css",

28
package-lock.json generated
View File

@ -28,7 +28,7 @@
"camunda-bpmn-moddle": "^5.1.2",
"camunda-dmn-moddle": "^1.1.0",
"diagram-js": "^7.3.0",
"diagram-js-code-editor": "^1.1.8",
"diagram-js-code-editor": "^1.1.85",
"diagram-js-minimap": "^2.0.4",
"dmn-js": "^11.0.1",
"dmn-js-properties-panel": "^0.6.1",
@ -43,7 +43,7 @@
"ngx-markdown": "^12.0.1",
"protractor": "^7.0.0",
"rxjs": "^6.5.3",
"sartography-workflow-lib": "^0.0.554",
"sartography-workflow-lib": "^0.0.563",
"tslib": "^2.3.0",
"uuid": "^8.3.2",
"zone.js": "^0.11.4"
@ -6915,9 +6915,9 @@
}
},
"node_modules/diagram-js-code-editor": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/diagram-js-code-editor/-/diagram-js-code-editor-1.1.8.tgz",
"integrity": "sha512-xaBd9B2Zq47SZ6Gr7xVp+aq/CmwnLLDb5aWuqP/KQ5LJD1TPYk1ch91bbgKavriFBi12LhRdMOtLfyx3QWPNGA==",
"version": "1.1.85",
"resolved": "https://registry.npmjs.org/diagram-js-code-editor/-/diagram-js-code-editor-1.1.85.tgz",
"integrity": "sha512-bc9/HYDr2boS7oL9+ikOtLLCrxn0Z/y6fWKjJwH8PGvjbNbSIqs+QdxFp/iO8w0OCzatA0lCpIx+/jh15qz0Zw==",
"dependencies": {
"@popperjs/core": "^2.9.2",
"ace-builds": "^1.4.12",
@ -17413,9 +17413,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"node_modules/sartography-workflow-lib": {
"version": "0.0.554",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.554.tgz",
"integrity": "sha512-XuH7yFtLBm+1gxFjxiDl5po3A44yWVgrem38XPGbFQQ+fbAzqNBBoxQuXnDlkwckyU04Om1ZHktEVAsQGcCEqg==",
"version": "0.0.563",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.563.tgz",
"integrity": "sha512-aW6nYc/5w6TOrywuUDiCiw4wbQYxRH4fBrH1p0sDtzRggMpdfBdn7ccLd3aH+4GKZSnnxUNe3AdPBKbZ8draug==",
"dependencies": {
"tslib": "^2.2.0"
}
@ -26378,9 +26378,9 @@
}
},
"diagram-js-code-editor": {
"version": "1.1.8",
"resolved": "https://registry.npmjs.org/diagram-js-code-editor/-/diagram-js-code-editor-1.1.8.tgz",
"integrity": "sha512-xaBd9B2Zq47SZ6Gr7xVp+aq/CmwnLLDb5aWuqP/KQ5LJD1TPYk1ch91bbgKavriFBi12LhRdMOtLfyx3QWPNGA==",
"version": "1.1.85",
"resolved": "https://registry.npmjs.org/diagram-js-code-editor/-/diagram-js-code-editor-1.1.85.tgz",
"integrity": "sha512-bc9/HYDr2boS7oL9+ikOtLLCrxn0Z/y6fWKjJwH8PGvjbNbSIqs+QdxFp/iO8w0OCzatA0lCpIx+/jh15qz0Zw==",
"requires": {
"@popperjs/core": "^2.9.2",
"ace-builds": "^1.4.12",
@ -34401,9 +34401,9 @@
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
},
"sartography-workflow-lib": {
"version": "0.0.554",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.554.tgz",
"integrity": "sha512-XuH7yFtLBm+1gxFjxiDl5po3A44yWVgrem38XPGbFQQ+fbAzqNBBoxQuXnDlkwckyU04Om1ZHktEVAsQGcCEqg==",
"version": "0.0.563",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.563.tgz",
"integrity": "sha512-aW6nYc/5w6TOrywuUDiCiw4wbQYxRH4fBrH1p0sDtzRggMpdfBdn7ccLd3aH+4GKZSnnxUNe3AdPBKbZ8draug==",
"requires": {
"tslib": "^2.2.0"
}

4
package.json
View File

@ -48,7 +48,7 @@
"camunda-bpmn-moddle": "^5.1.2",
"camunda-dmn-moddle": "^1.1.0",
"diagram-js": "^7.3.0",
"diagram-js-code-editor": "^1.1.8",
"diagram-js-code-editor": "^1.1.85",
"diagram-js-minimap": "^2.0.4",
"dmn-js": "^11.0.1",
"dmn-js-properties-panel": "^0.6.1",
@ -63,7 +63,7 @@
"ngx-markdown": "^12.0.1",
"protractor": "^7.0.0",
"rxjs": "^6.5.3",
"sartography-workflow-lib": "^0.0.558",
"sartography-workflow-lib": "^0.0.563",
"tslib": "^2.3.0",
"uuid": "^8.3.2",
"zone.js": "^0.11.4"

4
src/app/diagram/bpmn-modeler-config.ts
View File

@ -7,8 +7,8 @@ import {ModelerConfig} from '../_interfaces/modeler-config';
export const bpmnModelerConfig: ModelerConfig = {
additionalModules: [
propertiesProviderModule,
propertiesPanelModule,
propertiesProviderModule,
propertiesPanelModule,
minimapModule,
codeModule,
],

4
src/app/navbar/navbar.component.ts
View File

@ -52,13 +52,13 @@ export class NavbarComponent {
}
private _loadNavLinks() {
const displayName = this.user.display_name || this.user.first_name || this.user.last_name;
const displayName = this.user.ldap_info.display_name;
this.navLinks = [
{path: '/home', id: 'nav_home', label: 'Configurator'},
{path: '/reffiles', id: 'nav_reffiles', label: 'Reference Files'},
{path: '/settings', id: 'settings', label: 'Settings'},
{
id: 'nav_account', label: `${displayName} (${this.user.email_address})`,
id: 'nav_account', label: `${displayName} (${this.user.ldap_info.email_address})`,
icon: 'account_circle'
}
];

17
src/app/workflow-spec-list/workflow-spec-list.component.ts
View File

@ -98,7 +98,7 @@ export class WorkflowSpecListComponent implements OnInit {
}
isSelected(cat: WorkflowSpecCategory) {
return this.selectedCat && this.selectedCat === cat;
return this.selectedCat && this.selectedCat.id === cat.id;
}
selectSpec(selectedSpec?: WorkflowSpec) {
@ -220,12 +220,14 @@ export class WorkflowSpecListComponent implements OnInit {
editCategoryDisplayOrder(catId: number, direction: string) {
this.api.reorderWorkflowCategory(catId, direction).subscribe(cat_change => {
this.workflowSpecsByCategory = this.workflowSpecsByCategory.map(cat => {
let new_cat = cat_change.find(i2 => i2.id === cat.id);
cat.display_order = new_cat.display_order;
return cat;
});
this.workflowSpecsByCategory.sort((x,y) => x.display_order - y.display_order);
if(cat_change) {
this.workflowSpecsByCategory = this.workflowSpecsByCategory.map(cat => {
let new_cat = cat_change.find(i2 => i2.id === cat.id);
cat.display_order = new_cat.display_order;
return cat;
});
this.workflowSpecsByCategory.sort((x,y) => x.display_order - y.display_order);
}
});
}
@ -283,6 +285,7 @@ export class WorkflowSpecListComponent implements OnInit {
this.workflowSpecs.forEach(ws => {
if (selectedSpecName && selectedSpecName === ws.name) {
this.selectedSpec = ws;
this.selectedCat = this.selectedSpec.category;
}
});
} else {

BIN
src/assets/images/shield_test_configuration.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 59 KiB

BIN
src/assets/images/shield_test_wp_spec.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 230 KiB

3
src/styles.scss
View File

@ -1,5 +1,7 @@
/* bpmn-js */
@import '../node_modules/bpmn-js-properties-panel/dist/assets/bpmn-js-properties-panel.css';
@import '../node_modules/diagram-js-minimap/assets/diagram-js-minimap.css';
@import '../node_modules/diagram-js-code-editor/assets/diagram-js-code-editor.css';
@import '../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-codes.css';
@import '../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn-embedded.css';
@import '../node_modules/bpmn-js/dist/assets/bpmn-font/css/bpmn.css';
@ -17,6 +19,7 @@
@import '../node_modules/dmn-js/dist/assets/dmn-js-literal-expression.css';
@import '../node_modules/dmn-js/dist/assets/dmn-js-shared.css';
/* Angular Material */
@import './material-theme.scss';
@include cr-connect-theme($cr-connect-theme);