Merge branch 'ui-fixes2'

skynet2 · skynet2 · commit b3c1cef0d3a5 · 2025-10-17T00:15:21.000+02:00
diff --git a/frontend/src/app/layout/component/app.menu.ts b/frontend/src/app/layout/component/app.menu.ts
@@ -66,31 +66,6 @@ export class AppMenu implements OnInit {
                     }
                 ]
             },
-            {
-                label: 'Accounts',
-                items: [
-                    {
-                        label: 'Assets',
-                        icon: 'pi pi-fw pi-wallet',
-                        routerLink: ['/accounts']
-                    },
-                    {
-                        label: 'Income',
-                        icon: 'pi pi-fw pi-money-bill',
-                        routerLink: ['/accounts/income']
-                    },
-                    {
-                        label: 'Expense',
-                        icon: 'pi pi-fw pi-cart-minus',
-                        routerLink: ['/accounts/expense']
-                    },
-                    {
-                        label: 'Liabilities',
-                        icon: 'pi pi-fw pi-credit-card',
-                        routerLink: ['/accounts/liabilities']
-                    }
-                ]
-            },
             {
                 label: 'Transactions',
                 items: [
@@ -116,6 +91,31 @@ export class AppMenu implements OnInit {
                     }
                 ]
             },
+            {
+                label: 'Accounts',
+                items: [
+                    {
+                        label: 'Assets',
+                        icon: 'pi pi-fw pi-wallet',
+                        routerLink: ['/accounts']
+                    },
+                    {
+                        label: 'Income',
+                        icon: 'pi pi-fw pi-money-bill',
+                        routerLink: ['/accounts/income']
+                    },
+                    {
+                        label: 'Expense',
+                        icon: 'pi pi-fw pi-cart-minus',
+                        routerLink: ['/accounts/expense']
+                    },
+                    {
+                        label: 'Liabilities',
+                        icon: 'pi pi-fw pi-credit-card',
+                        routerLink: ['/accounts/liabilities']
+                    }
+                ]
+            },
             {
                 label: 'Bulk',
                 items: [
diff --git a/frontend/src/app/pages/accounts/accounts-detail.component.ts b/frontend/src/app/pages/accounts/accounts-detail.component.ts
@@ -38,7 +38,7 @@ export class AccountsDetailComponent extends BaseAutoUnsubscribeClass implements
         @Inject(TRANSPORT_TOKEN) private transport: Transport,
         activeRoute: ActivatedRoute,
         private messageService: MessageService,
-        busService: BusService,
+        private busService: BusService,
         private selectedDateService: SelectedDateService
     ) {
         super();
@@ -47,15 +47,13 @@ export class AccountsDetailComponent extends BaseAutoUnsubscribeClass implements
         this.analyticsService = createClient(AnalyticsService, this.transport);
         this.configService = createClient(ConfigurationService, this.transport);
 
-        busService.currentAccountId.subscribe(async (accountId) => {
-            await this.setAccount(accountId);
-        });
-
-        activeRoute.params.subscribe((params) => {
-            let parsed = parseInt(params['id']) ?? undefined;
-
-            busService.currentAccountId.next(parsed);
-        });
+        activeRoute.params
+            .pipe(takeUntil(this.cancellableSubject$))
+            .subscribe(async (params) => {
+                let parsed = parseInt(params['id']) ?? undefined;
+                busService.currentAccountId.next(parsed);
+                await this.setAccount(parsed);
+            });
 
         combineLatest([this.selectedDateService.fromDate, this.selectedDateService.toDate])
             .pipe(takeUntil(this.cancellableSubject$))
diff --git a/frontend/src/app/pages/rules/rule-list.component.html b/frontend/src/app/pages/rules/rule-list.component.html
@@ -17,7 +17,8 @@
                      [filters]="filters"
                      [paginator]="false"
                      [globalFilterFields]="['id', 'title']"
-                     responsiveLayout="scroll">
+                     responsiveLayout="scroll"
+                     [multiSortMeta]="multiSortMeta">
                 <ng-template #caption>
                     <div class="flex flex-column sm:flex-row gap-2 justify-between">
                         <div class="flex flex-col justify-items-start">
@@ -48,10 +49,16 @@
                                 <p-sortIcon field="title" />
                             </div>
                         </th>
-                        <th style="min-width: 15rem" pSortableColumn="title">
+                        <th pSortableColumn="enabled">
+                            <div class="flex justify-between items-center">
+                                Enabled
+                                <p-sortIcon field="enabled" />
+                            </div>
+                        </th>
+                        <th pSortableColumn="isFinalRule">
                             <div class="flex justify-between items-center">
                                 Is Final Rule
-                                <p-sortIcon field="title" />
+                                <p-sortIcon field="isFinalRule" />
                             </div>
                         </th>
                         <th>
@@ -79,6 +86,7 @@
                         </th>
                         <th></th>
                         <th></th>
+                        <th></th>
                     </tr>
                 </ng-template>
                 <ng-template #body let-accountItem>
@@ -93,15 +101,25 @@
                                 {{ accountItem.title }}
                             </a>
                         </td>
+                        <td>
+                            <a [style]="{color : accountItem.enabled ? 'green' : ''}" [href]="getRuleUrl(accountItem)" [routerLink]="getRuleUrl(accountItem)">
+                                {{ accountItem.enabled }}
+                            </a>
+                        </td>
                         <td>
                             <a [href]="getRuleUrl(accountItem)" [routerLink]="getRuleUrl(accountItem)">
                                 {{ accountItem.isFinalRule }}
                             </a>
                         </td>
-                        <td style="max-width: 1rem">
-                            <p-button icon="pi pi-pencil"
-                                      (onClick)="this.router.navigate(['/', 'rules', 'edit', accountItem.id])"
-                                      severity="secondary" rounded />
+                        <td>
+                            <div class="flex gap-2">
+                                <p-button icon="pi pi-pencil" pTooltip="Edit rule" tooltipPosition="top"
+                                          (onClick)="this.router.navigate(['/', 'rules', 'edit', accountItem.id])"
+                                          severity="secondary" rounded />
+                                <p-button icon="pi pi-clone" pTooltip="Clone rule" tooltipPosition="top"
+                                          (onClick)="this.router.navigate(['/rules', 'new'], { queryParams: { clone_from: accountItem.id } })"
+                                          severity="secondary" rounded />
+                            </div>
                         </td>
                     </tr>
                 </ng-template>
diff --git a/frontend/src/app/pages/rules/rule-list.component.ts b/frontend/src/app/pages/rules/rule-list.component.ts
@@ -21,6 +21,7 @@ import { OverlayModule } from 'primeng/overlay';
 import { ListTagsResponse_TagItem, TagsService } from '@buf/xskydev_go-money-pb.bufbuild_es/gomoneypb/tags/v1/tags_pb';
 import { RulesService } from '@buf/xskydev_go-money-pb.bufbuild_es/gomoneypb/rules/v1/rules_pb';
 import { Rule } from '@buf/xskydev_go-money-pb.bufbuild_es/gomoneypb/v1/rule_pb';
+import { Tooltip } from 'primeng/tooltip';
 
 class RuleGroup {
     title: string = 'Default';
@@ -30,7 +31,7 @@ class RuleGroup {
 @Component({
     selector: 'app-rule-list',
     templateUrl: 'rule-list.component.html',
-    imports: [OverlayModule, FormsModule, InputText, ToastModule, TableModule, InputIcon, IconField, Button, MultiSelectModule, SelectModule, CommonModule, RouterLink],
+    imports: [OverlayModule, FormsModule, InputText, ToastModule, TableModule, InputIcon, IconField, Button, MultiSelectModule, SelectModule, CommonModule, RouterLink, Tooltip],
     styles: `
         :host ::ng-deep .tagListingTable .p-datatable-header {
             border-width: 0 !important;
@@ -48,6 +49,12 @@ export class RuleListComponent implements OnInit {
     private ruleService;
 
     public filters: { [s: string]: FilterMetadata } = {};
+    public multiSortMeta: any[] = [
+        {
+            field: 'id',
+            order: 1
+        }
+    ];
 
     @ViewChild('filter') filter!: ElementRef;
 
diff --git a/frontend/src/app/pages/rules/rules-upsert.component.ts b/frontend/src/app/pages/rules/rules-upsert.component.ts
@@ -34,7 +34,7 @@ export class RulesUpsertComponent implements OnInit {
     constructor(
         @Inject(TRANSPORT_TOKEN) private transport: Transport,
         private messageService: MessageService,
-        routeSnapshot: ActivatedRoute,
+        private routeSnapshot: ActivatedRoute,
         private router: Router
     ) {
         this.rulesService = createClient(RulesService, this.transport);
@@ -47,11 +47,26 @@ export class RulesUpsertComponent implements OnInit {
     }
 
     async ngOnInit() {
-        if (this.rule.id) {
+        const cloneFrom = this.routeSnapshot.snapshot.queryParams['clone_from'];
+
+        if (cloneFrom) {
+            try {
+                let response = await this.rulesService.listRules({ ids: [+cloneFrom] });
+                if (response.rules && response.rules.length == 0) {
+                    this.messageService.add({ severity: 'error', detail: 'rule not found' });
+                    return;
+                }
+
+                this.rule = response.rules[0] ?? create(RuleSchema, {});
+                this.rule.id = 0;
+            } catch (e) {
+                this.messageService.add({ severity: 'error', detail: ErrorHelper.getMessage(e) });
+            }
+        } else if (this.rule.id) {
             try {
                 let response = await this.rulesService.listRules({ ids: [+this.rule.id] });
                 if (response.rules && response.rules.length == 0) {
-                    this.messageService.add({ severity: 'error', detail: 'tag not found' });
+                    this.messageService.add({ severity: 'error', detail: 'rule not found' });
                     return;
                 }
 
diff --git a/frontend/src/app/services/enum.service.ts b/frontend/src/app/services/enum.service.ts
@@ -81,7 +81,7 @@ export class EnumService {
                 icon: 'pi pi-arrows-h text-blue-500'
             },
             {
-                name: 'Withdrawal',
+                name: 'Expense',
                 value: TransactionType.EXPENSE,
                 icon: 'pi pi-arrow-up text-red-500'
             }
diff --git a/frontend/src/app/shared/components/transaction-editor/transaction-editor.component.html b/frontend/src/app/shared/components/transaction-editor/transaction-editor.component.html
@@ -35,7 +35,22 @@
                         optionLabel="name"
                         optionValue="id"
                         placeholder="Select source account"
-                    />
+                    >
+                        <ng-template #item let-account>
+                            <div class="flex flex-col text-sm leading-tight py-1 w-full">
+                                <div class="font-semibold mb-1 text-center">{{ account.name }}</div>
+                                <div class="flex gap-3 text-xs text-gray-600 dark:text-gray-400 justify-center">
+                                    <span class="flex-shrink-0">Type: <span class="text-gray-900 dark:text-gray-100">{{ getAccountTypeName(account.type) }}</span></span>
+                                    <span class="flex-shrink-0">Currency: <span class="text-gray-900 dark:text-gray-100">{{ account.currency }}</span></span>
+                                    <span class="flex-shrink-0">Balance: <span class="font-mono"
+                                        [class.text-green-600]="parseFloat(account.currentBalance) > 0"
+                                        [class.dark:text-green-400]="parseFloat(account.currentBalance) > 0"
+                                        [class.text-red-600]="parseFloat(account.currentBalance) < 0"
+                                        [class.dark:text-red-400]="parseFloat(account.currentBalance) < 0">{{ account.currentBalance }}</span></span>
+                                </div>
+                            </div>
+                        </ng-template>
+                    </p-select>
                     @if (sourceAccountId.invalid && (sourceAccountId.dirty || sourceAccountId.touched)) {
                         <p-message severity="error" variant="simple" size="small">Source Account is required</p-message>
                     }
@@ -105,7 +120,22 @@
                     optionLabel="name"
                     optionValue="id"
                     placeholder="Select destination account"
-                />
+                >
+                    <ng-template #item let-account>
+                        <div class="flex flex-col text-sm leading-tight py-1 w-full">
+                            <div class="font-semibold mb-1 text-center">{{ account.name }}</div>
+                            <div class="flex gap-3 text-xs text-gray-600 dark:text-gray-400 justify-center">
+                                <span class="flex-shrink-0">Type: <span class="text-gray-900 dark:text-gray-100">{{ getAccountTypeName(account.type) }}</span></span>
+                                <span class="flex-shrink-0">Currency: <span class="text-gray-900 dark:text-gray-100">{{ account.currency }}</span></span>
+                                <span class="flex-shrink-0">Balance: <span class="font-mono"
+                                    [class.text-green-600]="parseFloat(account.currentBalance) > 0"
+                                    [class.dark:text-green-400]="parseFloat(account.currentBalance) > 0"
+                                    [class.text-red-600]="parseFloat(account.currentBalance) < 0"
+                                    [class.dark:text-red-400]="parseFloat(account.currentBalance) < 0">{{ account.currentBalance }}</span></span>
+                            </div>
+                        </div>
+                    </ng-template>
+                </p-select>
                 @if (destinationAccountId.invalid && (destinationAccountId.dirty || destinationAccountId.touched)) {
                     <p-message severity="error" variant="simple" size="small">Destination Account is required</p-message>
                 }
diff --git a/frontend/src/app/shared/components/transaction-editor/transaction-editor.component.ts b/frontend/src/app/shared/components/transaction-editor/transaction-editor.component.ts
@@ -9,7 +9,7 @@ import { FilterMetadata, MessageService, ConfirmationService } from 'primeng/api
 import { ToastModule } from 'primeng/toast';
 import { DatePickerModule } from 'primeng/datepicker';
 import { Account } from '@buf/xskydev_go-money-pb.bufbuild_es/gomoneypb/v1/account_pb';
-import { NgClass, NgIf } from '@angular/common';
+import { NgIf, NgFor } from '@angular/common';
 import { TextareaModule } from 'primeng/textarea';
 import { ButtonModule } from 'primeng/button';
 import { MultiSelectModule } from 'primeng/multiselect';
@@ -362,11 +362,13 @@ export class TransactionEditorComponent implements OnInit, OnChanges {
             return [];
         }
 
-        if (isSource) {
-            return applicable.sourceAccounts || [];
-        } else {
-            return applicable.destinationAccounts || [];
-        }
+        const accounts = isSource ? applicable.sourceAccounts || [] : applicable.destinationAccounts || [];
+
+        return accounts.sort((a, b) => {
+            const orderA = a.displayOrder ?? 999999;
+            const orderB = b.displayOrder ?? 999999;
+            return orderA - orderB;
+        });
     }
 
     getAccountById(id: number | undefined): Account | null {
@@ -603,4 +605,14 @@ export class TransactionEditorComponent implements OnInit, OnChanges {
             this.messageService.add({ severity: 'error', detail: ErrorHelper.getMessage(e) });
         }
     }
+
+    getAccountTypeName(type: number): string {
+        const accountTypes = EnumService.getAccountTypes();
+        const accountType = accountTypes.find(t => t.value === type);
+        return accountType?.name || 'Unknown';
+    }
+
+    parseFloat(value: string): number {
+        return parseFloat(value);
+    }
 }
diff --git a/pkg/database/stat.go b/pkg/database/stat.go
@@ -1,8 +1,9 @@
 package database
 
 import (
-	"github.com/shopspring/decimal"
 	"time"
+
+	"github.com/shopspring/decimal"
 )
 
 type DailyStat struct {

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ export class EnumService {`
`81`	`81`	`icon: 'pi pi-arrows-h text-blue-500'`
`82`	`82`	`},`
`83`	`83`	`{`
`84`		`- name: 'Withdrawal',`
	`84`	`+ name: 'Expense',`
`85`	`85`	`value: TransactionType.EXPENSE,`
`86`	`86`	`icon: 'pi pi-arrow-up text-red-500'`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,9 @@`
`1`	`1`	`package database`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/shopspring/decimal"`
`5`	`4`	`"time"`
	`5`	`+`
	`6`	`+ "github.com/shopspring/decimal"`
`6`	`7`	`)`
`7`	`8`
`8`	`9`	`type DailyStat struct {`