Merge branch 'dev' of https://github.com/sartography/cr-connect-bpmn into feature/show_documentation_62

Dockerfile

@@ -12,7 +12,7 @@ RUN npm install && \
 
 ### STAGE 2: Run ###
 FROM quay.io/sartography/nginx:alpine
-RUN set -x && apk add --update --no-cache bash libintl gettext curl
+RUN set -x && apk add --update --no-cache bash libintl gettext curl``
 
 COPY --from=builder /app/dist/* /etc/nginx/html/
 COPY --from=builder /app/nginx.conf /etc/nginx/conf.d/default.conf

package.json

@@ -52,6 +52,7 @@
     "ngx-file-drop": "^9.0.1",
     "ngx-highlightjs": "^4.1.1",
     "ngx-markdown": "^9.1.1",
+    "protractor": "^7.0.0",
     "rxjs": "~6.5.4",
     "sartography-workflow-lib": "0.0.456",
     "tslib": "^1.13.0",
@@ -64,10 +65,10 @@
     "@angular/cli": "^9.1.11",
     "@angular/compiler-cli": "^9.1.12",
     "@angular/language-service": "^9.1.12",
+    "@babel/compat-data": "7.9.0",
     "@babel/core": "^7.10.5",
     "@babel/preset-env": "^7.10.4",
     "@babel/preset-react": "^7.10.4",
-    "@babel/compat-data": "7.9.0",
     "@types/jasmine": "^3.5.11",
     "@types/jasminewd2": "^2.0.8",
     "@types/node": "^12.12.50",
@@ -82,7 +83,6 @@
     "karma-jasmine-html-reporter": "^1.5.4",
     "mockdate": "^2.0.5",
     "postcss-short": "^5.0.0",
-    "protractor": "^7.0.0",
     "puppeteer": "^2.1.1",
     "sonar-scanner": "^3.1.0",
     "ts-node": "~8.6.2",

src/app/_dialogs/workflow-spec-dialog/workflow-spec-dialog.component.ts

@@ -89,19 +89,7 @@ export class WorkflowSpecDialogComponent {
             description: 'Write a few sentences explaining to users why this workflow exists and what it should be used for.',
             required: true,
           },
-        },
-        {
-          key: 'display_order',
-          type: 'input',
-          defaultValue: this.data.display_order,
-          templateOptions: {
-            type: 'number',
-            label: 'Display Order',
-            placeholder: 'Order in which spec will be displayed',
-            description: 'Sort order that the spec should appear in within its category. Lower numbers will appear first.',
-            required: true,
-          },
-        },
+        }
       ];
     });
   }

src/app/diagram/diagram.component.scss

@@ -14,3 +14,7 @@
     font-size: 24px;
   }
 }
+.diagram-container {
+  width: 100%;
+  height: 100%;
+}

src/app/file-list/file-list.component.html

@@ -16,8 +16,8 @@
           Primary process
         </button>
       </ng-container>
-      <h4 (click)="editFile(fm)" mat-line>{{fm.name}}</h4>
-      <p (click)="editFile(fm)" mat-line>{{fm.last_updated | date}}</p>
+      <h4 (click)="editFile(fm)" mat-line>{{fm.file.name}}</h4>
+      <p (click)="editFile(fm)" mat-line> Updated: {{fm.file.lastModified | date}}</p>
       <button (click)="downloadFile(fm)" class="mat-elevation-z0" color="primary" mat-icon-button>
         <mat-icon>save_alt</mat-icon>
       </button>

src/app/file-list/file-list.component.ts

@@ -81,6 +81,7 @@ export class FileListComponent implements OnInit, OnChanges {
   makePrimary(fmPrimary: FileMeta) {
     if (fmPrimary.type === FileType.BPMN) {
       let numUpdated = 0;
+      // Fixme: This buisness rule does not belong here.
       this.fileMetas.forEach(fm => {
         fm.primary = (fmPrimary.id === fm.id);
         this.api.updateFileMeta(fm).subscribe(() => {

src/app/workflow-spec-list/workflow-spec-list.component.html

@@ -33,7 +33,7 @@
 
         <div *ngIf="!(searchField.value && cat.workflow_specs.length === 0)">
         <ng-container *ngIf="!(cat.id === null && cat.workflow_specs.length === 0)">
-          <mat-expansion-panel hideToggle [expanded]="categoryExpanded(cat)">
+          <mat-expansion-panel hideToggle (opened)="selectCat(cat)" [expanded]="selectedSpec.category_id == cat.id">
             <mat-expansion-panel-header>
               <mat-panel-title>
                 {{cat.display_name}}

src/app/workflow-spec-list/workflow-spec-list.component.ts

@@ -23,7 +23,6 @@ import {
 } from '../_interfaces/dialog-data';
 import { ApiErrorsComponent } from 'sartography-workflow-lib';
 import { ActivatedRoute } from '@angular/router';
-import { debounceTime, distinctUntilChanged, map, switchMap, tap } from 'rxjs/operators';
 import { Location } from '@angular/common';
 import { environment } from '../../environments/environment.runtime';
 import { FormControl } from '@angular/forms';
@@ -88,6 +87,10 @@ export class WorkflowSpecListComponent implements OnInit {
     });
   }
 
+  selectCat(selectedCat?: WorkflowSpecCategory) {
+    this.selectedCat = selectedCat;
+  }
+
   selectSpec(selectedSpec?: WorkflowSpec) {
     this.selectedSpec = selectedSpec;
     this.location.replaceState(environment.homeRoute + '/' + selectedSpec.name);
@@ -109,6 +112,7 @@ export class WorkflowSpecListComponent implements OnInit {
       display_order: hasDisplayOrder ? selectedSpec.display_order : 0,
     };
 
+
     // Open new filename/workflow spec dialog
     const dialogRef = this.dialog.open(WorkflowSpecDialogComponent, {
       height: '65vh',
@@ -118,6 +122,7 @@ export class WorkflowSpecListComponent implements OnInit {
 
     dialogRef.afterClosed().subscribe((data: WorkflowSpecDialogData) => {
       if (data && data.id && data.name && data.display_name && data.description) {
+        data.display_order = this.categories.filter(function (entry) { return entry.id === data.category_id; }).length;
         this._upsertWorkflowSpecification(selectedSpec == null,  data);
       }
     });
@@ -205,7 +210,6 @@ export class WorkflowSpecListComponent implements OnInit {
         this.workflowSpecsByCategory.push(cat);
         this.workflowSpecsByCategory[i + 1].workflow_specs = [];
       });
-
       this._loadWorkflowSpecs(selectedSpecName);
     });
   }
@@ -372,6 +376,11 @@ export class WorkflowSpecListComponent implements OnInit {
   }
 
   private _updateSpecDisplayOrders(specs: WorkflowSpec[]) {
+    if (this.selectedCat && this.selectedSpec.category) {
+      if (this.selectedCat.id !== this.selectedSpec.category.id) {
+        this.selectedSpec = specs[0];
+      }
+    }
     let numUpdated = 0;
     specs.forEach((spec, j) => {
       const newSpec = createClone({ circles: true })(spec);