Feat: Payments buttons filter by johnkuney · Pull Request #991 · PayButton/paybutton-server

johnkuney · 2025-03-27T15:04:41Z

Related to #972

Description

Add a multi select button filter on the payments page that will only show payments from those buttons

Test plan

Run the app and check out the payments page and mess with the filters

Klakurka

I get an error on this branch when I refresh any of the pages (with F5) but I feel like it's probably some weird local env thing so going to ignore it (will copy it here though just in case):

Klakurka

Filter isn't apply to CSV generation.

lissavxo · 2025-03-31T12:08:49Z

pages/api/payments/count/index.ts

+        amount: { gt: 0 }
+      }
+
+      const totalCount = await prisma.transaction.count({


this logic should be in the service layer

lissavxo · 2025-03-31T12:12:48Z

services/transactionService.ts

  const orderDescString: Prisma.SortOrder = orderDesc ? 'desc' : 'asc'
+
  if (orderBy === 'buttonDisplayDataList') {
    return await getPaymentsByUserIdOrderedByButtonName(


filter by buttons in getPaymentsByUserIdOrderedByButtonName is missing, this way filters will not work in the order by button

johnkuney · 2025-04-01T04:00:30Z

Okay think I got those sorted

chedieck · 2025-04-01T16:35:46Z

pages/api/payments/count/index.ts

+      buttonIds = (req.query.buttonIds as string).split(',')
+    }
+
+    if ((buttonIds != null) && buttonIds.length > 0) {


Should be !== undefined, not != null.
!= null works but leads the reader to consider that the variable can be null OR undefined, which is not the case, since it can only be undefined.

chedieck · 2025-04-01T16:57:13Z

services/transactionService.ts

-      },
-      amount: {
-        gt: 0
+  // Build the base where clause


I don't think any of these comments are useful

chedieck · 2025-04-01T16:57:54Z

services/transactionService.ts

+  }
+
+  // If buttonIds is provided, add a nested filter on address.paybuttons
+  if ((buttonIds != null) && buttonIds.length > 0) {


!== undefined

chedieck · 2025-04-01T17:01:25Z

services/transactionService.ts

-        networkId: {
-          in: networkIds ?? Object.values(NETWORK_IDS)
-        }
+  const whereClause: any = {


Prisma.TransactionWhereInput

chedieck · 2025-04-01T17:01:47Z

services/transactionService.ts

-      amount: {
-        gt: 0
+  // Build the base where clause
+  const whereClause: any = {


Better to use Prisma.TransactionWhereInput instead of any.

chedieck · 2025-04-01T17:07:49Z

services/transactionService.ts

+    }
+  }
+
+  if (Array.isArray(buttonIds) && buttonIds.length > 0) {


In the function above we had similar code but with if ((buttonIds != null), which was basically checking if buttonIds !== undefined. This Array.isArray(buttonIds) achieves the same result but with in a different way, which makes what it is doing a little less obvious and harder to read.

chedieck · 2025-04-01T17:10:21Z

services/transactionService.ts

+  userId: string,
+  buttonIds: string[]
+): Promise<number> => {
+  const whereClause: any = {


No need to create this constant

chedieck

Had some minor code complaints, but I decided to fix them myself.

I noticed that changing the filtered buttons makes the order reset to "by Date": would be nice to have it stay in place (e.g. "by Amount" ascendent, if that was selected)

johnkuney · 2025-04-01T19:04:24Z

Cool thanks for fixing those. Sorting should be persistent now when filtering

chedieck

Now indeed the order is maintained after changing the paybuttons to filter with, but the page is not reset.

Meaning if I select two buttons: one with a lot of txs and one with only a few, and go to page 25 of payments, and then unselect the one with a lot of txs leaving only the one with a few, the page stays in 25 (which doesn't exist)

Would be nice if it would go back to the first one when some change is made to the paybuttons to filter with.

johnkuney · 2025-04-03T15:35:54Z

ah yes good catch, should be good now

Klakurka

Let's change "Filter by PayButton" to "Filter by Button" to keep the wording consistent in the UI.
Maybe we can make a new task for improving the CSV export filename when exporting a filtered set of buttons.

Looks good to me otherwise.

johnkuney · 2025-04-06T01:18:12Z

Okay updated that label
I did also see that error you sent in telegram about "unexpected token '<'...." Yeah, same thing if I create a new button and then try to filter by it right away. May require some investigation...

johnkuney · 2025-04-06T01:24:22Z

Actually think I got it

Klakurka

Suggestion on what to do when we run into that error?

@chedieck

johnkuney · 2025-04-25T13:47:55Z

@chedieck any updates here?

chedieck · 2025-04-30T14:39:00Z

Since I can't seem to reproduce this error, I left a commit with some logs to understand better what is erroring. So far I can't tell if this would happen in prod or not since I am not being able to reproduce.

Klakurka · 2025-05-09T19:14:50Z

I got this error when sorting a few times right after adding a few new buttons:

Klakurka

Let's just go ahead with this and if there's issues in prod then we can tackle them separately.

johnkuney added 3 commits March 26, 2025 17:38

add filter for paybuttons on payments page

c1b64b7

add loading state to table

ddc0e94

fix margin

b0a6800

johnkuney requested a review from chedieck March 27, 2025 15:04

Klakurka self-requested a review March 28, 2025 01:38

Klakurka approved these changes Mar 28, 2025

View reviewed changes

Klakurka requested changes Mar 31, 2025

View reviewed changes

lissavxo requested changes Mar 31, 2025

View reviewed changes

support buttonIds filter in CSV export, endpoint modifications

a6100dc

lissavxo previously approved these changes Apr 1, 2025

View reviewed changes

chedieck requested changes Apr 1, 2025

View reviewed changes

refactor: code redability

6708149

chedieck dismissed lissavxo’s stale review via 6708149 April 1, 2025 17:18

chedieck self-requested a review April 1, 2025 17:18

chedieck requested changes Apr 1, 2025

View reviewed changes

chedieck mentioned this pull request Apr 1, 2025

Feat/button filter payments #989

Closed

maintain sortby column when filter changes

fe50624

chedieck self-requested a review April 2, 2025 13:06

chedieck requested changes Apr 2, 2025

View reviewed changes

go to page 0 when filters change, ui tweak

6f17f70

Klakurka requested changes Apr 5, 2025

View reviewed changes

copy edit

f87b018

fix error on new button creation

417f471

Klakurka reviewed Apr 6, 2025

View reviewed changes

wip

a625196

update csv filename to reflect filters and time stamp

b994c62

Klakurka approved these changes May 13, 2025

View reviewed changes

Klakurka merged commit 06e5e3a into master May 13, 2025
2 checks passed

Conversation

johnkuney commented Mar 27, 2025

Description

Test plan

Uh oh!

Klakurka left a comment

Choose a reason for hiding this comment

Uh oh!

Klakurka left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

johnkuney commented Apr 1, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

chedieck left a comment

Choose a reason for hiding this comment

Uh oh!

johnkuney commented Apr 1, 2025

Uh oh!

chedieck left a comment

Choose a reason for hiding this comment

Uh oh!

johnkuney commented Apr 3, 2025

Uh oh!

Klakurka left a comment

Choose a reason for hiding this comment

Uh oh!

johnkuney commented Apr 6, 2025

Uh oh!

johnkuney commented Apr 6, 2025

Uh oh!

Klakurka left a comment

Choose a reason for hiding this comment

Uh oh!

johnkuney commented Apr 25, 2025

Uh oh!

chedieck commented Apr 30, 2025

Uh oh!

Klakurka commented May 9, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Klakurka left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Klakurka commented May 9, 2025 •

edited

Loading