Browse Source

revert import order to original one

make empty row filtering work with papaparseSquashed commits:
[184b041] ran nx format and nx test
[3824d80] revert import order to original one
make empty row filtering work with papaparse
pull/654/head
Ronald Konjer 3 years ago
parent
commit
b97bd01c2c
  1. 4
      apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts
  2. 11
      apps/client/src/app/services/import-transactions.service.ts
  3. 1
      package.json

4
apps/client/src/app/pages/portfolio/transactions/transactions-page.component.ts

@ -190,7 +190,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
try {
await this.importTransactionsService.importJson({
content: content.orders,
content: content.orders
});
this.handleImportSuccess();
@ -205,7 +205,7 @@ export class TransactionsPageComponent implements OnDestroy, OnInit {
await this.importTransactionsService.importCsv({
fileContent,
primaryDataSource: this.primaryDataSource,
user: this.user,
user: this.user
});
this.handleImportSuccess();

11
apps/client/src/app/services/import-transactions.service.ts

@ -1,8 +1,8 @@
import { HttpClient } from '@angular/common/http';
import { Injectable } from '@angular/core';
import { CreateOrderDto } from '@ghostfolio/api/app/order/create-order.dto';
import { parse } from 'date-fns';
import { DataSource, Type } from '@prisma/client';
import { parse } from 'date-fns';
import { parse as csvToJson } from 'papaparse';
import { isNumber } from 'lodash';
import { EMPTY } from 'rxjs';
@ -33,14 +33,16 @@ export class ImportTransactionsService {
primaryDataSource: DataSource;
user: User;
}) {
const content = csvToJson(fileContent, {
let content: any[] = [];
csvToJson(fileContent, {
dynamicTyping: true,
header: true,
skipEmptyLines: true,
complete: (parsedData) => {
parsedData.data.filter((item) => item['date'] != null);
content = parsedData.data.filter((item) => item['date'] != null);
}
}).data;
});
const orders: CreateOrderDto[] = [];
for (const [index, item] of content.entries()) {
@ -57,7 +59,6 @@ export class ImportTransactionsService {
});
}
await this.importJson({ content: orders });
}

1
package.json

@ -103,6 +103,7 @@
"ngx-markdown": "13.0.0",
"ngx-skeleton-loader": "2.9.1",
"ngx-stripe": "13.0.0",
"papaparse": "5.3.1",
"passport": "0.4.1",
"passport-google-oauth20": "2.0.0",
"passport-jwt": "4.0.0",

Loading…
Cancel
Save