Feature/go 368 filters #249

alhafoudh · 2023-12-15T07:49:28Z

No description provided.

…d on filter or query

…ailwind functionality

jsuchal · 2023-12-15T16:37:50Z

app/components/icons/grip_component.rb

@@ -0,0 +1,6 @@
+class Icons::GripComponent < ViewComponent::Base


Ukazalo sa, ze lepsi sposob je cez Common::IconComponent. kukni tam.

jsuchal · 2023-12-15T16:38:58Z

app/components/t_w/sidebar_menu_item_component.html.erb

  <% end %>
-  <%= @name %>
-<% end %>
+  <%= link_to \


ooo toto nepoznam \ naucil som sa.

jsuchal · 2023-12-15T16:40:08Z

app/controllers/filters_controller.rb

    if @filter.save
      flash[:notice] = 'Filter bol úspešne vytvorený'
      if params[:to] == 'search'
-        redirect_to message_threads_path(q: @filter.query)
+        redirect_to helpers.filtered_message_threads_path(filter: @filter)


toto nejde bez helpers?

Bez hanby by som to dal include do controllera

jsuchal · 2023-12-15T16:41:10Z

app/controllers/filters_controller.rb

+    end
+
+    Filter.transaction do
+      filters.map.with_index do |filter, i|


each_with_index mozes tiez ak nepotrbujes vysledok

jsuchal · 2023-12-15T16:41:54Z

app/controllers/filters_controller.rb

+      end
+    end
+
+    redirect_back fallback_location: filters_path


Toto je turbovina a vieme to lepsie, dnes sme @mirrec hutali 15 sposobov ako a asi mame ako treba. Pozri ako je v threadscontroller spraveny rename.

jsuchal · 2023-12-15T16:43:00Z

app/javascript/controllers/sortable_controller.js

