({
body: new ArrayBuffer(8),
@@ -394,9 +389,6 @@ describe('ModelerComponent', () => {
expect(component.workflowSpec).toEqual(mockWorkflowSpec0);
expect(getFileMetasSpy).toHaveBeenCalledWith({workflow_spec_id: mockWorkflowSpec0.id});
- mockFileMetas.forEach(fm => {
- expect(getFileDataSpy).toHaveBeenCalledWith(fm.id);
- });
expect(component.bpmnFiles.length).toEqual(mockFileMetas.length);
});
@@ -404,8 +396,8 @@ describe('ModelerComponent', () => {
it('should load a database file', () => {
const onSubmitFileToOpenSpy = spyOn(component, 'onSubmitFileToOpen').and.stub();
component.workflowSpecs = mockWorkflowSpecs;
- component.loadDbFile(mockFileMeta0);
- expect(component.diagramFile).toEqual(mockFileMeta0.file);
+ component.loadDbFile(mockFileMeta0, mockFile0);
+ expect(component.diagramFile).toEqual(mockFile0);
expect(component.diagramFileMeta).toEqual(mockFileMeta0);
expect(component.workflowSpec).toEqual(mockWorkflowSpec0);
expect(onSubmitFileToOpenSpy).toHaveBeenCalled();
@@ -415,7 +407,7 @@ describe('ModelerComponent', () => {
component.xml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'sleigh_bells');
component.draftXml = BPMN_DIAGRAM_EMPTY.replace(/REPLACE_ME/g, 'schnitzel_with_noodles');
component.diagramFileMeta = mockFileMeta0;
- component.diagramFile = mockFileMeta0.file;
+ component.diagramFile = mockFile0;
component.workflowSpec = mockWorkflowSpec0;
component.newDiagram();
@@ -430,36 +422,27 @@ describe('ModelerComponent', () => {
it('should get a file metadata display string', () => {
expect(component.getFileMetaDisplayString(undefined)).toEqual('Loading...');
- const expectedString = 'one-fish.bpmn - v1.0 (Jan 23, 2020)';
-
- const file = new File([], 'one-fish.bpmn', {
- type: 'text/xml',
- lastModified: new Date('2020-01-23T12:34:12.345Z').getTime(),
- });
- mockFileMeta0.file = file;
+ const expectedString = 'one-fish.bpmn';
+ mockFileMeta0.type = FileType.BPMN;
+ mockFileMeta0.last_modified = '2020-01-23T12:34:12.345Z';
expect(component.getFileMetaDisplayString(mockFileMeta0)).toEqual(expectedString);
});
it('should get file metadata tooltip text', () => {
component.workflowSpec = undefined;
expect(component.getFileMetaTooltipText(mockFileMeta0)).toEqual('Loading...');
+ mockFileMeta0.type = FileType.BPMN;
+ mockFileMeta0.last_modified = '2020-01-23T12:34:12.345Z';
+ const lastUpdated = new DatePipe('en-us').transform(mockFileMeta0.last_modified, 'medium');
component.workflowSpec = mockWorkflowSpec0;
const expectedString = `
- Workflow spec ID: all_things
- Workflow name: all_things
- Display name: Everything
- Description: Do all the things
File name: one-fish.bpmn
- Last updated: Jan 23, 2020
+ Last updated: ${lastUpdated}
Version: 1.0
`;
-
- const file = new File([], 'one-fish.bpmn', {
- type: 'text/xml',
- lastModified: new Date('2020-01-23T12:34:12.345Z').getTime(),
- });
- mockFileMeta0.file = file;
+ mockFileMeta0.type = FileType.BPMN;
+ mockFileMeta0.last_modified = '2020-01-23T12:34:12.345Z';
expect(component.getFileMetaTooltipText(mockFileMeta0)).toEqual(expectedString);
});
@@ -478,7 +461,7 @@ describe('ModelerComponent', () => {
it('should display open file dialog', () => {
const data: OpenFileDialogData = {
- file: mockFileMeta0.file
+ file: mockFile0
};
const expectedFile = new File([], mockFileMeta0.name, {type: mockFileMeta0.content_type});
const event = {target: {files: [expectedFile]}};
diff --git a/src/app/modeler/modeler.component.ts b/src/app/modeler/modeler.component.ts
index 1469d11..d5f6f2e 100644
--- a/src/app/modeler/modeler.component.ts
+++ b/src/app/modeler/modeler.component.ts
@@ -139,7 +139,8 @@ export class ModelerComponent implements AfterViewInit {
}
getFileName() {
- return this.diagramFile ? this.diagramFile.name : this.fileName || 'No file selected';
+// return this.diagramFile ? this.diagramFile.name : this.fileName || 'No file selected';
+ return this.diagramFileMeta ? this.diagramFileMeta.name : this.fileName || 'No file selected';
}
checkSaved() {
@@ -206,8 +207,8 @@ export class ModelerComponent implements AfterViewInit {
return (this.xml !== this.draftXml) || this.isNew;
}
- loadDbFile(bf: FileMeta) {
- this.diagramFile = bf.file;
+ loadDbFile(bf: FileMeta, f: File) {
+ this.diagramFile = f;
this.diagramFileMeta = bf;
this.onSubmitFileToOpen();
}
@@ -263,10 +264,7 @@ export class ModelerComponent implements AfterViewInit {
getFileMetaDisplayString(fileMeta: FileMeta) {
if (fileMeta) {
- const lastUpdated = new DatePipe('en-us').transform(fileMeta.file.lastModified);
- return fileMeta.name +
- (fileMeta.latest_version ? ` - v${fileMeta.latest_version}` : '') +
- (lastUpdated ? ` (${lastUpdated})` : '');
+ return fileMeta.name;
} else {
return 'Loading...';
}
@@ -276,13 +274,9 @@ export class ModelerComponent implements AfterViewInit {
const spec = this.workflowSpec;
if (spec) {
- const lastUpdatedDate = new Date(fileMeta.file.lastModified);
- const lastUpdated = new DatePipe('en-us').transform(lastUpdatedDate);
+ const lastUpdatedDate = new Date(fileMeta.last_modified);
+ const lastUpdated = new DatePipe('en-us').transform(lastUpdatedDate, 'medium');
return `
- Workflow spec ID: ${spec.id}
- Workflow name: ${spec.name}
- Display name: ${spec.display_name}
- Description: ${spec.description}
File name: ${fileMeta.name}
Last updated: ${lastUpdated}
Version: ${fileMeta.latest_version}
@@ -298,19 +292,18 @@ export class ModelerComponent implements AfterViewInit {
this.api.getFileMetas({workflow_spec_id: wfs.id}).subscribe(files => {
this.bpmnFiles = [];
files.forEach(f => {
- this.api.getFileData(f.id).subscribe(response => {
- if ((f.type === FileType.BPMN) || (f.type === FileType.DMN)) {
- f.content_type = 'text/xml';
- f.file = newFileFromResponse(f, response);
- this.bpmnFiles.push(f);
+ if ((f.type === FileType.BPMN) || (f.type === FileType.DMN)) {
+ f.content_type = 'text/xml';
+ this.bpmnFiles.push(f);
- if (f.id === this.fileMetaId) {
- this.diagramFileMeta = f;
- this.diagramFile = f.file;
+ if (f.id === this.fileMetaId) {
+ this.diagramFileMeta = f;
+ this.api.getFileData(f.id).subscribe(response => {
+ this.diagramFile = newFileFromResponse(f, response);
this.onSubmitFileToOpen();
- }
+ });
}
- });
+ }
});
});
});
@@ -326,13 +319,14 @@ export class ModelerComponent implements AfterViewInit {
content_type: 'text/xml',
name: data.fileName,
type: fileType,
- file: new File([this.xml], data.fileName, {type: 'text/xml'}),
workflow_spec_id: this.workflowSpec.id,
};
+ this.diagramFile = new File([this.xml], data.fileName, {type: 'text/xml'});
+
if (this.workflowSpec && isNumberDefined(fileMetaId)) {
// Update existing file meta
- this.api.updateFileData(this.diagramFileMeta).subscribe(() => {
+ this.api.updateFileData(this.diagramFileMeta, this.diagramFile).subscribe(() => {
this.api.updateFileMeta(this.diagramFileMeta).subscribe(() => {
this.loadFilesFromDb();
this.snackBar.open(`Saved changes to file ${this.diagramFileMeta.name}.`, 'Ok', {duration: 5000});
@@ -340,7 +334,7 @@ export class ModelerComponent implements AfterViewInit {
});
} else {
// Add new file meta
- this.api.addFileMeta({workflow_spec_id: this.workflowSpec.id}, this.diagramFileMeta).subscribe(fileMeta => {
+ this.api.addFile({workflow_spec_id: this.workflowSpec.id}, this.diagramFileMeta, this.diagramFile).subscribe(fileMeta => {
this.router.navigate(['/modeler', this.workflowSpec.id, fileMeta.id]);
this.snackBar.open(`Saved new file ${fileMeta.name} to workflow spec ${this.workflowSpec.name}.`, 'Ok', {duration: 5000});
}, () => {
@@ -355,7 +349,7 @@ export class ModelerComponent implements AfterViewInit {
private saveFileChanges() {
this.xml = this.draftXml;
- this.diagramFileMeta.file = new File([this.xml], this.diagramFileMeta.name, {type: 'text/xml'});
+ this.diagramFile = new File([this.xml], this.diagramFileMeta.name, {type: 'text/xml'});
// Propose removal
// if (this.svg && this.svg !== '') {
@@ -363,7 +357,7 @@ export class ModelerComponent implements AfterViewInit {
// // this.api.updateFileData();
// }
- this.api.updateFileData(this.diagramFileMeta).subscribe(newFileMeta => {
+ this.api.updateFileData(this.diagramFileMeta, this.diagramFile).subscribe(newFileMeta => {
this.diagramFileMeta = newFileMeta;
this.snackBar.open(`Saved changes to file metadata ${this.diagramFileMeta.name}.`, 'Ok', {duration: 5000});
});
diff --git a/src/app/reference-files/reference-files.component.spec.ts b/src/app/reference-files/reference-files.component.spec.ts
index 1f5c6f0..4ca6864 100644
--- a/src/app/reference-files/reference-files.component.spec.ts
+++ b/src/app/reference-files/reference-files.component.spec.ts
@@ -12,7 +12,7 @@ import {RouterTestingModule} from '@angular/router/testing';
import * as FileSaver from 'file-saver';
import createClone from 'rfdc';
import {of} from 'rxjs';
-import {ApiService, FileMeta, FileType, MockEnvironment, mockFileMetaReference0} from 'sartography-workflow-lib';
+import {ApiService, FileMeta, FileType, MockEnvironment, mockFileMetaReference0, mockFileReference0} from 'sartography-workflow-lib';
import {OpenFileDialogComponent} from '../_dialogs/open-file-dialog/open-file-dialog.component';
import {ReferenceFilesComponent} from './reference-files.component';
@@ -26,9 +26,12 @@ describe('ReferenceFilesComponent', () => {
const mockDocMeta: FileMeta = createClone()(mockFileMetaReference0);
mockDocMeta.type = FileType.XLSX;
+ const timeString = '2020-01-23T12:34:12.345Z';
+ const timeCode = new Date(timeString).getTime();
+
const expectedFile = new File([], mockDocMeta.name, {
type: mockDocMeta.content_type,
- lastModified: mockDocMeta.file.lastModified
+ lastModified: timeCode
});
const mockHeaders = new HttpHeaders()
@@ -101,7 +104,7 @@ describe('ReferenceFilesComponent', () => {
.and.returnValue({
afterClosed: () => of({
fileMetaId: mockFileMetaReference0.id,
- file: mockFileMetaReference0.file
+ file: mockFileReference0
})
} as any);
const _loadReferenceFilesSpy = spyOn((component as any), '_loadReferenceFiles').and.stub();
diff --git a/src/app/workflow-spec-list/workflow-spec-list.component.html b/src/app/workflow-spec-list/workflow-spec-list.component.html
index c1251c1..c1e43ef 100644
--- a/src/app/workflow-spec-list/workflow-spec-list.component.html
+++ b/src/app/workflow-spec-list/workflow-spec-list.component.html
@@ -33,7 +33,7 @@
-
+
{{cat.display_name}}
diff --git a/src/app/workflow-spec-list/workflow-spec-list.component.ts b/src/app/workflow-spec-list/workflow-spec-list.component.ts
index 98f34c7..b324ef9 100644
--- a/src/app/workflow-spec-list/workflow-spec-list.component.ts
+++ b/src/app/workflow-spec-list/workflow-spec-list.component.ts
@@ -91,6 +91,10 @@ export class WorkflowSpecListComponent implements OnInit {
this.selectedCat = selectedCat;
}
+ isSelected(cat: WorkflowSpecCategory) {
+ return this.selectedCat && this.selectedCat === cat;
+ }
+
selectSpec(selectedSpec?: WorkflowSpec) {
this.selectedSpec = selectedSpec;
this.location.replaceState(environment.homeRoute + '/' + selectedSpec.name);