transaction edit

src/components/app-pagination/AppPaginationElement.ts

@@ -95,6 +95,17 @@ class AppPaginationElement extends BaseComponentElement {
 		}
 	};
 
+	transactionEdit = (id) => {
+		const _modal = this.appMain.appModal;
+		if (_modal) {
+			this.appMain.closeModal();
+		} else {
+			this.appMain.createModal('transaction-edit', {
+				id: id
+			});
+		}
+	}
+
 	render = (): TemplateResult => {
 		const { rpp, totalItems, page, items } = this;
 
@@ -117,6 +128,9 @@ class AppPaginationElement extends BaseComponentElement {
 						</span>
 						<span class="currency">(${item.currency ? item.currency : 'USD'})</span>
 					</td>
+					<td class="--left">
+						<span><button @click=${() => this.transactionEdit(item.id)}}>Edit</button></span>
+					</td>
 			  </tr>`;
 
 		const renderItems = this.customRenderItems

src/pages/index.ts

@@ -11,3 +11,4 @@ export * from './subscription-create/SubscriptionCreateElement';
 export * from './subscription-list/SubscriptionListElement';
 export * from './wallet-page/WalletPageElement';
 export * from './subscription-edit/SubscriptionEditElement';
+export * from './transaction-edit/TransactionEditElement';

src/pages/subscription-edit/SubscriptionEditElement.ts

@@ -38,8 +38,8 @@ class SubscriptionEditElement extends BasePageElement {
 		this.subscriptionTypeService = new SubscriptionTypeService(this.appMain?.appService);
 		this.authService = new AuthService(this.appMain.appService);
 		this.walletData = this.getData();
-		this.getSubscription(this.walletData.id);
 		this.update();
+		this.getSubscription(this.walletData?.id);
 		if (this.walletData && this.walletData.walletId) {
 			this.setTransactionType();
 		} else {
@@ -92,8 +92,8 @@ class SubscriptionEditElement extends BasePageElement {
 			if (wallet) {
 				(wallet as AppDropdownElement).setItemValue(response.wallet);
 			}
-			response.wallet = response.walletId
+			response.wallet = response.walletId;
-			response.endDate = dayjs(response.endDate).format('YYYY-MM-DD')
+			response.endDate = dayjs(response.endDate).format('YYYY-MM-DD');
 			this.appForm.set(response);
 		} catch (err) {
 
@@ -151,7 +151,7 @@ class SubscriptionEditElement extends BasePageElement {
 				this.appMain.triggerTransactionUpdate();
 				this.appMain.pushToast('success', 'Subscription edited successfully!');
 
-				if (walletData.walletId) {
+				if (walletData.id) {
 					this.appMain?.closeModal();
 				} else {
 					this.routerService.goTo('/subscriptions', {

src/pages/transaction-edit/TransactionEditElement.ts

@@ -0,0 +1,235 @@
+import { targets, controller, target } from '@github/catalyst';
+import { html, TemplateResult } from 'core/utils';
+import { AuthService, TransactionsService, TransactionTypeService, WalletService } from 'services/';
+import { AppFormElement, InputFieldElement } from 'components/';
+import { RouterService } from 'core/services';
+import { BasePageElement } from 'common/';
+import { AppDropdownElement } from 'components/app-dropdown/AppDropdownElement';
+import dayjs from 'dayjs';
+import utc from 'dayjs/plugin/utc';
+dayjs.extend(utc);
+
+@controller
+class TransactionEditElement extends BasePageElement {
+	@targets inputs: Array<InputFieldElement | AppDropdownElement>;
+	@target appForm: AppFormElement;
+	private transactionService: TransactionsService;
+	private transactionTypeService: TransactionTypeService;
+	private walletService: WalletService;
+	walletData: any = null;
+	authService: AuthService;
+	errorMessage: string;
+	private initial: boolean = false;
+	constructor() {
+		super({
+			title: 'Edit Transaction',
+		});
+	}
+	elementConnected = (): void => {
+		this.walletService = new WalletService(this.appMain?.appService);
+		this.transactionService = new TransactionsService(this.appMain?.appService);
+		this.transactionTypeService = new TransactionTypeService(this.appMain?.appService);
+		this.authService = new AuthService(this.appMain.appService);
+		this.walletData = this.getData();
+		this.update();
+		this.getTransaction(this.walletData?.id)
+		if (this.walletData && this.walletData.walletId) {
+			this.setTransactionType();
+		} else {
+			this.initial = true;
+		}
+	};
+
+	getTransaction = async (id) => {
+		try {
+			const response = await this.transactionService.get(id, {
+				embed: 'Wallet,TransactionType'
+			});
+			const wallet = this.appForm.getInput('wallet');
+			if (wallet) {
+				(wallet as AppDropdownElement).setItemValue(response.wallet);
+			}
+			const transactionType = this.appForm.getInput('transactionType');
+			if (transactionType) {
+				(transactionType as AppDropdownElement).setItemValue(response.transactionType);
+			}
+			response.wallet = response.walletId;
+			response.transactionType = response.transactionTypeId;
+			response.transactionDate = dayjs(response.transactionDate).format('YYYY-MM-DD');
+			this.appForm.set(response);
+		} catch (err) {
+
+		}
+	}
+
+	get nameInput(): InputFieldElement | AppDropdownElement {
+		for (const i in this.inputs) {
+			if (this.inputs[i]?.name == 'name') {
+				return this.inputs[i];
+			}
+		}
+	}
+
+	get values(): any {
+		const formObject: any = {};
+		this.inputs.forEach((input: InputFieldElement) => {
+			const inputType = input.inp;
+			formObject[input.name] = (inputType as HTMLInputElement).value;
+		});
+		return formObject;
+	}
+
+	setTransactionType = async () => {
+		this.appForm.isValid = false;
+		try {
+			const response = await this.transactionTypeService.getAll();
+			this.walletData.transactionTypeId = response?.find((type) => type.type == this.walletData.transactionType)?.id;
+		} catch (err) {
+		} finally {
+			this.appForm.isValid = true;
+		}
+	};
+
+	getWallets = async (options): Promise<void> => {
+		try {
+			const response = await this.walletService.getAll(options);
+			return response;
+		} catch (err) {}
+	};
+
+	getTypes = async (options): Promise<void> => {
+		try {
+			const response = await this.transactionTypeService.getAll(options);
+			return response;
+		} catch (err) {}
+	};
+
+	onSubmit = async (values): Promise<void> => {
+		try {
+			if (!this.validate()) {
+				return;
+			}
+
+			const {
+				description: description,
+				wallet: walletId,
+				amount,
+				transactionType: transactionTypeId,
+				transactionDate,
+			} = values;
+
+			const formattedDate = dayjs(transactionDate).utc(true).format();
+
+			const walletData = this.walletData;
+
+			const formData = {
+				description,
+				amount,
+				walletId: walletData && walletData.walletId ? walletData.walletId : walletId,
+				transactionDate: formattedDate,
+				transactionTypeId:
+					walletData && walletData.transactionTypeId ? walletData.transactionTypeId : transactionTypeId,
+			};
+
+			const response = await this.transactionService.put(this.walletData?.id, formData);
+
+			if (response?.id) {
+				this.appMain.triggerTransactionUpdate();
+				this.appMain.pushToast('success', 'Transaction edited successfully!');
+
+				if (walletData.id) {
+					this.appMain?.closeModal();
+				} else {
+					this.routerService.goTo('/history', {
+						walletId: response.walletId,
+					});
+				}
+			}
+		} catch (err) {
+			this.errorMessage = 'Unable to edit transaction!';
+			this.update();
+		}
+	};
+
+	validate(): boolean {
+		let _return = true;
+		this.inputs.forEach((input: InputFieldElement) => {
+			const valid: boolean = input.validate();
+			if (!valid) _return = false;
+		});
+		return _return;
+	}
+
+	render = (): TemplateResult => {
+		const renderInput = (type, name, label, rules, hide?, customAction?) => {
+			if (hide) {
+				return html``;
+			}
+			return html`<input-field
+				data-type="${type}"
+				data-name="${name}"
+				data-label="${label}"
+				data-targets="transaction-edit.inputs"
+				data-rules="${rules}"
+				custom-action="${customAction}"
+			></input-field>`;
+		};
+
+		const renderNumericInput = (pattern, name, label, rules, hide?, customAction?) => {
+			if (hide) {
+				return html``;
+			}
+			return html`<input-field
+				data-type="number"
+				data-pattern="${pattern}"
+				data-name="${name}"
+				data-label="${label}"
+				data-targets="transaction-edit.inputs"
+				data-rules="${rules}"
+				custom-action="${customAction}"
+			></input-field>`;
+		};
+
+		const renderDropdown = (fetch, name, label, rules, hide?) => {
+			if (hide) {
+				return html``;
+			}
+			return html`<app-dropdown
+				data-name="${name}"
+				data-label="${label}"
+				data-targets="transaction-edit.inputs"
+				data-rules="${rules}"
+				data-fetch="${fetch}"
+			></app-dropdown>`;
+		};
+
+		return html`
+			<app-form
+				data-custom="transaction-edit#onSubmit"
+				data-has-cancel="true"
+				data-target="transaction-edit.appForm"
+			>
+				${renderNumericInput('^d+(?:.d{1,2})?$', 'amount', 'Amount', 'required', false)}
+				${renderInput('text', 'description', 'Description', 'required')}
+				${renderInput('date', 'transactionDate', 'Transaction date', 'required')}
+				${renderDropdown(
+					'transaction-edit#getWallets',
+					'wallet',
+					'Wallet',
+					'required',
+					this.walletData && this.walletData.walletId
+				)}
+				${renderDropdown(
+					'transaction-edit#getTypes',
+					'transactionType',
+					'Transaction Type',
+					'required',
+					this.walletData && this.walletData.walletId
+				)}
+				${this.errorMessage ? html`<div>${this.errorMessage}</div>` : html``}
+			</app-form>
+		`;
+	};
+}
+
+export type { TransactionEditElement };

src/styles/app-pagination/app-pagination.scss

@@ -47,13 +47,14 @@ app-pagination {
 					grid-template-columns: repeat(6, 1fr);
 				}
 				&.col-transactions {
-					grid-template-columns: auto 1fr auto;
+					grid-template-columns: 1fr 10fr 1fr 1fr;
 				}
 				td,
 				th {
 					margin: 0 12px;
 					overflow: hidden; // Or flex might break
 					list-style: none;
+					align-self: center;
 					&.--left {
 						text-align: left;
 					}