From f388594884e9695b8fc6e32c7c5b7d09c939b887 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Mon, 14 Oct 2024 15:52:47 +0200
Subject: [PATCH 1/7] Fix sharing settings with invisible teams [SCI-11188]

---
 app/controllers/team_shared_objects_controller.rb |  2 +-
 app/javascript/vue/shared/share_modal.vue         |  6 +++---
 app/serializers/shareable_team_serializer.rb      | 11 ++++++++++-
 3 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/app/controllers/team_shared_objects_controller.rb b/app/controllers/team_shared_objects_controller.rb
index 41e712d0c..85c3691e7 100644
--- a/app/controllers/team_shared_objects_controller.rb
+++ b/app/controllers/team_shared_objects_controller.rb
@@ -57,7 +57,7 @@ class TeamSharedObjectsController < ApplicationController
   end
 
   def shareable_teams
-    teams = current_user.teams.order(:name) - [@model.team]
+    teams = Team.order(:name).all - [@model.team]
     render json: teams, each_serializer: ShareableTeamSerializer, model: @model
   end
 
diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue
index 39e2d3a3d..ee9c9873b 100644
--- a/app/javascript/vue/shared/share_modal.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -37,14 +37,14 @@
             <template v-for="team in shareableTeams">
               <div class="col-span-2 flex items-center h-9 gap-1">
                 <span class="sci-checkbox-container" :class="{'opacity-0 pointer-events-none': sharedWithAllRead}">
-                  <input type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
+                  <input :disabled="!team.attributes.readable" type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
                   <span class="sci-checkbox-label"></span>
                 </span>
-                {{ team.attributes.name }}
+                {{ team.attributes.name || `(${i18n.t('teams.private_team')})` }}
               </div>
               <div class="flex justify-center items-center">
                 <span v-if="team.attributes.private_shared_with"
-                      :class="{'opacity-0 pointer-events-none': sharedWithAllRead}"
+                      :class="{'opacity-0 pointer-events-none': sharedWithAllRead || !team.attributes.readable}"
                       class="sci-toggle-checkbox-container">
                   <input type="checkbox"
                         class="sci-toggle-checkbox"
diff --git a/app/serializers/shareable_team_serializer.rb b/app/serializers/shareable_team_serializer.rb
index b2761c5a6..7cb5f4bc8 100644
--- a/app/serializers/shareable_team_serializer.rb
+++ b/app/serializers/shareable_team_serializer.rb
@@ -2,8 +2,17 @@
 
 class ShareableTeamSerializer < ActiveModel::Serializer
   include Rails.application.routes.url_helpers
+  include Canaid::Helpers::PermissionsHelper
 
-  attributes :id, :name, :private_shared_with, :private_shared_with_write
+  attributes :id, :name, :readable, :private_shared_with, :private_shared_with_write
+
+  def name
+    readable && object.name
+  end
+
+  def readable
+    can_read_team?(object)
+  end
 
   def private_shared_with
     model.private_shared_with?(object)

