Merge branch 'dev'

This commit is contained in:
Dan 2022-01-05 14:26:33 -05:00
commit 48068b7bf2
4 changed files with 10 additions and 8 deletions

12
package-lock.json generated
View File

@ -9565,9 +9565,9 @@
}
},
"nth-check": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.0.tgz",
"integrity": "sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==",
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.0.1.tgz",
"integrity": "sha512-it1vE95zF6dTT9lBsYbxvqh0Soy4SPowchj0UBGj/V6cTPnXXtQOPUbhZ6CmGzAD/rW22LQK6E96pcdJXk4A4w==",
"dev": true,
"requires": {
"boolbase": "^1.0.0"
@ -12220,9 +12220,9 @@
"dev": true
},
"prismjs": {
"version": "1.24.1",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.24.1.tgz",
"integrity": "sha512-mNPsedLuk90RVJioIky8ANZEwYm5w9LcvCXrxHlwf4fNVSn8jEipMybMkWUyyF0JhnC+C4VcOVSBuHRKs1L5Ow=="
"version": "1.25.0",
"resolved": "https://registry.npmjs.org/prismjs/-/prismjs-1.25.0.tgz",
"integrity": "sha512-WCjJHl1KEWbnkQom1+SzftbtXMKQoezOCYs5rECqMN+jP+apI7ftoflyqigqzopSO3hMhTEb0mFClA8lkolgEg=="
},
"process-nextick-args": {
"version": "2.0.1",

View File

@ -63,7 +63,7 @@
"ngx-markdown": "^12.0.1",
"protractor": "^7.0.0",
"rxjs": "^6.5.3",
"sartography-workflow-lib": "0.0.586",
"sartography-workflow-lib": "0.0.587",
"tslib": "^2.3.0",
"uuid": "^8.3.2",
"zone.js": "~0.11.4"

View File

@ -6,7 +6,7 @@
[attr.data-workflow-spec-id]="workflowSpec.id"
>
<mat-icon (click)="editFile(fm)" mat-list-icon>{{fm.type | getIconCode}}</mat-icon>
<ng-container *ngIf="fm.type === fileType.BPMN">
<ng-container *ngIf="fm.type === fileType.BPMN && !this.workflowSpec.library">
<button (click)="makePrimary(fm)" *ngIf="!fm.primary" mat-flat-button class="make-primary">
<mat-icon>radio_button_unchecked</mat-icon>
Make primary process

View File

@ -248,6 +248,8 @@ export class WorkflowSpecListComponent implements OnInit {
private _loadWorkflowLibraries(selectedSpecName: string = null) {
this.api.getWorkflowSpecificationLibraries().subscribe(wfs => {
this.workflowLibraries = wfs;
// Sort libraries alphabetically
this.workflowLibraries.sort((a,b) => a.display_name.localeCompare(b.display_name));
// If selected spec is a library, set it.
if (selectedSpecName) {