[#44856] enabled file upload

- with hardcoded upload information
- no file link creation attached
pull/11837/head
Eric Schubert 2 years ago
parent fcd0b3aba0
commit 7c10cc07e7
No known key found for this signature in database
GPG Key ID: 1D346C019BD4BAA2
  1. 1
      frontend/src/app/shared/components/storages/location-picker-modal/location-picker-modal.component.ts
  2. 2
      frontend/src/app/shared/components/storages/openproject-storages.module.ts
  3. 69
      frontend/src/app/shared/components/storages/services/upload-storage-files.service.ts
  4. 1
      frontend/src/app/shared/components/storages/storage/storage.component.html
  5. 26
      frontend/src/app/shared/components/storages/storage/storage.component.ts
  6. 3
      lib_static/open_project/configuration/helpers.rb

@ -91,7 +91,6 @@ export class LocationPickerModalComponent extends FilePickerBaseModalComponent {
}
public chooseLocation():void {
this.closingEvent.emit(this);
this.service.close();
}

@ -54,6 +54,7 @@ import {
import {
LoadingFileListComponent,
} from 'core-app/shared/components/storages/loading-file-list/loading-file-list.component';
import { UploadStorageFilesService } from 'core-app/shared/components/storages/services/upload-storage-files.service';
@NgModule({
imports: [
@ -78,6 +79,7 @@ import {
providers: [
SortFilesPipe,
CookieService,
UploadStorageFilesService,
],
})
export class OpenprojectStoragesModule {}

@ -0,0 +1,69 @@
// -- copyright
// OpenProject is an open source project management software.
// Copyright (C) 2012-2022 the OpenProject GmbH
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License version 3.
//
// OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
// Copyright (C) 2006-2013 Jean-Philippe Lang
// Copyright (C) 2010-2013 the ChiliProject Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your option) any later version.
//
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
//
// See COPYRIGHT and LICENSE files for more details.
//++
import { Injectable } from '@angular/core';
import { HttpClient } from '@angular/common/http';
import { Observable } from 'rxjs';
import { map, switchMap } from 'rxjs/operators';
@Injectable()
export class UploadStorageFilesService {
private token = 'JXSQ7knPCkgCWtp';
private password = 'ad84c32b-b4bf-4b6e-bea2-4b2204d1f66e';
constructor(
private readonly httpClient:HttpClient,
) {}
public uploadFile(file:File):Observable<string> {
const headers = {
Authorization: `Basic ${btoa(`${this.token}:${this.password}`)}`,
'X-External-Request': 'true',
};
const body = '<?xml version="1.0"?>\n'
+ '<d:propfind xmlns:d="DAV:" xmlns:oc="http://owncloud.org/ns">\n'
+ ' <d:prop>\n'
+ ' <oc:fileid />\n'
+ ' </d:prop>\n'
+ '</d:propfind>';
const url = `https://nextcloud.local/public.php/webdav/${(file.name)}`;
return this.httpClient
.put(url, file, { headers })
.pipe(
switchMap(() => this.httpClient.request('propfind', url, { body, headers, responseType: 'text' })),
map((xml) => {
const fileId = /<oc:fileid>(.*)<\/oc:fileid>/.exec(xml)?.pop();
if (!fileId) { throw new Error('no file id found'); }
return fileId;
}),
);
}
}

@ -46,7 +46,6 @@
name="upload_files"
(change)="onFilePickerChanged()"
hidden
multiple
/>
<p

@ -70,6 +70,8 @@ import { IHalResourceLink } from 'core-app/core/state/hal-resource';
import {
LocationPickerModalComponent,
} from 'core-app/shared/components/storages/location-picker-modal/location-picker-modal.component';
import { UploadStorageFilesService } from 'core-app/shared/components/storages/services/upload-storage-files.service';
import { ToastService } from 'core-app/shared/components/toaster/toast.service';
@Component({
selector: 'op-storage',
@ -133,11 +135,13 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit {
constructor(
private readonly i18n:I18nService,
private readonly toastService:ToastService,
private readonly cookieService:CookieService,
private readonly opModalService:OpModalService,
private readonly currentUserService:CurrentUserService,
private readonly configurationService:ConfigurationService,
private readonly fileLinkResourceService:FileLinksResourceService,
private readonly uploadStorageFilesService:UploadStorageFilesService,
) {
super();
}
@ -215,11 +219,31 @@ export class StorageComponent extends UntilDestroyedMixin implements OnInit {
this.opModalService.show<LocationPickerModalComponent>(LocationPickerModalComponent, 'global', locals)
.subscribe((modal) => {
modal.closingEvent.subscribe((data) => {
console.log(`Uploading ${files?.length || 0} files to ${data.location}`);
this.uploadFiles(files, data.location);
});
});
}
private uploadFiles(files:FileList|null, location:string):void {
if (files === null) {
return;
}
// TODO: get prepare upload information
this.uploadStorageFilesService.uploadFile(files[0])
.subscribe(
(data) => {
this.toastService.addSuccess(`Uploaded file with id ${data}`);
}, (error) => {
console.error(error);
},
);
// TODO: create file links
// this.fileLinkResourceService.addFileLinks()
}
private instantiateStorageInformation(fileLinks:IFileLink[]):StorageInformationBox[] {
if (!this.isLoggedIn) {
return [];

@ -103,7 +103,8 @@ module OpenProject
[
fog_credentials[:host],
remote_storage_upload_host,
remote_storage_download_host
remote_storage_download_host,
"nextcloud.local"
].compact
end

Loading…
Cancel
Save