Merge branch 'main' of https://github.com/solver-it-sro/govbox-pro in…

…to GO-1/upload_message_drafts_import_to_box

app/components/common/removable_tag_component.html.erb

@@ -0,0 +1,12 @@
+<% if @tag.visible %>
+  <div class="flex justify-center items-center   relative  gap-1 px-2 py-1 rounded-md bg-gray-50 border border-gray-300">
+    <p class="  text-sm text-left text-gray-600"><%= @tag.name %></p>
+    <% if @object_tag.deletable %>
+      <%= button_to url_for(@object_tag), method: :delete, form: { data: { turbo_confirm: "Naozaj odstrániť štítok #{@tag.name} zo správy?" } } do %>
+        <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="  w-3.5 h-3.5 relative" preserveAspectRatio="xMidYMid meet">
+          <path d="M3.5 3.5L10.5 10.5M3.5 10.5L10.5 3.5L3.5 10.5Z" stroke="#6B7280" stroke-linecap="round" stroke-linejoin="round"></path>
+        </svg>
+      <% end %>
+    <% end %>
+  </div>
+<% end %>

app/components/common/removable_tag_component.rb

@@ -0,0 +1,8 @@
+module Common
+  class RemovableTagComponent < ViewComponent::Base
+    def initialize(object_tag)
+      @object_tag = object_tag
+      @tag = @object_tag.tag
+    end
+  end
+end

app/components/common/tag_selector_component.rb

@@ -1,8 +1,7 @@
 module Common
   class TagSelectorComponent < ViewComponent::Base
-    def initialize(object, available_tags)
+    def initialize(object)
       @object = object
-      @available_tags = available_tags
     end
   end
 end

app/components/common/tag_selector_popup_component.html.erb

@@ -22,13 +22,13 @@
       <% @tags.each do |tag|%>
         <div class="flex justify-center items-center gap-1.5 px-2 py-1 rounded-md bg-blue-50 border border-blue-300 hover:cursor-pointer">
           <% if @object.class.name == 'MessageThread' %>
-            <%= form_with model: [MessageThreadsTag.new(message_thread: @object, tag: tag)], class: "contents" do |form| %>
+            <%= form_with model: [MessageThreadsTag.new(message_thread: @object, tag: tag)], data: { turbo_frame: '_top' }, class: "contents" do |form| %>
               <%= form.hidden_field :message_thread_id %>
               <%= form.hidden_field :tag_id %>
               <%= form.submit "#{tag.name}" ,class:"text-sm text-left text-blue-600 hover:cursor-pointer" %>
             <% end %>
           <% else %>
-            <%= form_with model: [MessagesTag.new(message: @object, tag: tag)], class: "contents" do |form| %>
+            <%= form_with model: [MessagesTag.new(message: @object, tag: tag)], data: { turbo_frame: '_top' }, class: "contents" do |form| %>
               <%= form.hidden_field :message_id %>
               <%= form.hidden_field :tag_id %>
               <%= form.submit "#{tag.name}", class:"text-sm text-left text-blue-600 hover:cursor-pointer" %>

app/components/message_component.html.erb

@@ -1,9 +1,9 @@
 <div class="flex flex-col justify-stretch items-stretch">
-  <%= render MessageThreadHeaderComponent.new(@message.thread, @available_tags) %>
+  <%= render MessageThreadHeaderComponent.new(@message.thread, @thread_tags_with_deletable_flag) %>
   <div class="flex flex-col justify-stretch items-stretch gap-2 p-4">
-    <% if @notice %>
+    <% @notice.each do |type, msg| %>
       <div class="bg-blue-100 border-t border-b border-blue-500 text-blue-700 px-4 py-3 w-full" role="alert">
-        <p class="font-bold"><%= @notice %></p>
+        <p class="font-bold"><%= msg %></p>
       </div>
     <% end %>
     <div class="flex flex-col justify-stretch items-stretch rounded-md bg-white border border-gray-200">
@@ -19,19 +19,10 @@
               <p class="  text-base font-semibold text-left text-gray-900"><%= @message.recipient_name || 'Neznámy' %></p>
             </div>
             <div class="flex justify-stretch items-start   gap-2 pt-1">
