Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backmerge test to dev #4623

Merged
merged 6 commits into from
Jan 30, 2025
+7 −1
Merged

Backmerge test to dev #4623

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8bd09ff
psp-9893 mayan document queue corrections.
devinleighsmith Jan 23, 2025
f2df7fc
hotfix version bump.
devinleighsmith Jan 29, 2025
17f66b7
Merge pull request #4618 from devinleighsmith/psp-9893
devinleighsmith Jan 29, 2025
88d046e
psp-9666 hotfix: correct loading of partial property ids.
devinleighsmith Jan 29, 2025
d1d708f
Merge pull request #4620 from devinleighsmith/psp-9666
devinleighsmith Jan 29, 2025
e528f60
Merge remote-tracking branch 'upstream/test' into backmerge_test_to_dev
asanchezr Jan 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions source/frontend/src/components/maps/leaflet/Layers/util.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,5 +205,10 @@ describe('mapUtils tests', () => {
const cql = toCqlFilterValue({ PID: '12345678', PIN: '54321' }, { forceExactMatch: true });
expect(cql).toBe("PID = '12345678' AND PIN='54321'");
});

it('if property id is specified, exact search should always be used', () => {
const cql = toCqlFilterValue({ PROPERTY_ID: '1' });
expect(cql).toBe("PROPERTY_ID = '1'");
});
});
});
3 changes: 2 additions & 1 deletion source/frontend/src/hooks/layer-api/layerUtils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export const toCqlFilterValue = (object: Record<string, string>, flags?: IWfsCql
} else if (
((key === 'PID' || key === 'PID_PADDED' || key === 'PID_NUMBER') &&
object[key]?.length === 9) ||
flags?.forceExactMatch
flags?.forceExactMatch ||
key === 'PROPERTY_ID'
) {
cql.push(`${key} = '${object[key]}'`);
} else {
Expand Down
Loading