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

Feature/go 368 filters #249

Open
wants to merge 44 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
473af6d
Pass filter via url params and tweak message threads table title base…
alhafoudh Dec 11, 2023
914d2fb
Tweak title text
alhafoudh Dec 11, 2023
0a03182
Implement pinning and unpinning filters in sidebar
alhafoudh Dec 11, 2023
a6b44f0
Remove dependency on tailwindcss-scoped-groups since it is a native t…
alhafoudh Dec 12, 2023
be94fbe
Implement filter sorting
alhafoudh Dec 13, 2023
d8e29ff
Replace bars icon with grip icon
alhafoudh Dec 13, 2023
5b0b7a3
Tweak styles
alhafoudh Jan 4, 2024
2fcbce2
Merge branch 'main' into feature/GO-368-filters
alhafoudh Jan 4, 2024
8d1e4e9
Fix FlashComponent renamed namespace
alhafoudh Jan 4, 2024
8bfd59d
Update schema.rb and tenant.rb annotation
alhafoudh Jan 4, 2024
44d03c7
User visibility settings for Tags, Filters v1
stage-rl Jan 8, 2024
f6108e5
Merge branch 'main' into feature/GO-368-filters
alhafoudh Feb 28, 2024
3281e2e
Resolve merge conflict
alhafoudh Feb 28, 2024
34e344b
Merge branch 'feature/tags_user_visibility_settings' into feature/GO-…
alhafoudh Feb 28, 2024
a11f431
Fix db schema
alhafoudh Feb 28, 2024
9a6425f
Fix wrong merge
alhafoudh Feb 28, 2024
d07a6a0
Merge branch 'refs/heads/main' into feature/GO-368-filters
alhafoudh May 23, 2024
8bcf810
Remove pinning from sidebar
alhafoudh May 23, 2024
adf8361
Tweak sidebar for filter list
alhafoudh May 23, 2024
ef6105c
Rename visibility model to UserItemVisibility and add reordering
alhafoudh May 23, 2024
87c0bd8
Reorganize filtering and enable TagFilter usage
alhafoudh Jun 24, 2024
7cc6801
Make first filter default
alhafoudh Jul 6, 2024
3783ec4
Redirect to default filter and fix active sidebar item tracking
alhafoudh Jul 6, 2024
5935dd4
Add buttons with icons for up down
alhafoudh Jul 6, 2024
cf6ebfa
Make Filter author nullable
alhafoudh Sep 10, 2024
6c4313f
Remove binding.pry
alhafoudh Sep 10, 2024
6a69302
Merge branch 'main' into feature/GO-368-filters
Sep 13, 2024
41f947a
Update filters and tags views, forms, icons, ..
Sep 13, 2024
ab4b919
Refactor routes
Sep 13, 2024
6afd341
Update filter editable scope
Sep 16, 2024
01240ec
Fix filter fixtures
Sep 16, 2024
c845d7b
FGRA-9973: Update tests
Sep 16, 2024
715141c
Update filters creation, scope, components
Sep 20, 2024
15dfcdd
Update tests
Sep 20, 2024
901e018
Try fix random failing notifications_test
Sep 20, 2024
25c6d2a
Merge branch 'main' into feature/GO-368-filters
Sep 20, 2024
d0bf118
Change default_max_wait_time for Capybara
Sep 20, 2024
699fc2f
Update notifications_test
Sep 20, 2024
6f5ba24
Fix migration and filtering by tag filters
Sep 25, 2024
29cc358
Remove is_pinned from filters
Sep 25, 2024
0776ad3
Refactoring after review
Sep 30, 2024
84646a6
Refactoring after review
Nov 15, 2024
21ef1b7
Merge branch 'main' into feature/GO-368-filters
Nov 17, 2024
8824a1f
Basic fix
Nov 17, 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
FGRA-9973: Update tests
Tomáš Durčák committed Sep 16, 2024
commit c845d7bc0206d35311d8f18910e5a3c8518d3a92
16 changes: 12 additions & 4 deletions test/fixtures/filters.yml
Original file line number Diff line number Diff line change
@@ -4,22 +4,30 @@ one:
tenant: ssd
author: basic
name: With General text
query: general
position: 1
type: 'FulltextFilter'
type: 'TagFilter'
tag: solver_everything

two:
tenant: ssd
author: basic
name: With General text
query: general
position: 2
type: 'FulltextFilter'

three:
tenant: ssd
author: admin
name: With Legal text
query: Legal
position: 2
position: 3
type: 'FulltextFilter'

solver_one:
tenant: solver
author: solver_other
name: Urgent
query: urgent
position: 3
position: 4
type: 'FulltextFilter'
8 changes: 7 additions & 1 deletion test/helpers/auth_helper.rb
Original file line number Diff line number Diff line change
@@ -6,7 +6,13 @@ def sign_in_as(user_fixture_name)

click_on "Prihlásiť cez Google"

assert_text "Správy v schránke"
filter = Filter.where(tenant_id: users(user_fixture_name).tenant).order(:position).first

if filter
assert_text "Správy z filtra '#{filter.name}'"
else
assert_text "Správy v schránke"
end
end

def mock_omni_auth_with_user(user_fixture_name)