diff --git a/Frontend/src/app/models/dataSet.model.ts b/Frontend/src/app/models/dataSet.model.ts index 1216485..ab616f3 100644 --- a/Frontend/src/app/models/dataSet.model.ts +++ b/Frontend/src/app/models/dataSet.model.ts @@ -95,12 +95,10 @@ export class DataSet extends Base { }) }) } - static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise { + static parseGoogleSheet(sheetId: string, _http: HttpClient): Promise { return new Promise((resolve, reject) => { - _http.get(`${environment.api.url}/datasets/parseGoogleSheet/${sheetId}`, - ).pipe(map(data => { - data.dataRows = data.dataRows.map((x: any) => new DataRow().deserialize(x)) - })) + _http.get(`${environment.api.url}/datasets/parseGoogleSheet/${sheetId}`, + ).pipe(map(data => new DataSet().deserialize(data))) .subscribe({ next: (data) => { resolve(data); diff --git a/Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.ts b/Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.ts index f81e213..1dfbb4f 100644 --- a/Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.ts +++ b/Frontend/src/app/modules/data-sets/data-set-edit/data-set-edit.component.ts @@ -65,7 +65,8 @@ export class DataSetEditComponent implements OnInit { } async parseGoogleSheet() { const id = this.form.get('sheetId')?.value; - this.document.dataRows = await DataSet.parseGoogleSheet(id, this.http$); + this.document = await DataSet.parseGoogleSheet(id, this.http$); + this.document.fillForm(this.form); this.dataSource = new MatTableDataSource(this.document.dataRows); this.dataSource.paginator = this.paginator; this.dataSource.sort = this.sort; diff --git a/WebAPI/Exports/googleSheet.export.cs b/WebAPI/Exports/googleSheet.export.cs index 21983df..07bfd08 100644 --- a/WebAPI/Exports/googleSheet.export.cs +++ b/WebAPI/Exports/googleSheet.export.cs @@ -28,7 +28,7 @@ namespace WebAPI.Exports Google.Apis.Drive.v3.Data.File body = new Google.Apis.Drive.v3.Data.File(); body.Name = $"export-{DateTime.Now}"; body.MimeType = "application/vnd.google-apps.spreadsheet"; - body.Parents = new List { "1Sar-9ux6GWlXKZiD-l1Mfh1gdsxZif3j" }; + body.Parents = new List { "1c5GBQmsIoj6a9L-JYFTaLEZ3EfkbQHPt" }; CreateRequest request = googleDriveHelper.Service.Files.Create(body); var file = request.Execute();