-              <% @message.tags.each do |tag| %>
-                <% if tag.visible %>
-                  <div class="flex justify-center items-center   relative  gap-1 px-2 py-1 rounded-md bg-gray-50 border border-gray-300">
-                    <p class="  text-sm text-left text-gray-600"><%= tag.name %></p>
-                    <%= button_to messages_tag_path(MessagesTag.find_by(message_id: @message.id, tag_id: tag.id)), method: :delete, form: { data: { turbo_confirm: "Naozaj odstrániť štítok #{tag.name} zo správy?" } } do %>
-                      <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="  w-3.5 h-3.5 relative" preserveAspectRatio="xMidYMid meet">
-                        <path d="M3.5 3.5L10.5 10.5M3.5 10.5L10.5 3.5L3.5 10.5Z" stroke="#6B7280" stroke-linecap="round" stroke-linejoin="round"></path>
-                      </svg>
-                    <% end %>
-                  </div>
-                <% end %>
+              <% @message_tags_with_deletable_flag.each do |message_tag| %>
+                <%= render Common::RemovableTagComponent.new(message_tag) %>
               <% end %>
-              <%= render Common::TagSelectorComponent.new(@message, @available_tags) %>
+              <%= render Common::TagSelectorComponent.new(@message) %>
             </div>
           </div>
           <div class="flex flex-col justify-strech items-start flex-grow gap-1">

app/components/message_component.rb

@@ -1,9 +1,10 @@
 class MessageComponent < ViewComponent::Base
   renders_many :attachments
 
-  def initialize(message:, notice:, available_tags:)
+  def initialize(message:, notice:, message_tags_with_deletable_flag:, thread_tags_with_deletable_flag:)
     @message = message
     @notice = notice
-    @available_tags = available_tags
+    @message_tags_with_deletable_flag = message_tags_with_deletable_flag
+    @thread_tags_with_deletable_flag = thread_tags_with_deletable_flag
   end
 end

app/components/message_thread_header_component.html.erb

@@ -2,19 +2,10 @@
   <div class="flex justify-start items-center relative gap-4">
     <%= render MessageThreadRenameComponent.new(message_thread: @message_thread) %>
     <div class="flex justify-start items-start   gap-2">
-      <% @message_thread.tags.each do |tag|%>
-        <% if tag.visible %>
-          <div class="flex justify-start items-start gap-1 px-2 py-1 rounded-md bg-gray-50 border border-gray-300">
-            <p class="text-sm text-left text-gray-600"><%= tag.name %></p>
-            <%= button_to message_threads_tag_path(@message_thread.message_threads_tags.find_by(tag_id: tag.id)), method: :delete, form: { data: { turbo_confirm: "Naozaj odstrániť štítok #{tag.name} z vlákna?" } } do %>
-              <svg width="14" height="14" viewBox="0 0 14 14" fill="none" xmlns="http://www.w3.org/2000/svg" class="  w-3.5 h-3.5 relative" preserveAspectRatio="xMidYMid meet">
-                <path d="M3.5 3.5L10.5 10.5M3.5 10.5L10.5 3.5L3.5 10.5Z" stroke="#6B7280" stroke-linecap="round" stroke-linejoin="round"></path>
-              </svg>
-            <% end %>
-          </div>
-        <% end %>
+      <% @thread_tags_with_deletable_flag.each do |thread_tag|%>
+        <%= render Common::RemovableTagComponent.new(thread_tag) %>
       <% end %>
-      <%= render Common::TagSelectorComponent.new(@message_thread, @available_tags) %>
+      <%= render Common::TagSelectorComponent.new(@message_thread) %>
     </div>
   </div>
   <div class="todo flex flex-col justify-start items-end   gap-1">

app/components/message_thread_header_component.rb

@@ -1,6 +1,6 @@
 class MessageThreadHeaderComponent < ViewComponent::Base
-  def initialize(message_thread, available_tags)
+  def initialize(message_thread, thread_tags_with_deletable_flag)
     @message_thread = message_thread
-    @available_tags = available_tags
+    @thread_tags_with_deletable_flag = thread_tags_with_deletable_flag
   end
 end

app/components/message_threads_table_component.html.erb

@@ -1,6 +1,6 @@
 <div class="flex flex-col justify-stretch items-stretch gap-4 p-4">
   <div class="flex flex-col justify-stretch items-stretch rounded-md bg-white border border-gray-200">
