mirror of
https://github.com/sartography/cr-connect-bpmn.git
synced 2025-01-13 02:24:39 +00:00
Merge branch 'dev' into files-to-filesystem-572
This commit is contained in:
commit
715856a44f
26
package-lock.json
generated
26
package-lock.json
generated
@ -43,7 +43,7 @@
|
|||||||
"ngx-markdown": "^12.0.1",
|
"ngx-markdown": "^12.0.1",
|
||||||
"protractor": "^7.0.0",
|
"protractor": "^7.0.0",
|
||||||
"rxjs": "^6.5.3",
|
"rxjs": "^6.5.3",
|
||||||
"sartography-workflow-lib": "0.0.589",
|
"sartography-workflow-lib": "0.0.591",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
@ -11839,9 +11839,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/min-dash": {
|
"node_modules/min-dash": {
|
||||||
"version": "3.7.0",
|
"version": "3.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.8.1.tgz",
|
||||||
"integrity": "sha512-IlEbbItQU7tipoa4aAWocSuhR76jKqQG/N2+/Mh7d+BLZ3UmQl57ppKhziPY/TXBGps9+M8BC1c7AzqcYLp5BA=="
|
"integrity": "sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg=="
|
||||||
},
|
},
|
||||||
"node_modules/min-dom": {
|
"node_modules/min-dom": {
|
||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
@ -16865,9 +16865,9 @@
|
|||||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||||
},
|
},
|
||||||
"node_modules/sartography-workflow-lib": {
|
"node_modules/sartography-workflow-lib": {
|
||||||
"version": "0.0.589",
|
"version": "0.0.591",
|
||||||
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.589.tgz",
|
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.591.tgz",
|
||||||
"integrity": "sha512-0riSQhmP2HK96Vz+lnvtiEVI/ofBXUg3eopmH0ZkwaLHc8VGMfqdtOGE/5sfFPWsHiggXtJxlSm/3IA8vJvI8Q==",
|
"integrity": "sha512-ODIwDgqLAC8Yi/JsGvaLIJug1Os9l/vI/2vu8DJXj5g2yS4ISxFc4Ec5nXAaY5E0IhrPWLu32IIuZaQhQtFTIw==",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"tslib": "^2.2.0"
|
"tslib": "^2.2.0"
|
||||||
}
|
}
|
||||||
@ -29654,9 +29654,9 @@
|
|||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
"min-dash": {
|
"min-dash": {
|
||||||
"version": "3.7.0",
|
"version": "3.8.1",
|
||||||
"resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.7.0.tgz",
|
"resolved": "https://registry.npmjs.org/min-dash/-/min-dash-3.8.1.tgz",
|
||||||
"integrity": "sha512-IlEbbItQU7tipoa4aAWocSuhR76jKqQG/N2+/Mh7d+BLZ3UmQl57ppKhziPY/TXBGps9+M8BC1c7AzqcYLp5BA=="
|
"integrity": "sha512-evumdlmIlg9mbRVPbC4F5FuRhNmcMS5pvuBUbqb1G9v09Ro0ImPEgz5n3khir83lFok1inKqVDjnKEg3GpDxQg=="
|
||||||
},
|
},
|
||||||
"min-dom": {
|
"min-dom": {
|
||||||
"version": "3.1.3",
|
"version": "3.1.3",
|
||||||
@ -33368,9 +33368,9 @@
|
|||||||
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
"integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="
|
||||||
},
|
},
|
||||||
"sartography-workflow-lib": {
|
"sartography-workflow-lib": {
|
||||||
"version": "0.0.589",
|
"version": "0.0.591",
|
||||||
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.589.tgz",
|
"resolved": "https://registry.npmjs.org/sartography-workflow-lib/-/sartography-workflow-lib-0.0.591.tgz",
|
||||||
"integrity": "sha512-0riSQhmP2HK96Vz+lnvtiEVI/ofBXUg3eopmH0ZkwaLHc8VGMfqdtOGE/5sfFPWsHiggXtJxlSm/3IA8vJvI8Q==",
|
"integrity": "sha512-ODIwDgqLAC8Yi/JsGvaLIJug1Os9l/vI/2vu8DJXj5g2yS4ISxFc4Ec5nXAaY5E0IhrPWLu32IIuZaQhQtFTIw==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"tslib": "^2.2.0"
|
"tslib": "^2.2.0"
|
||||||
}
|
}
|
||||||
|
@ -63,7 +63,7 @@
|
|||||||
"ngx-markdown": "^12.0.1",
|
"ngx-markdown": "^12.0.1",
|
||||||
"protractor": "^7.0.0",
|
"protractor": "^7.0.0",
|
||||||
"rxjs": "^6.5.3",
|
"rxjs": "^6.5.3",
|
||||||
"sartography-workflow-lib": "0.0.589",
|
"sartography-workflow-lib": "0.0.591",
|
||||||
"tslib": "^2.3.0",
|
"tslib": "^2.3.0",
|
||||||
"uuid": "^8.3.2",
|
"uuid": "^8.3.2",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
|
@ -111,11 +111,11 @@ describe('ReferenceFilesComponent', () => {
|
|||||||
|
|
||||||
component.openFileDialog(mockFileMetaReference0);
|
component.openFileDialog(mockFileMetaReference0);
|
||||||
|
|
||||||
const fReq = httpMock.expectOne(`apiRoot/reference_file/${mockDocMeta.name}`);
|
const fReq = httpMock.expectOne(`apiRoot/reference_file/${mockDocMeta.name}/data`);
|
||||||
expect(fReq.request.method).toEqual('GET');
|
expect(fReq.request.method).toEqual('GET');
|
||||||
fReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
fReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
||||||
|
|
||||||
const updateReq = httpMock.expectOne(`apiRoot/reference_file/${mockFileMetaReference0.name}`);
|
const updateReq = httpMock.expectOne(`apiRoot/reference_file/${mockFileMetaReference0.name}/data`);
|
||||||
expect(updateReq.request.method).toEqual('PUT');
|
expect(updateReq.request.method).toEqual('PUT');
|
||||||
updateReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
updateReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
||||||
|
|
||||||
@ -128,7 +128,7 @@ describe('ReferenceFilesComponent', () => {
|
|||||||
|
|
||||||
component.downloadFile(mockDocMeta);
|
component.downloadFile(mockDocMeta);
|
||||||
|
|
||||||
const fReq = httpMock.expectOne(`apiRoot/reference_file/${mockDocMeta.name}`);
|
const fReq = httpMock.expectOne(`apiRoot/reference_file/${mockDocMeta.name}/data`);
|
||||||
expect(fReq.request.method).toEqual('GET');
|
expect(fReq.request.method).toEqual('GET');
|
||||||
fReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
fReq.flush(mockArrayBuffer, {headers: mockHeaders});
|
||||||
|
|
||||||
|
@ -27,7 +27,7 @@ export class ReferenceFilesComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
openFileDialog(fm: FileMeta) {
|
openFileDialog(fm: FileMeta) {
|
||||||
this.apiService.getReferenceFile(fm.name).subscribe(oldFile => {
|
this.apiService.getReferenceFileData(fm.name).subscribe(oldFile => {
|
||||||
const dialogData: OpenFileDialogData = {
|
const dialogData: OpenFileDialogData = {
|
||||||
fileMetaId: fm.id,
|
fileMetaId: fm.id,
|
||||||
file: new File([oldFile.body], fm.name, {
|
file: new File([oldFile.body], fm.name, {
|
||||||
@ -51,7 +51,7 @@ export class ReferenceFilesComponent {
|
|||||||
}
|
}
|
||||||
|
|
||||||
downloadFile(fm: FileMeta) {
|
downloadFile(fm: FileMeta) {
|
||||||
this.apiService.getReferenceFile(fm.name).subscribe(response => {
|
this.apiService.getReferenceFileData(fm.name).subscribe(response => {
|
||||||
const blob = new Blob([response.body], {type: fm.content_type});
|
const blob = new Blob([response.body], {type: fm.content_type});
|
||||||
fileSaver.saveAs(blob, fm.name);
|
fileSaver.saveAs(blob, fm.name);
|
||||||
});
|
});
|
||||||
|
Loading…
x
Reference in New Issue
Block a user