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.

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

feat: Multi filters support #79

Merged
merged 56 commits into from
Jan 3, 2024
Merged
Changes from 1 commit
Commits
Show all changes
56 commits
Select commit Hold shift + click to select a range
8025deb
basic filter changes
sagarnaikjuspay Dec 3, 2023
1b339c1
added helper funtions
sagarnaikjuspay Dec 3, 2023
afb3984
code refactor
sagarnaikjuspay Dec 3, 2023
4bade11
intitial filters settings
sagarnaikjuspay Dec 3, 2023
9f030a6
update component fix
sagarnaikjuspay Dec 3, 2023
f7ec1bb
code refactor
sagarnaikjuspay Dec 3, 2023
e8263be
orders refactor
sagarnaikjuspay Dec 3, 2023
7fbc0ee
remote filters fix
sagarnaikjuspay Dec 4, 2023
d387826
analytics filters fix
sagarnaikjuspay Dec 4, 2023
546d3ef
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 7, 2023
ae5bcb1
filter dict fix
sagarnaikjuspay Dec 7, 2023
72d6afc
basic version
sagarnaikjuspay Dec 7, 2023
e825959
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 7, 2023
53244c7
code refactor
sagarnaikjuspay Dec 7, 2023
3f01f88
merged main
sagarnaikjuspay Dec 7, 2023
e96a1f5
code refactor
sagarnaikjuspay Dec 7, 2023
5743dde
more code refactor
sagarnaikjuspay Dec 7, 2023
7379a37
more code refactor
sagarnaikjuspay Dec 7, 2023
13aefa2
init filter change
sagarnaikjuspay Dec 7, 2023
3dc42cf
code refactor
sagarnaikjuspay Dec 8, 2023
28611c2
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 10, 2023
6fbcdbd
chore: code refactor
sagarnaikjuspay Dec 10, 2023
17b9106
chore: code refactor
sagarnaikjuspay Dec 10, 2023
a1c1f98
chore: code refactor
sagarnaikjuspay Dec 10, 2023
47990ad
chore: removed auto apply for remote filters
sagarnaikjuspay Dec 10, 2023
e1cf266
chore: code refactor
sagarnaikjuspay Dec 10, 2023
32a6d06
chore: merged latest code
sagarnaikjuspay Dec 11, 2023
fb177bd
chore: code refactor
sagarnaikjuspay Dec 11, 2023
10115d2
chore: code refactor
sagarnaikjuspay Dec 11, 2023
90be0f1
chore: some code
sagarnaikjuspay Dec 11, 2023
e08549c
chore: fixed the clear filters
sagarnaikjuspay Dec 11, 2023
c06d751
chore: filters reload isseu fixed
sagarnaikjuspay Dec 11, 2023
c6a6b7b
chore: merged latest code
sagarnaikjuspay Dec 14, 2023
292726f
refactor: removed unused code
sagarnaikjuspay Dec 14, 2023
7818e82
Merge branch 'multi-filters-support' of github.com:juspay/hyperswitch…
sagarnaikjuspay Dec 14, 2023
79603b5
chore: fixed the bug
sagarnaikjuspay Dec 14, 2023
f62a323
feat: added session history
sagarnaikjuspay Dec 14, 2023
37aca6e
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 19, 2023
02a6964
refactor: removed dead code
sagarnaikjuspay Dec 19, 2023
c9b047d
chore: merged latest main
sagarnaikjuspay Dec 20, 2023
313db53
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 20, 2023
b3a7274
chore: disable session storage
sagarnaikjuspay Dec 21, 2023
ed68a32
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 21, 2023
129b23d
chore: merged latest branch
sagarnaikjuspay Dec 27, 2023
ab6bde9
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 27, 2023
2bc1629
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 27, 2023
6d4e335
chore: code refactor
sagarnaikjuspay Dec 27, 2023
ea69695
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 28, 2023
4d96e8b
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 28, 2023
fcf67c1
Merge branch 'multi-filters-support' of github.com:juspay/hyperswitch…
sagarnaikjuspay Dec 28, 2023
69b6fff
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 28, 2023
409912a
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Dec 28, 2023
a311bfe
chore: some code refactor
sagarnaikjuspay Dec 28, 2023
3704f20
Merge branch 'main' into multi-filters-support
sagarnaikjuspay Jan 2, 2024
91c7340
chore: merged latest branch
sagarnaikjuspay Jan 2, 2024
ae03d50
chore: merged latest branch
sagarnaikjuspay Jan 3, 2024
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
Prev Previous commit
Next Next commit
chore: code refactor
sagarnaikjuspay committed Dec 10, 2023

Verified

This commit was signed with the committer’s verified signature.
sagarnaikjuspay Sagar naik
commit 6fbcdbd4cf3ee6006097953c5adb0ff8af3e6d3c
23 changes: 0 additions & 23 deletions src/components/FilterUtils.res
Original file line number Diff line number Diff line change
@@ -1,26 +1,3 @@
let generateDefaultUrl = dict => {
dict
->Js.Dict.entries
->Belt.Array.keepMap(entry => {
let (key, val) = entry

let strValue = RemoteFiltersUtils.getStrFromJson(key, val)
if strValue !== "" {
Some(`${key}=${strValue}`)
} else {
None
}
})
->Js.Array2.joinWith("&")
}

let updateURLWithDefaultFilter = (~path, ~filterParam, ~filterString) => {
if path->Js.String2.length > 0 && filterParam->Js.String2.length == 0 {
let finalUrl = `${path}?${filterString}`
RescriptReactRouter.replace(finalUrl)
}
}

let useFiltersObject = () => {
open HyperswitchAtom
filtersAtom