From 93b75403df44925aa26d849b58878fab165621e2 Mon Sep 17 00:00:00 2001
From: Anton <anton@scinote.net>
Date: Wed, 20 Mar 2024 15:59:38 +0100
Subject: [PATCH] Fix designated users on task and new task modal [SCI-10488]

---
 app/controllers/user_my_modules_controller.rb |  4 +--
 app/javascript/vue/my_modules/modals/new.vue  | 28 +++++++++++--------
 .../my_modules/renderers/designated_users.vue | 10 +++++--
 app/views/my_modules/index.html.erb           |  2 +-
 4 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/app/controllers/user_my_modules_controller.rb b/app/controllers/user_my_modules_controller.rb
index da7fc646f..8e9e2f33b 100644
--- a/app/controllers/user_my_modules_controller.rb
+++ b/app/controllers/user_my_modules_controller.rb
@@ -117,9 +117,7 @@ class UserMyModulesController < ApplicationController
       user_hash
     end
 
-    render json: {
-      users: users.compact
-    }
+    render json: users.compact
   end
 
   private
diff --git a/app/javascript/vue/my_modules/modals/new.vue b/app/javascript/vue/my_modules/modals/new.vue
index 5ffada2ec..653b9eb05 100644
--- a/app/javascript/vue/my_modules/modals/new.vue
+++ b/app/javascript/vue/my_modules/modals/new.vue
@@ -45,18 +45,20 @@
                 :placeholder="i18n.t('experiments.canvas.new_my_module_modal.assigned_tags_placeholder')"
                 :tagsView="true" ></SelectDropdown>
 
-                <label class="sci-label">
-                  {{ i18n.t('experiments.canvas.new_my_module_modal.assigned_users') }}
-                </label>
-                <SelectDropdown
-                  @change="setUsers"
-                  :options="formattedUsers"
-                  :option-renderer="usersRenderer"
-                  :label-renderer="usersRenderer"
-                  :multiple="true"
-                  :searchable="true"
-                  :placeholder="i18n.t('experiments.canvas.new_my_module_modal.assigned_users_placeholder')"
-                  :tagsView="true" ></SelectDropdown>
+                <template v-if="this.assignedUsersUrl">
+                  <label class="sci-label">
+                    {{ i18n.t('experiments.canvas.new_my_module_modal.assigned_users') }}
+                  </label>
+                  <SelectDropdown
+                    @change="setUsers"
+                    :options="formattedUsers"
+                    :option-renderer="usersRenderer"
+                    :label-renderer="usersRenderer"
+                    :multiple="true"
+                    :searchable="true"
+                    :placeholder="i18n.t('experiments.canvas.new_my_module_modal.assigned_users_placeholder')"
+                    :tagsView="true" ></SelectDropdown>
+                </template>
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-secondary" data-dismiss="modal">{{ i18n.t('general.cancel') }}</button>
@@ -169,6 +171,8 @@ export default {
       });
     },
     loadUsers() {
+      if (!this.assignedUsersUrl) return;
+
       axios.get(this.assignedUsersUrl).then((response) => {
         this.allUsers = response.data.data;
       });
diff --git a/app/javascript/vue/my_modules/renderers/designated_users.vue b/app/javascript/vue/my_modules/renderers/designated_users.vue
index 7df8b3cbe..5a22ac4ed 100644
--- a/app/javascript/vue/my_modules/renderers/designated_users.vue
+++ b/app/javascript/vue/my_modules/renderers/designated_users.vue
@@ -106,12 +106,16 @@ export default {
         }
       })
         .then((response) => {
+          let result = response.data;
+
+          if (!Array.isArray(result)) result = [];
+
           if (setSelectedUsers) {
-            this.selectedUsers = response.data.users.filter((item) => this.users.some((user) => user.id === item.value));
-            this.allUsers = response.data.users;
+            this.selectedUsers = result.filter((item) => this.users.some((user) => user.id === item.value));
+            this.allUsers = result;
             this.flyoutLoaded = true;
           } else {
-            const nonAssignedUsers = response.data.users.filter((item) => !this.selectedUsers.some(({ value }) => value === item.value));
+            const nonAssignedUsers = result.filter((item) => !this.selectedUsers.some(({ value }) => value === item.value));
             this.allUsers = this.selectedUsers.concat(nonAssignedUsers);
           }
         });
diff --git a/app/views/my_modules/index.html.erb b/app/views/my_modules/index.html.erb
index 9b7650048..7fceb7e53 100644
--- a/app/views/my_modules/index.html.erb
+++ b/app/views/my_modules/index.html.erb
@@ -11,7 +11,7 @@
       active-page-url="<%= my_modules_path(experiment_id: @experiment, view_mode: :active) %>"
       archived-page-url="<%= my_modules_path(experiment_id: @experiment, view_mode: :archived) %>"
       current-view-mode="<%= view_mode %>"
-      assigned-users-url="<%= assigned_users_experiment_path(@experiment) %>"
+      assigned-users-url="<%= (assigned_users_experiment_path(@experiment) if can_designate_users_to_new_task?(@experiment)) %>"
       users-filter-url="<%= users_filter_projects_path %>"v
       user-roles-url="<%= user_roles_projects_path %>"
       :tags-colors="<%= Constants::TAG_COLORS.to_json %>"