-    <%= form_with(url: merge_message_threads_path, local: true) do |form|%>
+    <%= form_with(url: merge_message_threads_path) do |form|%>
       <div class="flex justify-stretch items-center gap-4 p-4 border-t-0 border-r-0 border-b border-l-0 border-gray-200">
         <div class="todo flex justify-start items-start   pr-[100px]">
           <div class="  w-4 h-4 relative">

app/controllers/message_threads_controller.rb

@@ -1,5 +1,6 @@
 class MessageThreadsController < ApplicationController
   before_action :set_message_thread, only: %i[show update]
+  before_action :load_threads, only: %i[index scroll]
 
   def show
     authorize @message_thread
@@ -18,24 +19,26 @@ def update
 
   def index
     authorize MessageThread
+  end
+
+  def scroll
+    authorize MessageThread
+  end
 
+  def load_threads
     cursor = MessageThreadCollection.init_cursor(search_params[:cursor])
 
-    @message_threads, @next_cursor = MessageThreadCollection.all(
-      scope: message_thread_policy_scope.includes(:tags, :box),
-      search_permissions: search_permissions,
-      query: search_params[:q],
-      no_visible_tags: search_params[:no_visible_tags] == '1' && Current.user.admin?,
-      cursor: cursor
-    )
+    @message_threads, @next_cursor =
+      MessageThreadCollection.all(
+        scope: message_thread_policy_scope.includes(:tags, :box),
+        search_permissions: search_permissions,
+        query: search_params[:q],
+        no_visible_tags: search_params[:no_visible_tags] == "1" && Current.user.admin?,
+        cursor: cursor
+      )
 
     @next_cursor = MessageThreadCollection.serialize_cursor(@next_cursor)
     @next_page_params = search_params.to_h.merge(cursor: @next_cursor).merge(format: :turbo_stream)
-
-    respond_to do |format|
-      format.html # GET
-      format.turbo_stream # POST
-    end
   end
 
   def merge

app/controllers/messages_controller.rb

@@ -20,6 +20,37 @@ def authorize_delivery_notification
   def set_message
     @message = policy_scope(Message).find(params[:id])
     @menu = SidebarMenu.new(controller_name, action_name, { message: @message })
+    @notice = flash
+    set_message_tags_with_deletable_flag
+    set_thread_tags_with_deletable_flag
+  end
+
+  def set_message_tags_with_deletable_flag
+    @message_tags_with_deletable_flag =
+      @message
+        .messages_tags
+        .includes(:tag)
+        .select("messages_tags.*, #{deletable_subquery('tags.id = messages_tags.tag_id').to_sql} as deletable")
+        .order("tags.name")
+  end
+
+  def set_thread_tags_with_deletable_flag
+    @thread_tags_with_deletable_flag =
+      @message
+        .thread
+        .message_threads_tags
+        .includes(:tag)
+        .select("message_threads_tags.*, #{deletable_subquery('tags.id = message_threads_tags.tag_id').to_sql} as deletable")
+        .order('tags.name')
+  end
+
+  def deletable_subquery(where_clause)
+    Tag
+      .joins(:groups, { groups: :group_memberships })
+      .where('group_memberships.user_id = ?', Current.user.id)
+      .where(where_clause)
+      .arel
+      .exists
   end
 
   def permit_reply_params

app/controllers/messages_tags_controller.rb

@@ -1,12 +1,12 @@
 class MessagesTagsController < ApplicationController
-  before_action :set_messages_tag, only: %i[ destroy ]
+  before_action :set_messages_tag, only: %i[destroy]
 
   def create
     @messages_tag = MessagesTag.new(messages_tag_params)
     authorize @messages_tag
 
     if @messages_tag.save
-      redirect_back fallback_location:"/", notice: "Tag was successfully added"
+      redirect_back fallback_location: "/", notice: "Tag was successfully added"
     else
       render :new, status: :unprocessable_entity
     end
@@ -15,7 +15,7 @@ def create
   def destroy
     authorize @messages_tag
     @messages_tag.destroy
-    redirect_back fallback_location:"/", notice: "Tag was successfully removed"
+    redirect_back fallback_location: '/', notice: 'Tag was successfully removed'
   end
 
   private

app/controllers/tags_controller.rb

@@ -10,10 +10,7 @@ def get_available
     authorize [Tag]
     set_object
     @tenant = Current.tenant
