refactor: 🎨 Updated groups members page

app/views/groups/group_links/_invited_groups.html.erb

@@ -1,11 +1,27 @@
-<%= render Groups::TableComponent.new(
-  @namespace_group_links,
-  @namespace,
-  @access_levels,
-  @q,
-  abilities: {
-    update_namespace:
-      allowed_to?(:update_namespace_with_group_link?, @namespace),
-    unlink_group: allowed_to?(:unlink_namespace_with_group?, @namespace),
-  },
-) %>
+<div class="flex flex-col gap-2 mt-2">
+  <div class="flex">
+    <div class="flex-1"></div>
+    <div class="grow-0">
+      <%= render SearchComponent.new(
+      query: @q,
+      url: group_group_links_url(**request.query_parameters),
+      search_attribute: :group_name_cont,
+      placeholder: t("groups.members.index.search.groups.placeholder"),
+    ) do %>
+        <input type="hidden" name="format" value="turbo_stream"/>
+      <% end %>
+    </div>
+  </div>
+
+  <%= render Groups::TableComponent.new(
+    @namespace_group_links,
+    @namespace,
+    @access_levels,
+    @q,
+    abilities: {
+      update_namespace:
+        allowed_to?(:update_namespace_with_group_link?, @namespace),
+      unlink_group: allowed_to?(:unlink_namespace_with_group?, @namespace),
+    },
+  ) %>
+</div>

app/views/groups/members/_member_listing.html.erb

@@ -1,11 +1,27 @@
-<%= render Members::TableComponent.new(
-  @namespace,
-  @members,
-  @access_levels,
-  @q,
-  current_user,
-  {
-    update_member: allowed_to?(:update_member?, @namespace),
-    destroy_member: allowed_to?(:destroy_member?, @namespace),
-  },
-) %>
+<div class="flex flex-col gap-2 mt-2">
+  <div class="flex">
+    <div class="flex-1"></div>
+    <div class="grow-0">
+      <%= render SearchComponent.new(
+      query: @q,
+      url: group_members_url(**request.query_parameters),
+      search_attribute: :user_email_cont,
+      placeholder: t("groups.members.index.search.placeholder"),
+    ) do %>
+        <input type="hidden" name="format" value="turbo_stream"/>
+      <% end %>
+    </div>
+  </div>
+
+  <%= render Members::TableComponent.new(
+    @namespace,
+    @members,
+    @access_levels,
+    @q,
+    current_user,
+    {
+      update_member: allowed_to?(:update_member?, @namespace),
+      destroy_member: allowed_to?(:destroy_member?, @namespace),
+    },
+  ) %>
+</div>

app/views/groups/members/index.html.erb

@@ -34,42 +34,18 @@
     <%= tabs.with_tab(url: group_members_path(tab: "invited_groups"), selected: @tab == "invited_groups", controls: "members-tabs") do %>
       <%= t(:"groups.members.index.tabs.groups") %>
     <% end %>
-    <% if @tab == "invited_groups" %>
-      <%= tabs.with_search_bar(
-        q: @q,
-        url: group_group_links_url(**request.query_parameters),
-        search_attribute: :group_name_cont,
-        placeholder: t(".search.groups.placeholder"),
-        tab: @tab,
-      ) %>
-    <% else %>
-      <%= tabs.with_search_bar(
-        q: @q,
-        url: group_members_url(**request.query_parameters),
-        search_attribute: :user_email_cont,
-        placeholder: t(".search.placeholder"),
-        tab: @tab,
-      ) %>
+  <% end %>
+
+  <% if @tab == "invited_groups" %>
+    <%= turbo_frame_tag "members", "data-turbo-temporary": true,
+                            src: group_group_links_path(format: :turbo_stream) do %>
+      <%= render partial: "shared/loading/table" %>
     <% end %>
-    <%= tabs.with_tab_content do %>
-      <div class="flex flex-col">
-        <%= turbo_frame_tag "members", "data-turbo-temporary": true,
-                            src:
-                              (
-                                if @tab == "invited_groups"
-                                  group_group_links_path(
-                                    format: :turbo_stream
-                                  )
-                                else
-                                  group_members_path(
-                                    format: :turbo_stream
-                                  )
-                                end
-                              ) do %>
-          <%= render partial: "shared/loading/table" %>
-        <% end %>
-        <%= turbo_frame_tag "members_pagination", "data-turbo-temporary": true %>
-      </div>
+  <% else %>
+    <%= turbo_frame_tag "members", "data-turbo-temporary": true,
+                        src: group_members_path(format: :turbo_stream) do %>
+      <%= render partial: "shared/loading/table" %>
     <% end %>
   <% end %>
+  <%= turbo_frame_tag "members_pagination", "data-turbo-temporary": true %>
 </div>