Browse Source

Refactor transactions to activities table

pull/600/head
Thomas 4 years ago
parent
commit
49cbb215c2
  1. 2
      apps/client/src/app/components/accounts-table/accounts-table.module.ts
  2. 4
      apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html
  3. 4
      apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts
  4. 4
      apps/client/src/app/pages/portfolio/transactions/transactions-page.html
  5. 4
      apps/client/src/app/pages/portfolio/transactions/transactions-page.module.ts
  6. 0
      libs/ui/src/lib/activities-table/activities-table.component.html
  7. 0
      libs/ui/src/lib/activities-table/activities-table.component.scss
  8. 12
      libs/ui/src/lib/activities-table/activities-table.component.ts
  9. 11
      libs/ui/src/lib/activities-table/activities-table.module.ts

2
apps/client/src/app/components/accounts-table/accounts-table.module.ts

@ -5,10 +5,10 @@ import { MatInputModule } from '@angular/material/input';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';
import { GfValueModule } from '@ghostfolio/ui/value'; import { GfValueModule } from '@ghostfolio/ui/value';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module';
import { AccountsTableComponent } from './accounts-table.component'; import { AccountsTableComponent } from './accounts-table.component';
@NgModule({ @NgModule({

4
apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.html

@ -125,7 +125,7 @@
</div> </div>
</div> </div>
<gf-transactions-table <gf-activities-table
*ngIf="orders?.length > 0" *ngIf="orders?.length > 0"
[baseCurrency]="data.baseCurrency" [baseCurrency]="data.baseCurrency"
[deviceType]="data.deviceType" [deviceType]="data.deviceType"
@ -137,7 +137,7 @@
[showActions]="false" [showActions]="false"
[showSymbolColumn]="false" [showSymbolColumn]="false"
[transactions]="orders" [transactions]="orders"
></gf-transactions-table> ></gf-activities-table>
</div> </div>
<gf-dialog-footer <gf-dialog-footer

4
apps/client/src/app/components/position/position-detail-dialog/position-detail-dialog.module.ts

@ -4,7 +4,7 @@ import { MatButtonModule } from '@angular/material/button';
import { MatDialogModule } from '@angular/material/dialog'; import { MatDialogModule } from '@angular/material/dialog';
import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module'; import { GfDialogFooterModule } from '@ghostfolio/client/components/dialog-footer/dialog-footer.module';
import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module'; import { GfDialogHeaderModule } from '@ghostfolio/client/components/dialog-header/dialog-header.module';
import { GfTransactionsTableModule } from '@ghostfolio/client/components/transactions-table/transactions-table.module'; import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
import { GfLineChartModule } from '@ghostfolio/ui/line-chart/line-chart.module'; import { GfLineChartModule } from '@ghostfolio/ui/line-chart/line-chart.module';
import { GfValueModule } from '@ghostfolio/ui/value'; import { GfValueModule } from '@ghostfolio/ui/value';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
@ -16,10 +16,10 @@ import { PositionDetailDialog } from './position-detail-dialog.component';
exports: [], exports: [],
imports: [ imports: [
CommonModule, CommonModule,
GfActivitiesTableModule,
GfDialogFooterModule, GfDialogFooterModule,
GfDialogHeaderModule, GfDialogHeaderModule,
GfLineChartModule, GfLineChartModule,
GfTransactionsTableModule,
GfValueModule, GfValueModule,
MatButtonModule, MatButtonModule,
MatDialogModule, MatDialogModule,

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

@ -2,7 +2,7 @@
<div class="row mb-3"> <div class="row mb-3">
<div class="col"> <div class="col">
<h3 class="d-flex justify-content-center mb-3" i18n>Transactions</h3> <h3 class="d-flex justify-content-center mb-3" i18n>Transactions</h3>
<gf-transactions-table <gf-activities-table
[baseCurrency]="user?.settings?.baseCurrency" [baseCurrency]="user?.settings?.baseCurrency"
[deviceType]="deviceType" [deviceType]="deviceType"
[hasPermissionToCreateOrder]="hasPermissionToCreateOrder" [hasPermissionToCreateOrder]="hasPermissionToCreateOrder"
@ -15,7 +15,7 @@
(transactionDeleted)="onDeleteTransaction($event)" (transactionDeleted)="onDeleteTransaction($event)"
(transactionToClone)="onCloneTransaction($event)" (transactionToClone)="onCloneTransaction($event)"
(transactionToUpdate)="onUpdateTransaction($event)" (transactionToUpdate)="onUpdateTransaction($event)"
></gf-transactions-table> ></gf-activities-table>
</div> </div>
</div> </div>

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

@ -3,8 +3,8 @@ import { CUSTOM_ELEMENTS_SCHEMA, NgModule } from '@angular/core';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import { MatSnackBarModule } from '@angular/material/snack-bar'; import { MatSnackBarModule } from '@angular/material/snack-bar';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { GfTransactionsTableModule } from '@ghostfolio/client/components/transactions-table/transactions-table.module';
import { ImportTransactionsService } from '@ghostfolio/client/services/import-transactions.service'; import { ImportTransactionsService } from '@ghostfolio/client/services/import-transactions.service';
import { GfActivitiesTableModule } from '@ghostfolio/ui/activities-table/activities-table.module';
import { GfCreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module'; import { GfCreateOrUpdateTransactionDialogModule } from './create-or-update-transaction-dialog/create-or-update-transaction-dialog.module';
import { GfImportTransactionDialogModule } from './import-transaction-dialog/import-transaction-dialog.module'; import { GfImportTransactionDialogModule } from './import-transaction-dialog/import-transaction-dialog.module';
@ -16,9 +16,9 @@ import { TransactionsPageComponent } from './transactions-page.component';
exports: [], exports: [],
imports: [ imports: [
CommonModule, CommonModule,
GfActivitiesTableModule,
GfCreateOrUpdateTransactionDialogModule, GfCreateOrUpdateTransactionDialogModule,
GfImportTransactionDialogModule, GfImportTransactionDialogModule,
GfTransactionsTableModule,
MatButtonModule, MatButtonModule,
MatSnackBarModule, MatSnackBarModule,
RouterModule, RouterModule,

0
apps/client/src/app/components/transactions-table/transactions-table.component.html → libs/ui/src/lib/activities-table/activities-table.component.html

0
apps/client/src/app/components/transactions-table/transactions-table.component.scss → libs/ui/src/lib/activities-table/activities-table.component.scss

12
apps/client/src/app/components/transactions-table/transactions-table.component.ts → libs/ui/src/lib/activities-table/activities-table.component.ts

@ -30,14 +30,12 @@ const SEARCH_PLACEHOLDER = 'Search for account, currency, symbol or type...';
const SEARCH_STRING_SEPARATOR = ','; const SEARCH_STRING_SEPARATOR = ',';
@Component({ @Component({
selector: 'gf-transactions-table',
changeDetection: ChangeDetectionStrategy.OnPush, changeDetection: ChangeDetectionStrategy.OnPush,
templateUrl: './transactions-table.component.html', selector: 'gf-activities-table',
styleUrls: ['./transactions-table.component.scss'] styleUrls: ['./activities-table.component.scss'],
templateUrl: './activities-table.component.html'
}) })
export class TransactionsTableComponent export class ActivitiesTableComponent implements OnChanges, OnDestroy {
implements OnChanges, OnDestroy, OnInit
{
@Input() baseCurrency: string; @Input() baseCurrency: string;
@Input() deviceType: string; @Input() deviceType: string;
@Input() hasPermissionToCreateOrder: boolean; @Input() hasPermissionToCreateOrder: boolean;
@ -124,8 +122,6 @@ export class TransactionsTableComponent
this.searchControl.setValue(null); this.searchControl.setValue(null);
} }
public ngOnInit() {}
public ngOnChanges() { public ngOnChanges() {
this.displayedColumns = [ this.displayedColumns = [
'count', 'count',

11
apps/client/src/app/components/transactions-table/transactions-table.module.ts → libs/ui/src/lib/activities-table/activities-table.module.ts

@ -9,17 +9,17 @@ import { MatMenuModule } from '@angular/material/menu';
import { MatSortModule } from '@angular/material/sort'; import { MatSortModule } from '@angular/material/sort';
import { MatTableModule } from '@angular/material/table'; import { MatTableModule } from '@angular/material/table';
import { RouterModule } from '@angular/router'; import { RouterModule } from '@angular/router';
import { GfSymbolIconModule } from '@ghostfolio/client/components/symbol-icon/symbol-icon.module';
import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module'; import { GfSymbolModule } from '@ghostfolio/client/pipes/symbol/symbol.module';
import { GfNoTransactionsInfoModule } from '@ghostfolio/ui/no-transactions-info'; import { GfNoTransactionsInfoModule } from '@ghostfolio/ui/no-transactions-info';
import { GfValueModule } from '@ghostfolio/ui/value'; import { GfValueModule } from '@ghostfolio/ui/value';
import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader'; import { NgxSkeletonLoaderModule } from 'ngx-skeleton-loader';
import { GfSymbolIconModule } from '../symbol-icon/symbol-icon.module'; import { ActivitiesTableComponent } from './activities-table.component';
import { TransactionsTableComponent } from './transactions-table.component';
@NgModule({ @NgModule({
declarations: [TransactionsTableComponent], declarations: [ActivitiesTableComponent],
exports: [TransactionsTableComponent], exports: [ActivitiesTableComponent],
imports: [ imports: [
CommonModule, CommonModule,
GfNoTransactionsInfoModule, GfNoTransactionsInfoModule,
@ -37,7 +37,6 @@ import { TransactionsTableComponent } from './transactions-table.component';
ReactiveFormsModule, ReactiveFormsModule,
RouterModule RouterModule
], ],
providers: [],
schemas: [CUSTOM_ELEMENTS_SCHEMA] schemas: [CUSTOM_ELEMENTS_SCHEMA]
}) })
export class GfTransactionsTableModule {} export class GfActivitiesTableModule {}
Loading…
Cancel
Save