fix: error occurs when searching for anything containing a full stop. #1463 by bashanlam · Pull Request #1196 · UserOfficeProject/user-office-core

bashanlam · 2025-09-24T11:46:58Z

Closes UserOfficeProject/issue-tracker#1463

Description

This PR fix the error occurs when searching for anything containing a full stop (e.g. bam.de) while using the instrument scientist role.

Motivation and Context

Fix the error occurs when searching for anything containing a full stop (e.g. bam.de) while using the instrument scientist role.

Changes

Update the data source to fix the error occurs when searching for anything containing a full stop (e.g. bam.de) while using the instrument scientist role.

How Has This Been Tested?

Manually

Tests included/Docs Updated?

I have added tests to cover my changes.
All relevant doc has been updated

yoganandaness · 2025-09-24T15:27:48Z

      .orderBy('proposal_pk', 'desc')
      .modify((query) => {
        if (filter?.text) {
+          const jsonPath = `$[*].name ? (@.type() == "string" && @ like_regex "${filter.text}" flag "i")`;


@bashanlam

This is nice. I was thinking of doing a generic fix.

https://github.com/UserOfficeProject/user-office-core/blob/develop/apps/backend/src/datasources/postgres/databaseExtensions.ts

Here we have added special character escaping for non json columns. We can add one for json columns and use it across. What do you think?

This function can be applied to the default ProposalDataSource as well, if you could. Else we from ESS can take it up.

@bashanlam

This is nice. I was thinking of doing a generic fix.

https://github.com/UserOfficeProject/user-office-core/blob/develop/apps/backend/src/datasources/postgres/databaseExtensions.ts

Here we have added special character escaping for non json columns. We can add one for json columns and use it across. What do you think?

This function can be applied to the default ProposalDataSource as well, if you could. Else we from ESS can take it up.

I agree with your generic fix for this bug — it’s better than our one-off solution. Please let us know once your PR is merged.

@bashanlam

This is nice. I was thinking of doing a generic fix.

https://github.com/UserOfficeProject/user-office-core/blob/develop/apps/backend/src/datasources/postgres/databaseExtensions.ts

Here we have added special character escaping for non json columns. We can add one for json columns and use it across. What do you think?

This function can be applied to the default ProposalDataSource as well, if you could. Else we from ESS can take it up.

@yoganandaness A generic special character escaping for json column is added.

simonfernandes

Looks nice! There are a couple of places in PostgresProposalDataSource that could also be updated with the new functions.

Reviewed Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

bashanlam · 2025-10-08T14:07:10Z

Looks nice! There are a couple of places in PostgresProposalDataSource that could also be updated with the new functions.

I completed testing and confirmed the new function operates solely within the current place.

simonfernandes · 2025-10-08T14:51:36Z

@bashanlam I meant that you can also add these utility functions to two places in the PostgresProposalDataSource. It will fix the same problem or at least make that code neater and more understandable.

…eJsonbPathLike function.

bashanlam · 2025-10-10T14:49:29Z

@yoganandaness We've updated PostgresProposalDataSource to include the whereJsonbPathLike and orWhereJsonbPathLike functions. Could you please verify and review if this is working correctly for ESS? Thanks.

Co-authored-by: Simon Fernandes <simon.fernandes@stfc.ac.uk>

yoganandaness

More suggestions to make it more generic

Currently, when doing json search, we are targetting only the field name. However, if we want to search other fields, we can pass it as parameter
% is not needed for json search unlike normal search. Hence it can be removed

yoganandaness · 2025-10-14T11:33:51Z

@bashanlam Was also wondering, if we could attach e2e for Instrument name search in Proposals table

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

yoganandaness

Looks good to me. Appreciating an e2e.

#1463: Fix Proposal Table View Query Err

4be152e

bashanlam requested review from a team, Junjiequan and simonfernandes and removed request for a team September 24, 2025 11:46

bashanlam added the review: please label Sep 24, 2025

bashanlam requested a review from a team as a code owner September 24, 2025 11:47

bashanlam requested review from Scott-James-Hurley and deepaksftc and removed request for a team September 24, 2025 11:47

yoganandaness requested changes Sep 24, 2025

View reviewed changes

bashanlam and others added 2 commits October 6, 2025 16:48

Merge branch 'develop' into 1463-proposal-table-view-query-err

ddb03cc

Add generic special character escaping for json column.

a7706b8

bashanlam requested a review from yoganandaness October 8, 2025 10:50

yoganandaness requested changes Oct 8, 2025

View reviewed changes

Comment thread apps/backend/src/datasources/postgres/databaseExtensions.ts Outdated

simonfernandes reviewed Oct 8, 2025

View reviewed changes

Update apps/backend/src/datasources/postgres/databaseExtensions.ts

c8d0035

Reviewed Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

yoganandaness approved these changes Oct 8, 2025

View reviewed changes

Update PostgresProposalDataSource to use whereJsonbPathLike or orWher…

a33df85

…eJsonbPathLike function.

Merge branch 'develop' into 1463-proposal-table-view-query-err

bc5e121

bashanlam requested review from simonfernandes and yoganandaness October 10, 2025 14:58

simonfernandes reviewed Oct 10, 2025

View reviewed changes

Comment thread apps/backend/src/datasources/postgres/databaseExtensions.ts Outdated

Update apps/backend/src/datasources/postgres/databaseExtensions.ts

4bb8deb

Co-authored-by: Simon Fernandes <simon.fernandes@stfc.ac.uk>

bashanlam requested a review from simonfernandes October 13, 2025 08:44

simonfernandes approved these changes Oct 13, 2025

View reviewed changes

Merge branch 'develop' into 1463-proposal-table-view-query-err

d260580

yoganandaness requested changes Oct 14, 2025

View reviewed changes

bashanlam and others added 9 commits October 14, 2025 13:32

Search field as input parameter

cb2db83

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

37e86b8

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

215a397

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

1f20149

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

14c4cb5

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

15230b5

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

e00b02d

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Search field as input parameter

80de0a6

Co-authored-by: Yoganandan Pandiyan <132274772+yoganandaness@users.noreply.github.com>

Fix local site error.

5cff841

bashanlam requested a review from yoganandaness October 14, 2025 13:18

Remove unnecessary %.

957ff8c

yoganandaness approved these changes Oct 14, 2025

View reviewed changes

bashanlam merged commit f9defb6 into develop Oct 15, 2025
36 of 37 checks passed

bashanlam deleted the 1463-proposal-table-view-query-err branch October 15, 2025 08:19

Uh oh!

Conversation

bashanlam commented Sep 24, 2025

Description

Motivation and Context

Changes

How Has This Been Tested?

Tests included/Docs Updated?

Uh oh!

yoganandaness Sep 24, 2025

Choose a reason for hiding this comment

Uh oh!

bashanlam Sep 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bashanlam Oct 8, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

simonfernandes left a comment

Choose a reason for hiding this comment

Uh oh!

bashanlam commented Oct 8, 2025

Uh oh!

simonfernandes commented Oct 8, 2025

Uh oh!

bashanlam commented Oct 10, 2025

Uh oh!

Uh oh!

yoganandaness left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

yoganandaness commented Oct 14, 2025

Uh oh!

yoganandaness left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

bashanlam Sep 25, 2025 •

edited

Loading