From 5e02fff4b36c961c702e8ad32964bdfc57f389f9 Mon Sep 17 00:00:00 2001
From: Alex Kriuchykhin <oleksii@scinote.net>
Date: Mon, 14 Oct 2024 16:24:17 +0200
Subject: [PATCH 2/7] Fix active repository datatables on shared tasks
 [SCI-11189] (#7970)

---
 app/controllers/my_module_shareable_links_controller.rb | 2 +-
 app/services/repository_datatable_service.rb            | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/controllers/my_module_shareable_links_controller.rb b/app/controllers/my_module_shareable_links_controller.rb
index d49a6be5d..594d6cf8b 100644
--- a/app/controllers/my_module_shareable_links_controller.rb
+++ b/app/controllers/my_module_shareable_links_controller.rb
@@ -62,7 +62,7 @@ class MyModuleShareableLinksController < ApplicationController
     @draw = params[:draw].to_i
     per_page = params[:length].to_i < 1 ? Constants::REPOSITORY_DEFAULT_PAGE_SIZE : params[:length].to_i
     page = (params[:start].to_i / per_page) + 1
-    datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module, preload_cells: false)
+    datatable_service = RepositoryDatatableService.new(@repository, params, nil, @my_module, preload_cells: false, disable_reminders: true)
 
     @datatable_params = {
       view_mode: params[:view_mode],
diff --git a/app/services/repository_datatable_service.rb b/app/services/repository_datatable_service.rb
index ade46fb1f..fa3911d71 100644
--- a/app/services/repository_datatable_service.rb
+++ b/app/services/repository_datatable_service.rb
@@ -13,11 +13,12 @@ class RepositoryDatatableService
   PREDEFINED_COLUMNS = %w(row_id row_name added_on added_by archived_on archived_by
                           assigned relationships updated_on updated_by).freeze
 
-  def initialize(repository, params, user, my_module = nil, preload_cells: true)
+  def initialize(repository, params, user, my_module = nil, preload_cells: true, disable_reminders: false)
     @repository = repository
     @user = user
     @my_module = my_module
     @preload_cells = preload_cells
+    @disable_reminders = disable_reminders
     @params = params
     @assigned_view =  @params[:assigned].in?(%w(assigned assigned_simple))
     @sortable_columns = build_sortable_columns
@@ -79,7 +80,7 @@ class RepositoryDatatableService
       end
     end
 
-    if Repository.reminders_enabled?
+    if Repository.reminders_enabled? && !@disable_reminders
       repository_rows =
         if @repository.archived? || @repository.is_a?(RepositorySnapshot)
           # don't load reminders for archived repositories or snapshots

From 57079bea51c17cdcaf6bc0483dfdbf99734ab054 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 15 Oct 2024 12:55:43 +0200
Subject: [PATCH 3/7] Add missing translation [SCI-11188]

---
 config/locales/en.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 6aecb3170..91c837579 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1025,7 +1025,8 @@ en:
         guest: "Guest"
         normal_user: "Normal user"
         admin: "Administrator"
-
+  teams:
+    private_team: "Private team"
   user_projects:
     view_users:
       modal_title: "Members of %{name}"

From d250653a7cca360957bd63c5da9b15e82629b136 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 15 Oct 2024 13:01:57 +0200
Subject: [PATCH 4/7] Hide unshared private teams [SCI-11188]

---
 app/javascript/vue/shared/share_modal.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue
index ee9c9873b..d0daba917 100644
--- a/app/javascript/vue/shared/share_modal.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -35,7 +35,7 @@
               </span>
             </div>
             <template v-for="team in shareableTeams">
-              <div class="col-span-2 flex items-center h-9 gap-1">
+              <div class="col-span-2 flex items-center h-9 gap-1" :class="{ 'hidden': !team.attributes.readable && !team.attributes.private_shared_with }">
                 <span class="sci-checkbox-container" :class="{'opacity-0 pointer-events-none': sharedWithAllRead}">
                   <input :disabled="!team.attributes.readable" type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
                   <span class="sci-checkbox-label"></span>

From 764e7dd66305355681f154fa66ce066ac5917688 Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Tue, 15 Oct 2024 21:17:14 +0200
Subject: [PATCH 5/7] Improve behaviour for private team sharing [SCI-11188]

---
 app/controllers/team_shared_objects_controller.rb | 2 +-
 app/javascript/vue/shared/share_modal.vue         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/team_shared_objects_controller.rb b/app/controllers/team_shared_objects_controller.rb
index 85c3691e7..3276b5721 100644
--- a/app/controllers/team_shared_objects_controller.rb
+++ b/app/controllers/team_shared_objects_controller.rb
@@ -57,7 +57,7 @@ class TeamSharedObjectsController < ApplicationController
   end
 
   def shareable_teams
-    teams = Team.order(:name).all - [@model.team]
+    teams = (Team.order(:name).all - [@model.team]).filter { |t| can_read_team?(t) || @model.private_shared_with?(t) }
     render json: teams, each_serializer: ShareableTeamSerializer, model: @model
   end
 
diff --git a/app/javascript/vue/shared/share_modal.vue b/app/javascript/vue/shared/share_modal.vue
index d0daba917..ee9c9873b 100644
--- a/app/javascript/vue/shared/share_modal.vue
+++ b/app/javascript/vue/shared/share_modal.vue
@@ -35,7 +35,7 @@
               </span>
             </div>
             <template v-for="team in shareableTeams">
-              <div class="col-span-2 flex items-center h-9 gap-1" :class="{ 'hidden': !team.attributes.readable && !team.attributes.private_shared_with }">
+              <div class="col-span-2 flex items-center h-9 gap-1">
                 <span class="sci-checkbox-container" :class="{'opacity-0 pointer-events-none': sharedWithAllRead}">
                   <input :disabled="!team.attributes.readable" type="checkbox" class="sci-checkbox" v-model="team.attributes.private_shared_with" />
                   <span class="sci-checkbox-label"></span>

From 97129d2a2b4b1467c6895346cac54312c4bfa5ed Mon Sep 17 00:00:00 2001
From: Martin Artnik <martin@scinote.net>
Date: Wed, 16 Oct 2024 09:47:12 +0200
Subject: [PATCH 6/7] Fix location image dissapearing [SCI-11195]

---
 app/javascript/vue/storage_locations/modals/new_edit.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/javascript/vue/storage_locations/modals/new_edit.vue b/app/javascript/vue/storage_locations/modals/new_edit.vue
index 551f7b0bb..b0a97df6f 100644
--- a/app/javascript/vue/storage_locations/modals/new_edit.vue
+++ b/app/javascript/vue/storage_locations/modals/new_edit.vue
@@ -192,12 +192,13 @@ export default {
       }
 
       this.savingLocaiton = true;
-      
+
       const params = {
         name: this.object.name,
         description: this.object.description,
         signed_blob_id: this.object.signed_blob_id,
-        container: this.object.container
+        container: this.object.container,
+        file_name: this.object.file_name || this.attachedImage?.name
       };
 
       if (this.object.container) {

From da50309204bbd4fb2f905f993fd312179ab6ade6 Mon Sep 17 00:00:00 2001
From: Martin Artnik <85488244+artoscinote@users.noreply.github.com>
Date: Wed, 16 Oct 2024 10:27:16 +0200
Subject: [PATCH 7/7] Bump version to 1.37.0

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index ae7255b73..bf50e910e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.36.2.2
+1.37.0