20640: Merge branch 'main' into 20640-computed-permissions-api

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>

diff --cc services/api/app/models/group.rb
index d159b73c94d7b3dde5bf5fa1560d2fa636845da3,9b517e599800a3f7f8f22b1b6008b8f5464941ef..6d30fe1bab0eb1a0ecde129972e9daa5b6986989
--- 1/services/api/app/models/group.rb
--- 2/services/api/app/models/group.rb
+++ b/services/api/app/models/group.rb
@@@ -243,7 -274,8 +274,8 @@@ insert into frozen_groups (uuid) selec
    end
  
    def clear_permissions_trash_frozen
 -    MaterializedPermission.where(target_uuid: uuid).delete_all
+     Link.where(link_class: 'permission', tail_uuid: self.uuid).destroy_all
 +    ComputedPermission.where(target_uuid: uuid).delete_all
      ActiveRecord::Base.connection.exec_delete(
        "delete from trashed_groups where group_uuid=$1",
        "Group.clear_permissions_trash_frozen",

diff --cc services/api/lib/can_be_an_owner.rb
Simple merge