-    @tags =
-      @tenant.tags.where.not(id: @object.tags.ids).where(visible: true)
-                  .where(id: TagGroup.select(:tag_id).joins(:group, :tag, group: :users).where(group: { tenant_id: @tenant.id }, tag: { tenant_id: @tenant.id }, users: { id: Current.user.id }))
-    respond_to { |format| format.html }
+    @tags = @tenant.tags.where.not(id: @object.tags.ids).where(visible: true)
   end
 
   private

app/models/govbox/message.rb

@@ -48,9 +48,10 @@ def self.create_message_with_thread!(govbox_message)
         delivered_at: govbox_message.delivered_at
       )
 
-      self.create_message_tag(message, govbox_message)
-
       message.save!
+
+      self.create_message_tag(message, govbox_message)
+
       message
     end
 

app/models/message.rb

@@ -20,6 +20,7 @@
 
 class Message < ApplicationRecord
   has_and_belongs_to_many :tags
+  has_many :messages_tags, dependent: :destroy
   belongs_to :thread, class_name: 'MessageThread', foreign_key: :message_thread_id
   belongs_to :author, class_name: 'User', foreign_key: :author_id, optional: true
   has_many :objects, class_name: 'MessageObject', dependent: :destroy

app/policies/message_thread_policy.rb

@@ -31,6 +31,10 @@ def index?
     true
   end
 
+  def scroll?
+    true
+  end
+
   def update?
     true
   end

app/policies/messages_tag_policy.rb

@@ -13,38 +13,24 @@ def resolve
       if @user.site_admin?
         scope.all
       else
-        # TODO: toto zrejme nestaci, potrebujeme obmedzit aj na konkretneho usera a jeho boxy
-        scope.includes(:message, :tag).where(message: {tenant_id: Current.tenant.id}, tag: {tenant_id: Current.tenant.id})
+        scope.joins(:message, :tag).where(message: Pundit.policy_scope(user, Message), tag: Pundit.policy_scope(user, Tag))
       end
     end
   end
 
-  def index
-    true
-  end
-
-  def show?
-    true
-  end
-
   def create?
-    true
-  end
-
-  def new?
-    create?
-  end
+    return false unless Pundit.policy_scope(user, Message).find_by(id: @messages_tag.message_id)
+    return false unless @messages_tag.tag.tenant == Current.tenant
 
-  def update?
     true
   end
 
-  def edit?
-    update?
-  end
-
   def destroy?
+    return false unless @messages_tag
+    return false unless Pundit.policy_scope(user, Message).find_by(id: @messages_tag.message_id)
+    return false unless Pundit.policy_scope(user, Tag).find_by(id: @messages_tag.tag_id)
+    return false unless @messages_tag.tag.tenant == Current.tenant
+
     true
   end
 end
-

app/views/message_threads/index.html.erb

@@ -8,7 +8,7 @@
   <% component.with_next_page_area do %>
     <%= render Turbo::NextPageAreaComponent.new(
       id: @next_cursor,
-      url: message_threads_url(@next_page_params)
+      url: scroll_message_threads_url(@next_page_params)
       )
     %>
   <% end %>

app/views/message_threads/index.turbo_stream.erb → app/views/message_threads/scroll.turbo_stream.erb

@@ -7,7 +7,7 @@
   <%= turbo_stream.append "next_page_area" do %>
     <%= render Turbo::NextPageComponent.new(
     id:@next_cursor, 
-    url: message_threads_url(@next_page_params)
+    url: scroll_message_threads_url(@next_page_params)
     ) %>
   <% end %>
 <% else %>

app/views/messages/show.html.erb

@@ -1,5 +1,5 @@
 <%= render TW::FlashComponent.new(flash: flash) %>
-<%= render MessageComponent.new(message: @message, notice: @notice, available_tags: @available_tags) do |component| %>
+<%= render MessageComponent.new(message: @message, notice: @notice, message_tags_with_deletable_flag: @message_tags_with_deletable_flag, thread_tags_with_deletable_flag: @thread_tags_with_deletable_flag) do |component| %>
   <% @message.objects.each do |message_object| %>
     <% component.with_attachment do %>
       <% render MessageAttachmentComponent.new(message_attachment: message_object) %>

config/routes.rb

@@ -50,7 +50,8 @@
 
   resources :message_threads do
     collection do
-      post 'merge'
+      post :merge
+      get :scroll
     end
     resources :messages
   end