From b06b5c4d1f2f86a0c3324440ea4a1b8e9d0a87be Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Sun, 5 Feb 2023 23:27:22 +0400
Subject: [PATCH 1/3] Check what's up with user_my_modules_controller#index_old
 action, and remove/rename it [SCI-7848]

---
 app/controllers/user_my_modules_controller.rb                 | 4 ++--
 app/views/canvas/full_zoom/_my_module.html.erb                | 4 ++--
 .../{_index_old.html.erb => _assignees.html.erb}              | 0
 .../controllers/user_my_modules_controller_spec.rb            | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)
 rename app/views/user_my_modules/{_index_old.html.erb => _assignees.html.erb} (100%)

diff --git a/app/controllers/user_my_modules_controller.rb b/app/controllers/user_my_modules_controller.rb
index 37125a1c1..f601f8d1a 100644
--- a/app/controllers/user_my_modules_controller.rb
+++ b/app/controllers/user_my_modules_controller.rb
@@ -7,14 +7,14 @@ class UserMyModulesController < ApplicationController
   before_action :check_view_permissions, except: %i(create destroy)
   before_action :check_manage_permissions, only: %i(create destroy)
 
-  def index_old
+  def assignees
     @user_my_modules = @my_module.user_my_modules
 
     respond_to do |format|
       format.json do
         render json: {
           html: render_to_string(
-            partial: 'index_old.html.erb'
+            partial: 'assignees.html.erb'
           ),
           my_module_id: @my_module.id,
           counter: @my_module.designated_users.count # Used for counter badge
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index fa42b51d0..b9ca48d67 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -9,7 +9,7 @@
   data-module-x="<%= my_module.x %>"
   data-module-y="<%= my_module.y %>"
   data-module-conns="<%= construct_module_connections(my_module) %>"
-  data-module-users-tab-url="<%=  index_old_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>"
+  data-module-users-tab-url="<%=  assignees_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>"
   data-module-tags-url="<%= my_module_tags_experiment_path(my_module.experiment, format: :json) %>">
 
   <div data-view-mode="active">
@@ -83,7 +83,7 @@
   <div class="panel-footer panel-footer-scinote buttons-container">
     <ul class="nav nav-tabs nav-tabs-less" role="tablist">
       <li role="presentation">
-        <a class="btn btn-link task-card-view-users" href="<%= index_old_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
+        <a class="btn btn-link task-card-view-users" href="<%= assignees_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
           <span class="fas fa-users" aria-hidden="true"></span>
           <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless my_module.designated_users_count.positive? %>"
                 data-linked-id="<%= my_module.id %>">
diff --git a/app/views/user_my_modules/_index_old.html.erb b/app/views/user_my_modules/_assignees.html.erb
similarity index 100%
rename from app/views/user_my_modules/_index_old.html.erb
rename to app/views/user_my_modules/_assignees.html.erb
diff --git a/spec/permissions/controllers/user_my_modules_controller_spec.rb b/spec/permissions/controllers/user_my_modules_controller_spec.rb
index 26a7c91db..6a86aa87b 100644
--- a/spec/permissions/controllers/user_my_modules_controller_spec.rb
+++ b/spec/permissions/controllers/user_my_modules_controller_spec.rb
@@ -6,7 +6,7 @@ describe UserMyModulesController, type: :controller do
   include PermissionExtends
 
   it_behaves_like "a controller with authentication", {
-    index_old: { my_module_id: 1 },
+    assignees: { my_module_id: 1 },
     index: { my_module_id: 1 },
     index_edit: { my_module_id: 1 },
     search: { my_module_id: 1, id: 1 },
@@ -21,7 +21,7 @@ describe UserMyModulesController, type: :controller do
       team_role: :normal_user
     }
 
-    it_behaves_like "a controller action with permissions checking", :get, :index_old do
+    it_behaves_like "a controller action with permissions checking", :get, :assignees do
       let(:testable) { my_module }
       let(:permissions) { [MyModulePermissions::READ] }
       let(:action_params) { { my_module_id: my_module.id } }

From e917b995cbe95b468222884c7a55e27cab677fff Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Mon, 6 Feb 2023 13:54:54 +0400
Subject: [PATCH 2/3] added route

---
 config/routes.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/routes.rb b/config/routes.rb
index 284289e8c..9943c8c8c 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -410,7 +410,7 @@ Rails.application.routes.draw do
       end
       resources :user_my_modules, path: '/users', only: %i(index create destroy) do
         collection do
-          get :index_old
+          get :assignees
         end
         member do
           get :search

From 8e942379ff55690eeef6d24bc9fac48302af3451 Mon Sep 17 00:00:00 2001
From: Giga Chubinidze <gchubinidze@unisens.ge>
Date: Tue, 21 Mar 2023 14:29:23 +0400
Subject: [PATCH 3/3] changed assignee to designated_users

---
 app/controllers/user_my_modules_controller.rb                 | 4 ++--
 app/views/canvas/full_zoom/_my_module.html.erb                | 4 ++--
 .../{_assignees.html.erb => _designated_users.html.erb}       | 0
 config/routes.rb                                              | 2 +-
 .../controllers/user_my_modules_controller_spec.rb            | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename app/views/user_my_modules/{_assignees.html.erb => _designated_users.html.erb} (100%)

diff --git a/app/controllers/user_my_modules_controller.rb b/app/controllers/user_my_modules_controller.rb
index f601f8d1a..417b0bebe 100644
--- a/app/controllers/user_my_modules_controller.rb
+++ b/app/controllers/user_my_modules_controller.rb
@@ -7,14 +7,14 @@ class UserMyModulesController < ApplicationController
   before_action :check_view_permissions, except: %i(create destroy)
   before_action :check_manage_permissions, only: %i(create destroy)
 
-  def assignees
+  def designated_users
     @user_my_modules = @my_module.user_my_modules
 
     respond_to do |format|
       format.json do
         render json: {
           html: render_to_string(
-            partial: 'assignees.html.erb'
+            partial: 'designated_users.html.erb'
           ),
           my_module_id: @my_module.id,
           counter: @my_module.designated_users.count # Used for counter badge
diff --git a/app/views/canvas/full_zoom/_my_module.html.erb b/app/views/canvas/full_zoom/_my_module.html.erb
index b9ca48d67..02de0593e 100644
--- a/app/views/canvas/full_zoom/_my_module.html.erb
+++ b/app/views/canvas/full_zoom/_my_module.html.erb
@@ -9,7 +9,7 @@
   data-module-x="<%= my_module.x %>"
   data-module-y="<%= my_module.y %>"
   data-module-conns="<%= construct_module_connections(my_module) %>"
-  data-module-users-tab-url="<%=  assignees_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>"
+  data-module-users-tab-url="<%=  designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>"
   data-module-tags-url="<%= my_module_tags_experiment_path(my_module.experiment, format: :json) %>">
 
   <div data-view-mode="active">
@@ -83,7 +83,7 @@
   <div class="panel-footer panel-footer-scinote buttons-container">
     <ul class="nav nav-tabs nav-tabs-less" role="tablist">
       <li role="presentation">
-        <a class="btn btn-link task-card-view-users" href="<%= assignees_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
+        <a class="btn btn-link task-card-view-users" href="<%= designated_users_my_module_user_my_modules_url(my_module_id: my_module.id, format: :json) %>" aria-controls="<%= my_module.id %>_users" role="tab" data-remote="true">
           <span class="fas fa-users" aria-hidden="true"></span>
           <span class="badge badge-indicator users-badge-indicator <%= 'hidden' unless my_module.designated_users_count.positive? %>"
                 data-linked-id="<%= my_module.id %>">
diff --git a/app/views/user_my_modules/_assignees.html.erb b/app/views/user_my_modules/_designated_users.html.erb
similarity index 100%
rename from app/views/user_my_modules/_assignees.html.erb
rename to app/views/user_my_modules/_designated_users.html.erb
diff --git a/config/routes.rb b/config/routes.rb
index 9943c8c8c..289d08961 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -410,7 +410,7 @@ Rails.application.routes.draw do
       end
       resources :user_my_modules, path: '/users', only: %i(index create destroy) do
         collection do
-          get :assignees
+          get :designated_users
         end
         member do
           get :search
diff --git a/spec/permissions/controllers/user_my_modules_controller_spec.rb b/spec/permissions/controllers/user_my_modules_controller_spec.rb
index 6a86aa87b..0fac1975c 100644
--- a/spec/permissions/controllers/user_my_modules_controller_spec.rb
+++ b/spec/permissions/controllers/user_my_modules_controller_spec.rb
@@ -6,7 +6,7 @@ describe UserMyModulesController, type: :controller do
   include PermissionExtends
 
   it_behaves_like "a controller with authentication", {
-    assignees: { my_module_id: 1 },
+    designated_users: { my_module_id: 1 },
     index: { my_module_id: 1 },
     index_edit: { my_module_id: 1 },
     search: { my_module_id: 1, id: 1 },
@@ -21,7 +21,7 @@ describe UserMyModulesController, type: :controller do
       team_role: :normal_user
     }
 
-    it_behaves_like "a controller action with permissions checking", :get, :assignees do
+    it_behaves_like "a controller action with permissions checking", :get, :designated_users do
       let(:testable) { my_module }
       let(:permissions) { [MyModulePermissions::READ] }
       let(:action_params) { { my_module_id: my_module.id } }