Merge branch 'main' into release

griffithlab · Jan 16, 2024 · 5b84fb6 · 5b84fb6
2 parents ec79d07 + 3d72dae
commit 5b84fb6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/server/Gemfile.lock b/server/Gemfile.lock
@@ -230,6 +230,7 @@ GEM
     method_source (1.0.0)
     mini_magick (4.12.0)
     mini_mime (1.1.5)
+    mini_portile2 (2.8.5)
     minitest (5.20.0)
     msgpack (1.7.2)
     multi_json (1.15.0)
@@ -248,11 +249,8 @@ GEM
       net-protocol
     net-ssh (7.2.0)
     nio4r (2.7.0)
-    nokogiri (1.15.4-arm64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-darwin)
-      racc (~> 1.4)
-    nokogiri (1.15.4-x86_64-linux)
+    nokogiri (1.15.4)
+      mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     oauth2 (1.4.11)
       faraday (>= 0.17.3, < 3.0)
@@ -478,6 +476,7 @@ GEM
 PLATFORMS
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-22
   x86_64-linux
 

diff --git a/server/app/graphql/resolvers/variants.rb b/server/app/graphql/resolvers/variants.rb
@@ -8,7 +8,7 @@ class Resolvers::Variants < GraphQL::Schema::Resolver
 
   description 'List and filter variants.'
 
-  scope { object.variants.order('variants.name ASC').distinct }
+  scope { object.variants.where(deprecated: false).order('variants.name ASC').distinct }
 
   option(:name, type: GraphQL::Types::String, description: 'Left anchored filtering for variant name and aliases.') do |scope, value|
     scope.left_joins(:variant_aliases)

diff --git a/server/app/graphql/types/interfaces/activity_interface.rb b/server/app/graphql/types/interfaces/activity_interface.rb
@@ -56,6 +56,7 @@ def hash_key_from_object(object)
       Types::Activities::AcceptRevisionsActivityType,
       Types::Activities::CreateVariantActivityType,
       Types::Activities::DeprecateComplexMolecularProfileActivityType,
+      Types::Activities::CreateComplexMolecularProfileActivityType
     )
 
     definition_methods do
@@ -91,6 +92,8 @@ def resolve_type(object, context)
           Types::Activities::CreateVariantActivityType
         when DeprecateComplexMolecularProfileActivity
           Types::Activities::DeprecateComplexMolecularProfileActivityType
+        when CreateComplexMolecularProfileActivity
+          Types::Activities::CreateComplexMolecularProfileActivityType
         else
           raise "Unexpected Activity type #{object.class}"
         end