Browse Source

Parent id fix in UI.

pull/593/head 5.2.1
Sebastian 5 years ago
parent
commit
ae19d21b9d
  1. 2
      frontend/app/shared/components/assets/asset-folder.component.scss
  2. 19
      frontend/app/shared/services/assets.service.spec.ts
  3. 6
      frontend/app/shared/services/assets.service.ts
  4. 2
      frontend/app/shared/state/asset-uploader.state.ts

2
frontend/app/shared/components/assets/asset-folder.component.scss

@ -14,7 +14,7 @@ img {
& {
border-bottom-width: 1px;
border-width: 1px;
cursor: default;
cursor: pointer;
width: $asset-width;
}

19
frontend/app/shared/services/assets.service.spec.ts

@ -242,6 +242,25 @@ describe('AssetsService', () => {
expect(asset!).toEqual(createAsset(12));
}));
it('should make post without parent id to create asset',
inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => {
let asset: AssetDto;
assetsService.postAssetFile('my-app', null!).subscribe(result => {
asset = <AssetDto>result;
});
const req = httpMock.expectOne('http://service/p/api/apps/my-app/assets');
expect(req.request.method).toEqual('POST');
expect(req.request.headers.get('If-Match')).toBeNull();
req.flush(assetResponse(12));
expect(asset!).toEqual(createAsset(12));
}));
it('should return proper error when upload failed with 413',
inject([AssetsService, HttpTestingController], (assetsService: AssetsService, httpMock: HttpTestingController) => {

6
frontend/app/shared/services/assets.service.ts

@ -282,7 +282,11 @@ export class AssetsService {
}
public postAssetFile(appName: string, file: Blob, parentId?: string): Observable<number | AssetDto> {
const url = this.apiUrl.buildUrl(`api/apps/${appName}/assets?parentId=${parentId}`);
let url = this.apiUrl.buildUrl(`api/apps/${appName}/assets`);
if (parentId) {
url += `?parentId=${parentId}`;
}
return HTTP.upload(this.http, 'POST', url, file).pipe(
filter(event =>

2
frontend/app/shared/state/asset-uploader.state.ts

@ -64,7 +64,7 @@ export class AssetUploaderState extends State<Snapshot> {
}
public uploadFile(file: File, target?: AssetsState): Observable<UploadResult> {
const parentId = target?.parentId || undefined;
const parentId = target?.parentId;
const stream = this.assetsService.postAssetFile(this.appName, file, parentId);

Loading…
Cancel
Save