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 pull request #104 from sartography/bug/246_user_ldap_refactor 

Part of a user refactor - using a slightly different model where the …
This commit is contained in:
Dan Funk 2021-09-22 15:21:20 -04:00 committed by GitHub
parent 03d383a3d2 5774c40bf9
commit 4b2b98e2a0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
package-lock.json generated
View File

@ -29,7 +29,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",
@ -44,7 +44,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.561",
"tslib": "^2.3.0",
"uuid": "^8.3.2",
"zone.js": "^0.11.4"
@ -6916,9 +6916,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",
@ -17414,9 +17414,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.561",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.561.tgz",
"integrity": "sha512-j9/NQOCWl7jYzolmFNxDa7upA/0+5Z1QIIHxKOBTcMpUd64LfNOBcq4jdmJ6wMSiNs0p7dwY9QfWrO/dkoHBVQ==",
"dependencies": {
"tslib": "^2.2.0"
}
@ -26379,9 +26379,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",
@ -34402,9 +34402,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.561",
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.561.tgz",
"integrity": "sha512-j9/NQOCWl7jYzolmFNxDa7upA/0+5Z1QIIHxKOBTcMpUd64LfNOBcq4jdmJ6wMSiNs0p7dwY9QfWrO/dkoHBVQ==",
"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.559",
"sartography-workflow-lib": "^0.0.561",
"tslib": "^2.3.0",
"uuid": "^8.3.2",
"zone.js": "^0.11.4"

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'
}
];

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

@ -219,14 +219,15 @@ export class WorkflowSpecListComponent implements OnInit {
}
editCategoryDisplayOrder(catId: number, direction: string) {
console.log('new wfsbycat is: ', this.workflowSpecsByCategory);
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);
}
});
}