+    })
+
+    this.sortable.on('drag:stopped', async (e) => {
+      // As of now, this is the only way to submit a PATCH request with Rails so Turbo updates the pages without a full reload


myslim, ze ked mu posles format: :turbo_stream tak pojde aj inak.

app/models/fulltext_filter.rb

app/models/searchable/query_builder.rb

jsuchal · 2023-12-15T16:45:46Z

config/routes.rb

+    end
+
+    collection do
+      patch :sort


ak je jeden davam to onliner patch :sort, on: :collection

jsuchal · 2023-12-15T16:46:59Z

app/models/fulltext_filter.rb

+#  tag_id     :bigint
+#  tenant_id  :bigint           not null
+#
+class FulltextFilter < Filter


Fulltext mi evokuje, ze to je ten text ale asi prezijem. Ak by sme mali ist konvenciou zo stitkov tak je to SimpleFilter ale to asi nie je :)

app/models/tag_filter.rb

# Conflicts: # app/components/message_threads_bulk_actions_component.html.erb # app/components/message_threads_bulk_actions_component.rb # app/components/message_threads_table_component.html.erb # app/components/message_threads_table_component.rb # app/lib/sidebar_menu.rb # app/views/message_threads/index.html.erb # config/routes.rb # db/schema.rb

# Conflicts: # app/components/message_threads_bulk_actions_component.html.erb # app/components/message_threads_bulk_actions_component.rb # app/components/message_threads_table_component.html.erb # app/components/t_w/top_navigation_component.rb # app/controllers/application_controller.rb # app/views/message_threads/index.html.erb

…368-filters # Conflicts: # app/components/common/icon_component.rb # app/controllers/application_controller.rb # app/lib/sidebar_menu.rb # db/schema.rb

# Conflicts: # app/components/common/icon_component.rb

jsuchal · 2024-07-08T09:30:40Z

app/controllers/message_threads_controller.rb

@@ -35,7 +35,9 @@ def index
    if params[:filter_id].present?
      @filter = policy_scope(Filter, policy_scope_class: FilterPolicy::ScopeShowable).find_by(id: params[:filter_id])
    else
-      @filter = Current.user.visible_filters.first
+      if Current.user.visible_filters.any?


Toto sa mi uplne nepozdava, ze tu davame redirect. v podstate sa nebude dat linkovat root (vzdy to spravi redirect). Nedava skor zmysel nastavit ten filter a nerobit redirect?

Ok, prerobim

jsuchal · 2024-07-08T09:31:06Z

@alhafoudh mas tu nejake konflikty este

jsuchal · 2024-09-23T13:29:47Z

Dal som tu aj @luciajanikova na review, pozriem aj ja.

app/models/tag.rb

luciajanikova · 2024-09-24T15:32:23Z

Asi je nieco zle, vo vsetkych filtroch vidim rovnake vlakna. Skusala som spustit migracie na uz predtym existujucej DB a takto to vyzera. Na cistonovej DB sa zda, ze to funguje podla ocakavani. Predpokladam teda, ze migracia existujucich tagov na filtre nebude ok. @durcak

Screen.Recording.2024-09-24.at.16.38.45.mov

luciajanikova

Zatial len nejake drobnosti, co som si vsimla. Pre mna je blocker, ze mi filtrovanie pri lokalnom testovani nefunguje. Az potom budem vediet este hlbsie pozriet.

luciajanikova · 2024-09-24T15:27:32Z

db/migrate/20240910112424_change_author_id_null_on_filters.rb

@@ -0,0 +1,5 @@
+class ChangeAuthorIdNullOnFilters < ActiveRecord::Migration[7.1]
+  def change
+    change_column_null :filters, :author_id, true


Tato migracia by mala byt asi skor ako db/migrate/20240624114024_create_tag_filters_from_tags.rb?
Lokalne som skusala a spominana migracia mi vyfailovala na tom, ze author_id bol nil (ActiveRecord::NotNullViolation).

luciajanikova · 2024-09-24T16:26:52Z

app/models/filter.rb

+  scope :not_pinned, -> { where(is_pinned: false) }
+  scope :visible_for, -> (user) { joins(:user_filter_visibilities)
+    .where(user_filter_visibilities: { visible: true, user: user})
+    .where(is_pinned: false) }


Aky vyznam ma tento atribut is_pinned? Ak spravne pozeram, tak defaultne je false, ale nevidim, ze by sa niekedy tato hodnota menila.

Toto som dal prec, s Ahmedom sme sa dohodli, ze to netreba, bol to len nejaky povodny pokus o nieco.

durcak · 2024-09-25T13:52:59Z

@luciajanikova fixol som to filtrovanie, sorry netestoval som to dobre na starsich datach a zdalo sa mi, ze to funguje. Uz by to malo byt ok.

luciajanikova · 2024-09-26T14:17:56Z

Ked si vytvorim novy Tag, tak TagFilter k nemu je defaultne schovany, takze ho nevidim v lavom menu. Ocakavala by som opak, ked si vytvorim nejaky novy Tag, defaultne by som chcela aby sa mi pridal do menu a schovam si ho iba v pripade potreby. Co myslis @jsuchal?

durcak · 2024-09-26T14:21:46Z

On prave pisal v chate v threade k tomuto, ze novy tag filter nema byt hned viditelny. Viditelne maju byt hned len novo vytvorene fulltext filtre.

luciajanikova · 2024-09-26T14:22:13Z

On prave pisal v chate v threade k tomuto, ze novy tag filter nema byt hned viditelny. Viditelne maju byt hned len novo vytvorene fulltext filtre.

Okay, dakujem za rychle info.

durcak · 2024-09-26T14:25:05Z

Mne este napadlo, ci nechcem aj FulltextTagFilter, tzn. ze ked mam zakliknuty nejaky tag filter a k nemu pridam query filter a dam ulozit ako novy filter tak sa bude filtrovat aj query a tag.

luciajanikova

Za mna inak asi ok, preklikala som sa cez to, vyzera to byt v poriadku. Trochu iba bojujem s tym, ze novy TagFilter nie je defaultne viditelny v lavom menu. Z mojho pohladu, ked si idem vytvarat Tag, tak chcem pomocou neho filtrovat spravy, rychlo najst tie, ktore su tagom oznacene. Takze chcem aby bol viditelny. Ak ho by default neuvidim, asi by ma to zmiatlo. Aky mas na to ty pohlad @jsuchal, ked preferujes default schovany?

app/components/filters/filter_form_component.html.erb

app/components/icons/grip_component.rb

app/components/icons/star_component.rb

app/components/admin/tags/tag_form_component.html.erb

jsuchal

@luciajanikova toto bude mozno potrebovat tvoje pozretie tiez a skusenie lokalne, ze ako sa to sprava. Po FS mergi.

jsuchal · 2024-10-29T19:47:14Z

app/components/common/down_button_component.html.erb

@@ -0,0 +1,3 @@
+<div class="flex justify-center items-center flex-grow-0 flex-shrink-0 relative overflow-hidden gap-2.5 px-3.5 py-2.5 rounded-md bg-white border border-gray-300 hover:bg-gray-100">


Tu sme sa dohodli, ze uz pouzivame IconComponent a nevyrabame komponenty per-ikona.

jsuchal · 2024-10-29T19:47:42Z

app/components/common/up_button_component.rb

@@ -0,0 +1,4 @@
+module Common


jsuchal · 2024-10-29T19:50:24Z

app/components/layout/filter_list_component.rb

+  def icon_for(filter)
+    return Common::IconComponent.new(filter.icon) if filter.icon.present?
+
+    if filter.tag_id.present?


Suggested change

if filter.tag_id.present?

if filter.tag.present?

jsuchal · 2024-10-29T19:53:06Z

app/components/message_threads_table_component.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col justify-stretch items-stretch gap-4 sm:p-4">
  <div class="flex flex-col justify-stretch items-stretch sm:rounded-md bg-white sm:border sm:border-gray-200" data-controller="form all-checkboxes">
-    <%= render MessageThreadsBulkActionsComponent.new(ids: [], filter: @filter, filter_subscription: @filter_subscription, signable: Current.user.signer?) %>
+    <%= render MessageThreadsBulkActionsComponent.new(ids: [], filter:, query:, filter_subscription:, signable: Current.user.signer?) %>


Ak su toto nepovinne parametre tak ich tam neposielajme, ale zvlastne ze to nepotrebujeme.

niesu nepovinne, ale ide zase o Shorthand Hash Syntax

jsuchal · 2024-10-29T19:55:08Z

app/components/settings/user_filter_visibilities/list_row_component.html.erb

+    <%= form_with model: [:settings, Current.user.user_filter_visibilities.new(filter: @filter)], method: :post do |form| %>
+      <%= form.hidden_field :filter_id, value: @filter.id %>
+      <%= form.hidden_field :visible, value: [email protected] %>
+      <%= form.button class: "#{@visibility.hidden ? "bg-gray-200" : "bg-indigo-600"} relative inline-flex h-6 w-11 flex-shrink-0 cursor-pointer rounded-full border-2 border-transparent transition-colors duration-200 ease-in-out focus:outline-none focus:ring-2 focus:ring-indigo-600 focus:ring-offset-2", role: :switch, aria: { checked: @visibility.hidden.to_s } do %>


existuje takyto fajny helper https://www.bigbinary.com/blog/rails-6-1-introduces-class_names-helper

jsuchal · 2024-10-29T19:55:41Z

app/components/settings/user_filter_visibilities/list_row_component.html.erb

+    <% end %>
+    <%= form_with model: [:move_higher, :settings, @visibility], method: :post do |form| %>
+      <%= form.button do %>
+        <%= render Common::UpButtonComponent.new %>


pouzit genericky komponent

jsuchal · 2024-10-29T19:55:51Z

app/components/settings/user_filter_visibilities/list_row_component.html.erb

+    <% end %>
+    <%= form_with model: [:move_lower, :settings, @visibility], method: :post do |form| %>
+      <%= form.button do %>
+        <%= render Common::DownButtonComponent.new %>


pouzit genericky komponent

jsuchal · 2024-10-29T20:02:43Z

app/policies/filter_policy.rb

+  def pin?
+    is_author_current_user?
+  end
+
+  def unpin?
+    pin?
+  end


Toto sa niekde pouziva?

asi nie, davam prec

jsuchal · 2024-10-29T20:05:27Z

Gemfile

@@ -39,6 +39,7 @@ gem 'jwt'
 gem 'stimulus-rails'
 gem 'jsbundling-rails'
 gem 'pdf-reader'
+gem "acts_as_list", "~> 1.1"


pin na verziu nerobime pokym naozaj nie je treba

luciajanikova · 2024-11-16T16:50:30Z

Toto uz asi len mergnut s mainom a pretestovat? @jsuchal

jsuchal · 2024-11-16T18:52:09Z

@luciajanikova ano

durcak · 2024-11-17T11:30:57Z

Main mergnuty, konflikty vyriesene, ale netestoval som to uz.

luciajanikova · 2024-11-18T07:19:15Z

Pretestujem, keby na nieco narazim, pisem sem @durcak

luciajanikova · 2024-12-03T07:02:03Z

Za mna inak asi ok, preklikala som sa cez to, vyzera to byt v poriadku. Trochu iba bojujem s tym, ze novy TagFilter nie je defaultne viditelny v lavom menu. Z mojho pohladu, ked si idem vytvarat Tag, tak chcem pomocou neho filtrovat spravy, rychlo najst tie, ktore su tagom oznacene. Takze chcem aby bol viditelny. Ak ho by default neuvidim, asi by ma to zmiatlo. Aky mas na to ty pohlad @jsuchal, ked preferujes default schovany?

Tuto asi este zostalal moja pripomienka zabudnuta + pride mi pre bezneho pouzivatela trochu matuce, ze k tagu existuje aj (duplicitny) filter a pri oboch je mozne nastavovat viditelnost, ale znamena to nieco ine. Potrebujeme to mat takto dvojmo, s tou viditelnostou, neznamena to to iste?
Inak som si to preklikala, skusila najdolezitejsie scenare a vyzera to byt v poriadku. @jsuchal

jsuchal · 2024-12-03T08:16:11Z

@luciajanikova neznamena to to iste myslim, jedno je viditelnost v lavom menu druhe je viditelnost na vlaknach. ale asi stoji za to zvazit to premenovat. kuknem to dnes vecer/zajtra.

luciajanikova · 2024-12-03T09:19:20Z

@luciajanikova neznamena to to iste myslim, jedno je viditelnost v lavom menu druhe je viditelnost na vlaknach. ale asi stoji za to zvazit to premenovat. kuknem to dnes vecer/zajtra.

Ano, to je pravda, ale z pouzivatelskeho hladiska mi to uplne nedava zmysel, aby to boli dve rozne veci.

ked si napr. stitok NASES zvolim aby nebol viditelny, tak to pre mna znamena, ze ho nepouzivam, nechcem ho vidiet
filter ale zostava viditelny a teda vidim vlavo filter NASES, ktory ked rozkliknem, su tam thready, pri ktorych NASES stitok nie je zobrazeny, kedze nie je viditelny. z toho mi vychadza, ze bez viditelnosti stitka nema viditelnost filtra zmysel

Za mna: ak nejaky stitok chcem pouzivat, tak chcem aby bol viditelny (nech ho viem pridavat na vlakna) a zaroven chcem vidiet aj filter, nech si viem spravy s danym stitkom vyfiltrovat.
Naopak plati rovnako, ked nechcem pouzivat stitok, nechcem vidiet ani filter. Myslim si, ze viditelnost by sa mala nastavovat iba pri jednej z tychto veci.

jsuchal · 2024-12-03T09:29:38Z

@luciajanikova nepovedal by som, lebo minimalne to lave menu je personalizovane per-user a viditelnost stitkov je per-tenant ak si spravne spominam.

alhafoudh added 6 commits December 11, 2023 11:58

Pass filter via url params and tweak message threads table title base…

473af6d

…d on filter or query

Tweak title text

914d2fb

Implement pinning and unpinning filters in sidebar

0a03182

Remove dependency on tailwindcss-scoped-groups since it is a native t…

a6b44f0

…ailwind functionality

Implement filter sorting

be94fbe

Replace bars icon with grip icon

d8e29ff

jsuchal reviewed Dec 15, 2023

View reviewed changes

jsuchal requested changes Dec 15, 2023

View reviewed changes

alhafoudh and others added 18 commits January 4, 2024 09:22

Tweak styles

5b0b7a3

Fix FlashComponent renamed namespace

8d1e4e9

Update schema.rb and tenant.rb annotation

8bfd59d

User visibility settings for Tags, Filters v1

44d03c7

Resolve merge conflict

3281e2e

Merge branch 'feature/tags_user_visibility_settings' into feature/GO-…

34e344b

…368-filters # Conflicts: # app/components/common/icon_component.rb # app/controllers/application_controller.rb # app/lib/sidebar_menu.rb # db/schema.rb

Fix db schema

a11f431

Fix wrong merge

9a6425f

Merge branch 'refs/heads/main' into feature/GO-368-filters

d07a6a0

# Conflicts: # app/components/common/icon_component.rb

Remove pinning from sidebar

8bcf810

Tweak sidebar for filter list

adf8361

Rename visibility model to UserItemVisibility and add reordering

ef6105c

Reorganize filtering and enable TagFilter usage

87c0bd8

Make first filter default

7cc6801

Redirect to default filter and fix active sidebar item tracking

3783ec4

Add buttons with icons for up down

5935dd4

jsuchal reviewed Jul 8, 2024

View reviewed changes

alhafoudh added 2 commits September 10, 2024 13:26

Make Filter author nullable

cf6ebfa

Remove binding.pry

6c4313f

Tomáš Durčák added 4 commits September 20, 2024 14:02

Try fix random failing notifications_test

901e018

Merge branch 'main' into feature/GO-368-filters

25c6d2a

Change default_max_wait_time for Capybara

d0bf118

Update notifications_test

699fc2f

jsuchal requested a review from luciajanikova September 23, 2024 13:29

jsuchal reviewed Sep 24, 2024

View reviewed changes

app/models/tag.rb Show resolved Hide resolved

luciajanikova reviewed Sep 24, 2024

View reviewed changes

Tomáš Durčák added 2 commits September 25, 2024 15:38

Fix migration and filtering by tag filters

6f5ba24

Remove is_pinned from filters

29cc358

luciajanikova reviewed Sep 26, 2024

View reviewed changes

Refactoring after review

0776ad3

jsuchal requested changes Oct 29, 2024

View reviewed changes

Refactoring after review

84646a6

Merge branch 'main' into feature/GO-368-filters

21ef1b7

Basic fix

8824a1f

		@@ -0,0 +1,6 @@
		class Icons::GripComponent < ViewComponent::Base

		@@ -0,0 +1,3 @@
		<div class="flex justify-center items-center flex-grow-0 flex-shrink-0 relative overflow-hidden gap-2.5 px-3.5 py-2.5 rounded-md bg-white border border-gray-300 hover:bg-gray-100">

Feature/go 368 filters #249

Are you sure you want to change the base?

Feature/go 368 filters #249

Conversation

alhafoudh commented Dec 15, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

alhafoudh Jul 8, 2024 • edited Loading

Choose a reason for hiding this comment

jsuchal commented Jul 8, 2024

jsuchal commented Sep 23, 2024

luciajanikova commented Sep 24, 2024

luciajanikova left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

durcak commented Sep 25, 2024

luciajanikova commented Sep 26, 2024

durcak commented Sep 26, 2024

luciajanikova commented Sep 26, 2024

durcak commented Sep 26, 2024

luciajanikova left a comment

Choose a reason for hiding this comment

jsuchal left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

luciajanikova commented Nov 16, 2024

jsuchal commented Nov 16, 2024

durcak commented Nov 17, 2024

luciajanikova commented Nov 18, 2024

luciajanikova commented Dec 3, 2024

jsuchal commented Dec 3, 2024

luciajanikova commented Dec 3, 2024

jsuchal commented Dec 3, 2024

alhafoudh Jul 8, 2024 •

edited

Loading